From 88fd031fb4c01badf1058cfcb2ac08d3cd4746df Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Thu, 2 Nov 2017 16:03:30 +0100 Subject: [PATCH] Change the plugin system to a module system and slit up modules -Moved the woodpile from the arboriculture module to the charcoal module -Moved the backpacks from the storage module to the backpacks module -Moved the crates from the storage module to the creates module -Added the database module with a new storage for individuals -Added a gui element system to improve the alyzer api -Added a species plugin interface to handle the database gui -Added some alyzer methods to the species plugin to move the alyzer integration later to it --- gradle.properties | 2 +- src/main/java/forestry/Forestry.java | 28 +- .../api/arboriculture/IAlleleFruit.java | 2 - .../api/arboriculture/IAlleleTreeSpecies.java | 18 +- .../api/arboriculture/ICharcoalPileWall.java | 5 +- .../api/arboriculture/IWoodProvider.java | 8 +- .../api/arboriculture/package-info.java | 5 +- .../java/forestry/api/core/ForestryAPI.java | 26 +- .../api/core/GuiElementAlignment.java | 8 + .../java/forestry/api/core/IGuiElement.java | 38 ++ .../forestry/api/core/IGuiElementFactory.java | 49 ++ .../forestry/api/core/IGuiElementHelper.java | 93 ++++ .../forestry/api/core/IGuiElementLayout.java | 62 +++ .../api/core/IGuiElementLayoutHelper.java | 36 ++ .../java/forestry/api/core/package-info.java | 2 +- .../api/genetics/EnumDatabaseTab.java | 15 + .../forestry/api/genetics/IDatabaseTab.java | 37 ++ .../java/forestry/api/genetics/IGenome.java | 21 + .../java/forestry/api/genetics/IHousing.java | 3 + .../forestry/api/genetics/IIndividual.java | 24 + .../forestry/api/genetics/ISpeciesPlugin.java | 102 +++++ .../forestry/api/genetics/ISpeciesRoot.java | 31 +- .../forestry/api/genetics/package-info.java | 5 +- .../IAlleleButterflySpecies.java | 18 +- .../forestry/apiculture/BeekeepingLogic.java | 10 +- ...nApiculture.java => ModuleApiculture.java} | 44 +- .../apiculture/blocks/BlockBeeHives.java | 4 +- .../apiculture/blocks/BlockStump.java | 4 +- .../compat/ApicultureJeiPlugin.java | 6 +- .../entities/EntityMinecartApiary.java | 32 +- .../entities/EntityMinecartBeehouse.java | 6 +- .../entities/ParticleBeeExplore.java | 4 +- .../entities/ParticleBeeRoundTrip.java | 4 +- .../entities/ParticleBeeTargetEntity.java | 4 +- .../apiculture/genetics/ApiaristTracker.java | 4 +- .../apiculture/genetics/BeeAlyzerPlugin.java | 16 +- .../apiculture/genetics/BeeDatabaseTab.java | 120 +++++ .../apiculture/genetics/BeeDefinition.java | 112 ++--- .../apiculture/genetics/BeePlugin.java | 71 +++ .../forestry/apiculture/genetics/BeeRoot.java | 32 +- .../forestry/apiculture/gui/GuiImprinter.java | 4 +- .../inventory/InventoryAlvearySieve.java | 9 +- .../ItemInventoryHabitatLocator.java | 24 +- .../apiculture/items/ItemArmorApiarist.java | 4 +- .../apiculture/worldgen/HiveDecorator.java | 4 +- .../apiculture/worldgen/HiveDescription.java | 4 +- .../worldgen/HiveDescriptionSwarmer.java | 4 +- .../worldgen/VillageApiaristHouse.java | 23 +- ...iculture.java => ModuleArboriculture.java} | 57 +-- .../arboriculture/ModuleCharcoal.java | 71 +++ .../forestry/arboriculture/WoodAccess.java | 26 +- .../arboriculture/blocks/BlockAsh.java | 4 +- .../blocks/BlockForestryLeaves.java | 4 +- .../blocks/BlockRegistryArboriculture.java | 40 -- .../blocks/BlockRegistryCharcoal.java | 50 +++ .../arboriculture/blocks/BlockWoodPile.java | 6 +- .../charcoal/CharcoalPileWall.java | 10 +- .../charcoal/jei/CharcoalJeiPlugin.java | 8 +- .../jei/CharcoalPileWallCategory.java | 4 +- .../charcoal/jei/CharcoalPileWallWrapper.java | 13 +- .../compat/ArboricultureJeiPlugin.java | 5 +- .../genetics/ArboristTracker.java | 4 +- .../arboriculture/genetics/LeafProvider.java | 7 +- .../genetics/TreeAlyzerPlugin.java | 20 +- .../genetics/TreeDatabaseTab.java | 92 ++++ .../genetics/TreeDefinition.java | 6 +- .../arboriculture/genetics/TreePlugin.java | 71 +++ .../arboriculture/genetics/TreeRoot.java | 51 ++- .../arboriculture/items/ItemBlockLeaves.java | 16 +- .../proxy/ProxyArboricultureClient.java | 12 +- .../arboriculture/tiles/TileLeaves.java | 31 +- .../forestry/core/CreativeTabForestry.java | 12 +- .../java/forestry/core/EventHandlerCore.java | 14 +- .../core/{PluginCore.java => ModuleCore.java} | 27 +- .../{PluginFluids.java => ModuleFluids.java} | 12 +- .../forestry/core/TickHandlerCoreServer.java | 12 +- .../core/advancements/AdvancementManager.java | 34 ++ .../SpeciesDiscoveredTrigger.java | 141 ++++++ .../{properties => }/BlockAshStairs.java | 2 +- .../forestry/core/blocks/BlockBogEarth.java | 4 +- .../forestry/core/blocks/BlockRegistry.java | 7 +- .../core/blocks/BlockRegistryCore.java | 1 - .../core/blocks/BlockResourceOre.java | 4 +- .../core/circuits/CircuitRegistry.java | 4 +- .../core/circuits/ItemCircuitBoard.java | 4 +- ...ommandPlugins.java => CommandModules.java} | 69 +-- .../core/genetics/BreedingTracker.java | 5 + .../forestry/core/genetics/Chromosome.java | 19 +- .../java/forestry/core/genetics/Genome.java | 54 ++- .../forestry/core/genetics/SpeciesRoot.java | 38 ++ .../core/genetics/alleles/AlleleHelper.java | 14 +- .../core/genetics/alleles/AlleleRegistry.java | 13 +- .../core/genetics/alleles/AlleleSpecies.java | 20 +- .../core/gui/ContainerLiquidTanks.java | 1 + src/main/java/forestry/core/gui/Drawable.java | 56 +++ .../java/forestry/core/gui/GuiForestry.java | 18 +- .../java/forestry/core/gui/GuiIdRegistry.java | 5 +- src/main/java/forestry/core/gui/GuiUtil.java | 6 +- .../forestry/core/gui/TextLayoutHelper.java | 21 +- .../buttons/StandardButtonTextureSets.java | 5 + .../core/gui/elements/GuiElement.java | 71 +++ .../core/gui/elements/GuiElementDrawable.java | 17 + .../core/gui/elements/GuiElementFactory.java | 273 ++++++++++++ .../core/gui/elements/GuiElementHelper.java | 137 ++++++ .../gui/elements/GuiElementHorizontal.java | 43 ++ .../gui/elements/GuiElementItemStack.java | 52 +++ .../core/gui/elements/GuiElementLayout.java | 70 +++ .../gui/elements/GuiElementLayoutHelper.java | 87 ++++ .../core/gui/elements/GuiElementPanel.java | 50 +++ .../gui/elements/GuiElementScrollable.java | 94 ++++ .../core/gui/elements/GuiElementText.java | 68 +++ .../core/gui/elements/GuiElementVertical.java | 43 ++ .../core/gui/elements/GuiElementWrapped.java | 49 ++ .../core/gui/elements/package-info.java | 10 + .../core/gui/widgets/IScrollable.java | 12 + .../forestry/core/gui/widgets/Widget.java | 9 + .../gui/widgets/WidgetElementProvider.java | 50 +++ .../core/gui/widgets/WidgetManager.java | 12 +- .../core/gui/widgets/WidgetScrollBar.java | 172 ++++++++ .../core/gui/widgets/WidgetSlider.java | 45 ++ .../core/inventory/InventoryAnalyzer.java | 16 +- .../core/inventory/ItemInventoryAlyzer.java | 22 +- .../forestry/core/items/ItemForestryTool.java | 8 +- .../java/forestry/core/items/ItemFruit.java | 4 +- .../forestry/core/items/ItemRegistry.java | 7 +- .../forestry/core/network/PacketIdServer.java | 4 + .../forestry/core/tiles/TileAnalyzer.java | 34 +- .../java/forestry/core/tiles/TileBase.java | 5 +- .../utils/ForestryModEnvWarningCallable.java | 20 +- .../forestry/core/utils/GeneticsUtil.java | 52 +-- .../forestry/core/utils/InventoryUtil.java | 6 +- .../core/worldgen/WorldGenerator.java | 12 +- .../forestry/database/DatabaseFilter.java | 14 + .../forestry/database/DatabaseFilterName.java | 17 + .../database/DatabaseFilterToolTip.java | 24 + .../forestry/database/DatabaseHelper.java | 97 ++++ .../java/forestry/database/DatabaseItem.java | 21 + .../forestry/database/DatabaseManager.java | 143 ++++++ .../database/DatabaseScreenLogic.java | 116 +++++ .../java/forestry/database/DatabaseTab.java | 126 ++++++ .../forestry/database/ModuleDatabase.java | 58 +++ .../database/blocks/BlockDatabase.java | 12 + .../blocks/BlockRegistryDatabase.java | 14 + .../database/blocks/BlockTypeDatabase.java | 28 ++ .../database/blocks/package-info.java | 10 + .../database/gui/ContainerDatabase.java | 52 +++ .../forestry/database/gui/GuiDatabase.java | 288 ++++++++++++ .../database/gui/buttons/DatabaseButton.java | 63 +++ .../gui/buttons/GuiDatabaseButton.java | 34 ++ .../database/gui/buttons/package-info.java | 10 + .../compat => database/gui}/package-info.java | 3 +- .../gui/widgets/WidgetDatabaseScreen.java | 132 ++++++ .../widgets/WidgetDatabaseSelectedItem.java | 21 + .../gui/widgets/WidgetDatabaseSlot.java | 177 ++++++++ .../gui/widgets/WidgetDatabaseTabs.java | 132 ++++++ .../database/gui/widgets/package-info.java | 10 + .../database/inventory/InventoryDatabase.java | 31 ++ .../inventory/InventoryDatabaseAnalyzer.java | 51 +++ .../network/PacketRegistryDatabase.java | 32 ++ .../database/network/package-info.java | 10 + .../network/packets/PacketExtractItem.java | 123 ++++++ .../network/packets/PacketInsertItem.java | 70 +++ .../network/packets/package-info.java | 10 + .../java/forestry/database/package-info.java | 10 + .../forestry/database/tiles/TileDatabase.java | 146 ++++++ .../forestry/database/tiles/package-info.java | 10 + .../{PluginEnergy.java => ModuleEnergy.java} | 24 +- .../energy/blocks/BlockTypeEngine.java | 4 +- .../energy/tiles/TileEngineElectric.java | 5 +- .../forestry/energy/tiles/TileEnginePeat.java | 6 +- .../energy/tiles/TileEuGenerator.java | 6 +- ...{PluginFactory.java => ModuleFactory.java} | 43 +- .../factory/recipes/FermenterRecipe.java | 2 +- .../factory/recipes/jei/FactoryJeiPlugin.java | 24 +- ...{PluginFarming.java => ModuleFarming.java} | 20 +- .../farming/compat/FarmingJeiPlugin.java | 10 +- .../farming/logic/CropBasicIC2Crop.java | 2 +- .../java/forestry/farming/logic/CropPeat.java | 4 +- .../forestry/farming/logic/CropRubber.java | 2 +- .../farming/logic/FarmLogicArboreal.java | 4 +- .../farming/logic/FarmLogicOrchard.java | 10 +- .../forestry/farming/logic/FarmLogicPeat.java | 10 +- .../farming/logic/FarmLogicRubber.java | 2 +- .../farming/logic/FarmableBasicIC2Crop.java | 2 +- .../forestry/farming/logic/FarmableGE.java | 5 +- .../farming/proxy/ProxyFarmingClient.java | 4 +- .../food/{PluginFood.java => ModuleFood.java} | 13 +- ...nGreenhouse.java => ModuleGreenhouse.java} | 18 +- .../greenhouse/blocks/BlockClimatiser.java | 4 +- .../greenhouse/blocks/BlockGreenhouse.java | 4 +- .../blocks/BlockGreenhouseWindow.java | 4 +- .../modifiers/ClimateSourceModifier.java | 4 +- .../greenhouse/gui/GuiGreenhouse.java | 5 - .../gui/widgets/WidgetCamouflageTab.java | 2 +- .../gui/widgets/WidgetClimateBar.java | 2 - .../items/ItemCamouflageSprayCan.java | 4 +- .../items/ItemGreenhouseScreen.java | 4 +- .../multiblock/GreenhouseController.java | 4 +- .../proxy/ProxyGreenhouseClient.java | 8 +- .../greenhouse/tiles/TileGreenhousePlain.java | 6 +- .../lepidopterology/ButterflySpawner.java | 6 +- .../lepidopterology/ButterflyUtils.java | 11 +- ...rology.java => ModuleLepidopterology.java} | 27 +- .../entities/AIButterflyMate.java | 4 +- .../entities/AIButterflyPollinate.java | 4 +- .../entities/EntityButterfly.java | 6 +- .../lepidopterology/genetics/Butterfly.java | 10 +- .../genetics/ButterflyDatabaseTab.java | 103 +++++ .../genetics/ButterflyPlugin.java | 77 ++++ .../genetics/ButterflyProductsTab.java | 53 +++ .../genetics/ButterflyRoot.java | 18 +- .../genetics/FlutterlyzerPlugin.java | 34 +- .../genetics/alleles/ButterflyAlleles.java | 4 +- .../items/ItemButterflyGE.java | 4 +- .../worldgen/CocoonDecorator.java | 6 +- .../java/forestry/mail/LetterProperties.java | 10 +- .../mail/{PluginMail.java => ModuleMail.java} | 42 +- src/main/java/forestry/mail/PostOffice.java | 2 +- src/main/java/forestry/mail/PostRegistry.java | 2 +- src/main/java/forestry/mail/TradeStation.java | 4 +- .../forestry/mail/compat/MailJeiPlugin.java | 4 +- .../forestry/modules/BlankForestryModule.java | 28 ++ .../ForestryModule.java} | 46 +- .../forestry/modules/ForestryModuleUids.java | 39 ++ .../forestry/modules/ForestryModules.java | 46 ++ .../forestry/modules/ForestryPluginUtil.java | 71 +++ .../forestry/modules/IForestryModule.java | 116 +++++ .../forestry/modules/IModuleContainer.java | 19 + .../java/forestry/modules/IModuleManager.java | 18 + .../java/forestry/modules/ModuleManager.java | 417 ++++++++++++++++++ .../java/forestry/modules/package-info.java | 9 + .../forestry/plugins/BlankForestryPlugin.java | 162 ------- .../{compat => }/BlockRegistryIC2.java | 2 +- .../plugins/{compat => }/CompatPlugin.java | 25 +- .../plugins/ForestryCompatPlugins.java | 41 ++ .../{compat => }/ForestryJeiPlugin.java | 17 +- .../forestry/plugins/ForestryPluginUids.java | 35 -- .../forestry/plugins/ForestryPluginUtil.java | 35 -- .../forestry/plugins/IForestryPlugin.java | 80 ---- .../{compat => }/PluginActuallyAdditions.java | 13 +- .../{compat => }/PluginBetterWithMods.java | 9 +- .../{compat => }/PluginBiomesOPlenty.java | 100 ++--- .../{compat => }/PluginBuildCraftFuels.java | 12 +- .../{compat => }/PluginBuildCraftRecipes.java | 15 +- .../PluginBuildCraftStatements.java | 15 +- .../PluginBuildCraftTransport.java | 26 +- .../plugins/{compat => }/PluginChisel.java | 16 +- .../plugins/{compat => }/PluginEnderIO.java | 23 +- .../{compat => }/PluginExtraUtilities.java | 24 +- .../{compat => }/PluginHarvestCraft.java | 40 +- .../plugins/{compat => }/PluginIC2.java | 60 ++- .../PluginImmersiveEngineering.java | 9 +- .../java/forestry/plugins/PluginManager.java | 355 --------------- .../PluginMysticalAgriculture.java | 12 +- .../plugins/{compat => }/PluginNatura.java | 33 +- .../plugins/{compat => }/PluginRoots.java | 9 +- .../plugins/{compat => }/PluginRustic.java | 9 +- .../java/forestry/storage/CrateRegistry.java | 7 +- ...luginStorage.java => ModuleBackpacks.java} | 106 ++--- .../java/forestry/storage/ModuleCrates.java | 123 ++++++ .../storage/compat/StorageJeiPlugin.java | 6 +- .../{core => storage}/items/ItemCrated.java | 4 +- ...torage.java => ItemRegistryBackpacks.java} | 171 ++++--- .../storage/items/ItemRegistryCrates.java | 14 + .../{core => storage}/models/ModelCrate.java | 14 +- .../storage/proxy/ProxyStorageClient.java | 8 +- .../assets/forestry/blockstates/database.json | 8 + .../forestry/models/block/database.json | 66 +++ .../assets/forestry/models/item/database.json | 10 + .../textures/blocks/database_bottom.png | Bin 0 -> 303 bytes .../textures/blocks/database_side.png | Bin 0 -> 340 bytes .../textures/blocks/database_side_column.png | Bin 0 -> 179 bytes .../forestry/textures/blocks/database_top.png | Bin 0 -> 510 bytes .../assets/forestry/textures/gui/buttons.png | Bin 7674 -> 9796 bytes .../textures/gui/database_inventory.png | Bin 0 -> 1670 bytes .../textures/gui/database_mutation_screen.png | Bin 0 -> 2258 bytes .../forestry/textures/gui/database_screen.png | Bin 0 -> 1390 bytes 277 files changed, 7361 insertions(+), 1930 deletions(-) create mode 100644 src/main/java/forestry/api/core/GuiElementAlignment.java create mode 100644 src/main/java/forestry/api/core/IGuiElement.java create mode 100644 src/main/java/forestry/api/core/IGuiElementFactory.java create mode 100644 src/main/java/forestry/api/core/IGuiElementHelper.java create mode 100644 src/main/java/forestry/api/core/IGuiElementLayout.java create mode 100644 src/main/java/forestry/api/core/IGuiElementLayoutHelper.java create mode 100644 src/main/java/forestry/api/genetics/EnumDatabaseTab.java create mode 100644 src/main/java/forestry/api/genetics/IDatabaseTab.java create mode 100644 src/main/java/forestry/api/genetics/ISpeciesPlugin.java rename src/main/java/forestry/apiculture/{PluginApiculture.java => ModuleApiculture.java} (96%) mode change 100755 => 100644 create mode 100644 src/main/java/forestry/apiculture/genetics/BeeDatabaseTab.java create mode 100644 src/main/java/forestry/apiculture/genetics/BeePlugin.java rename src/main/java/forestry/arboriculture/{PluginArboriculture.java => ModuleArboriculture.java} (90%) mode change 100755 => 100644 create mode 100644 src/main/java/forestry/arboriculture/ModuleCharcoal.java create mode 100644 src/main/java/forestry/arboriculture/blocks/BlockRegistryCharcoal.java create mode 100644 src/main/java/forestry/arboriculture/genetics/TreeDatabaseTab.java create mode 100644 src/main/java/forestry/arboriculture/genetics/TreePlugin.java rename src/main/java/forestry/core/{PluginCore.java => ModuleCore.java} (95%) rename src/main/java/forestry/core/{PluginFluids.java => ModuleFluids.java} (92%) mode change 100755 => 100644 create mode 100644 src/main/java/forestry/core/advancements/AdvancementManager.java create mode 100644 src/main/java/forestry/core/advancements/SpeciesDiscoveredTrigger.java rename src/main/java/forestry/core/blocks/{properties => }/BlockAshStairs.java (94%) rename src/main/java/forestry/core/commands/{CommandPlugins.java => CommandModules.java} (61%) create mode 100644 src/main/java/forestry/core/gui/Drawable.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElement.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementDrawable.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementFactory.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementHelper.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementHorizontal.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementItemStack.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementLayout.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementLayoutHelper.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementPanel.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementScrollable.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementText.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementVertical.java create mode 100644 src/main/java/forestry/core/gui/elements/GuiElementWrapped.java create mode 100644 src/main/java/forestry/core/gui/elements/package-info.java create mode 100644 src/main/java/forestry/core/gui/widgets/IScrollable.java create mode 100644 src/main/java/forestry/core/gui/widgets/WidgetElementProvider.java create mode 100644 src/main/java/forestry/core/gui/widgets/WidgetScrollBar.java create mode 100644 src/main/java/forestry/core/gui/widgets/WidgetSlider.java create mode 100644 src/main/java/forestry/database/DatabaseFilter.java create mode 100644 src/main/java/forestry/database/DatabaseFilterName.java create mode 100644 src/main/java/forestry/database/DatabaseFilterToolTip.java create mode 100644 src/main/java/forestry/database/DatabaseHelper.java create mode 100644 src/main/java/forestry/database/DatabaseItem.java create mode 100644 src/main/java/forestry/database/DatabaseManager.java create mode 100644 src/main/java/forestry/database/DatabaseScreenLogic.java create mode 100644 src/main/java/forestry/database/DatabaseTab.java create mode 100644 src/main/java/forestry/database/ModuleDatabase.java create mode 100644 src/main/java/forestry/database/blocks/BlockDatabase.java create mode 100644 src/main/java/forestry/database/blocks/BlockRegistryDatabase.java create mode 100644 src/main/java/forestry/database/blocks/BlockTypeDatabase.java create mode 100644 src/main/java/forestry/database/blocks/package-info.java create mode 100644 src/main/java/forestry/database/gui/ContainerDatabase.java create mode 100644 src/main/java/forestry/database/gui/GuiDatabase.java create mode 100644 src/main/java/forestry/database/gui/buttons/DatabaseButton.java create mode 100644 src/main/java/forestry/database/gui/buttons/GuiDatabaseButton.java create mode 100644 src/main/java/forestry/database/gui/buttons/package-info.java rename src/main/java/forestry/{plugins/compat => database/gui}/package-info.java (87%) create mode 100644 src/main/java/forestry/database/gui/widgets/WidgetDatabaseScreen.java create mode 100644 src/main/java/forestry/database/gui/widgets/WidgetDatabaseSelectedItem.java create mode 100644 src/main/java/forestry/database/gui/widgets/WidgetDatabaseSlot.java create mode 100644 src/main/java/forestry/database/gui/widgets/WidgetDatabaseTabs.java create mode 100644 src/main/java/forestry/database/gui/widgets/package-info.java create mode 100644 src/main/java/forestry/database/inventory/InventoryDatabase.java create mode 100644 src/main/java/forestry/database/inventory/InventoryDatabaseAnalyzer.java create mode 100644 src/main/java/forestry/database/network/PacketRegistryDatabase.java create mode 100644 src/main/java/forestry/database/network/package-info.java create mode 100644 src/main/java/forestry/database/network/packets/PacketExtractItem.java create mode 100644 src/main/java/forestry/database/network/packets/PacketInsertItem.java create mode 100644 src/main/java/forestry/database/network/packets/package-info.java create mode 100644 src/main/java/forestry/database/package-info.java create mode 100644 src/main/java/forestry/database/tiles/TileDatabase.java create mode 100644 src/main/java/forestry/database/tiles/package-info.java rename src/main/java/forestry/energy/{PluginEnergy.java => ModuleEnergy.java} (86%) rename src/main/java/forestry/factory/{PluginFactory.java => ModuleFactory.java} (95%) mode change 100755 => 100644 rename src/main/java/forestry/farming/{PluginFarming.java => ModuleFarming.java} (95%) rename src/main/java/forestry/food/{PluginFood.java => ModuleFood.java} (72%) rename src/main/java/forestry/greenhouse/{PluginGreenhouse.java => ModuleGreenhouse.java} (94%) rename src/main/java/forestry/lepidopterology/{PluginLepidopterology.java => ModuleLepidopterology.java} (93%) mode change 100755 => 100644 create mode 100644 src/main/java/forestry/lepidopterology/genetics/ButterflyDatabaseTab.java create mode 100644 src/main/java/forestry/lepidopterology/genetics/ButterflyPlugin.java create mode 100644 src/main/java/forestry/lepidopterology/genetics/ButterflyProductsTab.java rename src/main/java/forestry/mail/{PluginMail.java => ModuleMail.java} (87%) create mode 100644 src/main/java/forestry/modules/BlankForestryModule.java rename src/main/java/forestry/{plugins/ForestryPlugin.java => modules/ForestryModule.java} (53%) create mode 100644 src/main/java/forestry/modules/ForestryModuleUids.java create mode 100644 src/main/java/forestry/modules/ForestryModules.java create mode 100644 src/main/java/forestry/modules/ForestryPluginUtil.java create mode 100644 src/main/java/forestry/modules/IForestryModule.java create mode 100644 src/main/java/forestry/modules/IModuleContainer.java create mode 100644 src/main/java/forestry/modules/IModuleManager.java create mode 100644 src/main/java/forestry/modules/ModuleManager.java create mode 100644 src/main/java/forestry/modules/package-info.java delete mode 100755 src/main/java/forestry/plugins/BlankForestryPlugin.java rename src/main/java/forestry/plugins/{compat => }/BlockRegistryIC2.java (95%) rename src/main/java/forestry/plugins/{compat => }/CompatPlugin.java (69%) create mode 100644 src/main/java/forestry/plugins/ForestryCompatPlugins.java rename src/main/java/forestry/plugins/{compat => }/ForestryJeiPlugin.java (78%) delete mode 100644 src/main/java/forestry/plugins/ForestryPluginUids.java delete mode 100644 src/main/java/forestry/plugins/ForestryPluginUtil.java delete mode 100755 src/main/java/forestry/plugins/IForestryPlugin.java rename src/main/java/forestry/plugins/{compat => }/PluginActuallyAdditions.java (81%) rename src/main/java/forestry/plugins/{compat => }/PluginBetterWithMods.java (81%) rename src/main/java/forestry/plugins/{compat => }/PluginBiomesOPlenty.java (76%) rename src/main/java/forestry/plugins/{compat => }/PluginBuildCraftFuels.java (78%) rename src/main/java/forestry/plugins/{compat => }/PluginBuildCraftRecipes.java (72%) rename src/main/java/forestry/plugins/{compat => }/PluginBuildCraftStatements.java (79%) rename src/main/java/forestry/plugins/{compat => }/PluginBuildCraftTransport.java (72%) rename src/main/java/forestry/plugins/{compat => }/PluginChisel.java (77%) rename src/main/java/forestry/plugins/{compat => }/PluginEnderIO.java (81%) rename src/main/java/forestry/plugins/{compat => }/PluginExtraUtilities.java (83%) rename src/main/java/forestry/plugins/{compat => }/PluginHarvestCraft.java (84%) rename src/main/java/forestry/plugins/{compat => }/PluginIC2.java (86%) mode change 100755 => 100644 rename src/main/java/forestry/plugins/{compat => }/PluginImmersiveEngineering.java (86%) delete mode 100755 src/main/java/forestry/plugins/PluginManager.java rename src/main/java/forestry/plugins/{compat => }/PluginMysticalAgriculture.java (87%) rename src/main/java/forestry/plugins/{compat => }/PluginNatura.java (91%) rename src/main/java/forestry/plugins/{compat => }/PluginRoots.java (84%) rename src/main/java/forestry/plugins/{compat => }/PluginRustic.java (88%) rename src/main/java/forestry/storage/{PluginStorage.java => ModuleBackpacks.java} (85%) create mode 100644 src/main/java/forestry/storage/ModuleCrates.java rename src/main/java/forestry/{core => storage}/items/ItemCrated.java (96%) mode change 100755 => 100644 rename src/main/java/forestry/storage/items/{ItemRegistryStorage.java => ItemRegistryBackpacks.java} (87%) create mode 100644 src/main/java/forestry/storage/items/ItemRegistryCrates.java rename src/main/java/forestry/{core => storage}/models/ModelCrate.java (93%) mode change 100755 => 100644 create mode 100644 src/main/resources/assets/forestry/blockstates/database.json create mode 100644 src/main/resources/assets/forestry/models/block/database.json create mode 100644 src/main/resources/assets/forestry/models/item/database.json create mode 100644 src/main/resources/assets/forestry/textures/blocks/database_bottom.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/database_side.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/database_side_column.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/database_top.png create mode 100644 src/main/resources/assets/forestry/textures/gui/database_inventory.png create mode 100644 src/main/resources/assets/forestry/textures/gui/database_mutation_screen.png create mode 100644 src/main/resources/assets/forestry/textures/gui/database_screen.png diff --git a/gradle.properties b/gradle.properties index 699e0f944..66ed443a6 100755 --- a/gradle.properties +++ b/gradle.properties @@ -10,5 +10,5 @@ jei_mcversion=1.12.2 ic2_version=2.8.24-ex112 version_major=5 -version_minor=6 +version_minor=7 version_patch=0 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index dc9b4a51f..fd5b38b32 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -34,6 +34,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.core.ForestryAPI; import forestry.api.core.ForestryEvent; import forestry.core.EventHandlerCore; +import forestry.core.advancements.AdvancementManager; import forestry.core.climate.ClimateStates; import forestry.core.config.Config; import forestry.core.config.Constants; @@ -45,9 +46,11 @@ import forestry.core.multiblock.MultiblockEventHandler; import forestry.core.network.PacketHandler; import forestry.core.proxy.Proxies; import forestry.core.worldgen.WorldGenerator; -import forestry.plugins.PluginManager; -import forestry.plugins.compat.PluginIC2; -import forestry.plugins.compat.PluginNatura; +import forestry.modules.ForestryModules; +import forestry.modules.ModuleManager; +import forestry.plugins.ForestryCompatPlugins; +import forestry.plugins.PluginIC2; +import forestry.plugins.PluginNatura; /** * Forestry Minecraft Mod @@ -81,6 +84,8 @@ public class Forestry { EnumErrorCode.init(); FluidRegistry.enableUniversalBucket(); MinecraftForge.EVENT_BUS.register(this); + ModuleManager moduleManager = ModuleManager.getInstance(); + moduleManager.registerContainers(new ForestryModules(), new ForestryCompatPlugins()); } @Nullable @@ -107,19 +112,19 @@ public class Forestry { MinecraftForge.EVENT_BUS.post(new ForestryEvent.PreInit(this, event)); - PluginManager.runSetup(event); + ModuleManager.runSetup(event); String gameMode = Config.gameMode; Preconditions.checkState(gameMode != null); ForestryAPI.activeMode = new GameMode(gameMode); - PluginManager.runPreInit(event.getSide()); + ModuleManager.runPreInit(event.getSide()); } @SubscribeEvent public void registerModels(ModelRegistryEvent event) { - PluginManager.runRegisterBackpacksAndCrates(); + ModuleManager.runRegisterBackpacksAndCrates(); Proxies.render.registerModels(); } @@ -128,14 +133,15 @@ public class Forestry { // Register gui handler NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); - PluginManager.runInit(); + ModuleManager.runInit(); Proxies.render.registerItemAndBlockColors(); + AdvancementManager.registerTriggers(); } @EventHandler public void postInit(FMLPostInitializationEvent event) { - PluginManager.runPostInit(); + ModuleManager.runPostInit(); // Register world generator WorldGenerator worldGenerator = new WorldGenerator(); @@ -145,12 +151,12 @@ public class Forestry { Proxies.common.registerTickHandlers(worldGenerator); // Handle IMC messages. - PluginManager.processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance)); + ModuleManager.processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance)); } @EventHandler public void serverStarting(FMLServerStartingEvent event) { - PluginManager.serverStarting(event.getServer()); + ModuleManager.serverStarting(event.getServer()); } @Nullable @@ -160,6 +166,6 @@ public class Forestry { @EventHandler public void processIMCMessages(IMCEvent event) { - PluginManager.processIMCMessages(event.getMessages()); + ModuleManager.processIMCMessages(event.getMessages()); } } diff --git a/src/main/java/forestry/api/arboriculture/IAlleleFruit.java b/src/main/java/forestry/api/arboriculture/IAlleleFruit.java index 2272250fb..ad67364e1 100644 --- a/src/main/java/forestry/api/arboriculture/IAlleleFruit.java +++ b/src/main/java/forestry/api/arboriculture/IAlleleFruit.java @@ -19,6 +19,4 @@ public interface IAlleleFruit extends IAlleleProperty { @Nullable String getModelName(); - String getModID(); - } diff --git a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java index 4ef1b116b..26f4e4221 100644 --- a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java +++ b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java @@ -7,15 +7,18 @@ package forestry.api.arboriculture; import java.util.Collection; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.item.Item; + +import net.minecraftforge.common.EnumPlantType; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IModelManager; import forestry.api.genetics.IAlleleProperty; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IFruitFamily; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.item.Item; -import net.minecraftforge.common.EnumPlantType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty { @@ -36,11 +39,6 @@ public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty getDisplyItems(); + + NonNullList getDisplayItems(); } diff --git a/src/main/java/forestry/api/arboriculture/IWoodProvider.java b/src/main/java/forestry/api/arboriculture/IWoodProvider.java index 01a9b6d46..e5563d8e6 100644 --- a/src/main/java/forestry/api/arboriculture/IWoodProvider.java +++ b/src/main/java/forestry/api/arboriculture/IWoodProvider.java @@ -5,13 +5,15 @@ ******************************************************************************/ package forestry.api.arboriculture; -import forestry.api.core.ITextureManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.ITextureManager; + public interface IWoodProvider { @SideOnly(Side.CLIENT) void registerSprites(Item item, ITextureManager manager); @@ -29,11 +31,15 @@ public interface IWoodProvider { /** * The amount of charcoal dropped from a charcoal pile of this wood. + * @deprecated Will be removed in 1.13 */ + @Deprecated int getCarbonization(); /** * The chance that a pile has to drop a extra charcoal + * @deprecated Will be removed in 1.13 */ + @Deprecated float getCharcoalChance(int numberOfCharcoal); } diff --git a/src/main/java/forestry/api/arboriculture/package-info.java b/src/main/java/forestry/api/arboriculture/package-info.java index 19147bbe2..b5e61d604 100644 --- a/src/main/java/forestry/api/arboriculture/package-info.java +++ b/src/main/java/forestry/api/arboriculture/package-info.java @@ -5,10 +5,11 @@ ******************************************************************************/ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -@API(apiVersion = "4.2.1", owner = "ForestryAPI|core", provides = "ForestryAPI|arboriculture") +@API(apiVersion = "4.3.0", owner = "ForestryAPI|core", provides = "ForestryAPI|arboriculture") package forestry.api.arboriculture; import javax.annotation.ParametersAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; import net.minecraftforge.fml.common.API; + +import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/forestry/api/core/ForestryAPI.java b/src/main/java/forestry/api/core/ForestryAPI.java index d695b6830..02759f156 100644 --- a/src/main/java/forestry/api/core/ForestryAPI.java +++ b/src/main/java/forestry/api/core/ForestryAPI.java @@ -7,14 +7,17 @@ package forestry.api.core; import java.util.Set; +import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.climate.IClimateStates; -import forestry.greenhouse.api.climate.IClimateFactory; import forestry.api.climate.IClimateManager; +import forestry.api.climate.IClimateStates; import forestry.api.farming.IFarmRegistry; +import forestry.api.farming.IFarmable; import forestry.api.farming.ISimpleFarmLogic; +import forestry.greenhouse.api.climate.IClimateFactory; /** * Forestry's API is divided into several subcategories to make it easier to understand. @@ -58,10 +61,13 @@ public class ForestryAPI { */ public static IClimateFactory climateFactory; + /** + * + */ public static IClimateStates states; /** - * A registry for register fertilizers, {@link IFarmabeles}s and {@link ISimpleFarmLogic}s + * A registry for register fertilizers, {@link IFarmable}s and {@link ISimpleFarmLogic}s */ public static IFarmRegistry farmRegistry; @@ -76,10 +82,20 @@ public class ForestryAPI { public static IForestryConstants forestryConstants; /** - * The currently enabled Forestry plugins. + * The currently enabled Forestry modules. * Can be used to check if certain features are available, for example: - * ForestryAPI.enabledPlugins.contains("APICULTURE") + * ForestryAPI.enabledModules.contains(new ResourceLocation("forestry", "apiculture")) */ + public static Set enabledModules; + + /** + * The currently enabled Forestry modules. + * Can be used to check if certain features are available, for example: + * ForestryAPI.enabledPlugins.contains("forestry.apiculture") + * + * @deprecated Use {@link #enabledModules} + */ + @Deprecated public static Set enabledPlugins; /** diff --git a/src/main/java/forestry/api/core/GuiElementAlignment.java b/src/main/java/forestry/api/core/GuiElementAlignment.java new file mode 100644 index 000000000..70652d9ea --- /dev/null +++ b/src/main/java/forestry/api/core/GuiElementAlignment.java @@ -0,0 +1,8 @@ +package forestry.api.core; + +/** + * The alignment of the text in a text gui element. + */ +public enum GuiElementAlignment { + LEFT, CENTER, RIGHT; +} diff --git a/src/main/java/forestry/api/core/IGuiElement.java b/src/main/java/forestry/api/core/IGuiElement.java new file mode 100644 index 000000000..ebc634ed4 --- /dev/null +++ b/src/main/java/forestry/api/core/IGuiElement.java @@ -0,0 +1,38 @@ +package forestry.api.core; + +import javax.annotation.Nullable; +import java.util.Collections; +import java.util.List; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public interface IGuiElement { + int getX(); + + int getY(); + + int getWidth(); + + int getHeight(); + + void setXOffset(int xOffset); + + void setYOffset(int yOffset); + + @Nullable + IGuiElement getParent(); + + void setParent(@Nullable IGuiElement parent); + + void draw(int startX, int startY); + + @SideOnly(Side.CLIENT) + default List getToolTip(int mouseX, int mouseY){ + return Collections.emptyList(); + } + + @SideOnly(Side.CLIENT) + boolean isMouseOver(int mouseX, int mouseY); +} diff --git a/src/main/java/forestry/api/core/IGuiElementFactory.java b/src/main/java/forestry/api/core/IGuiElementFactory.java new file mode 100644 index 000000000..d0ff25998 --- /dev/null +++ b/src/main/java/forestry/api/core/IGuiElementFactory.java @@ -0,0 +1,49 @@ +package forestry.api.core; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IMutation; + +/** + * A helper interface to create gui elements. + */ +@SideOnly(Side.CLIENT) +public interface IGuiElementFactory { + + IGuiElementHelper createHelper(IGuiElementLayout element); + + /* GENETIC*/ + /** + * @param dominant True if you want the dominant color and false if you want the recessive color. + * + * @return The color code that forestry uses to show if a allele is dominant (true) or recessive (false). + */ + int getColorCoding(boolean dominant); + + /** + * @return Null if the mutation is secret and undiscovered. {@link IMutation#isSecret()} + */ + IGuiElement createMutation(int x, int y, int width, int height, IMutation mutation, IAllele species, IBreedingTracker breedingTracker); + + /** + * @return Null if the mutation is secret and undiscovered. {@link IMutation#isSecret()} + */ + IGuiElement createMutationResultant(int x, int y, int width, int height, IMutation mutation, IBreedingTracker breedingTracker); + + IGuiElement createFertilityInfo(IAlleleInteger fertilityAllele, int x, int texOffset); + + IGuiElement createToleranceInfo(IAlleleTolerance toleranceAllele, IAlleleSpecies species, String text); + + /* LAYOUTS */ + IGuiElementLayout createHorizontal(int xPos, int yPos, int height); + + IGuiElementLayout createVertical(int xPos, int yPos, int width); + + IGuiElementLayout createPanel(int xPos, int yPos, int width, int height); +} diff --git a/src/main/java/forestry/api/core/IGuiElementHelper.java b/src/main/java/forestry/api/core/IGuiElementHelper.java new file mode 100644 index 000000000..67d502e08 --- /dev/null +++ b/src/main/java/forestry/api/core/IGuiElementHelper.java @@ -0,0 +1,93 @@ +package forestry.api.core; + +import java.util.function.Function; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.IGuiElementLayoutHelper.LayoutFactory; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; + +/** + * A helper interface to add gui elements. + */ +@SideOnly(Side.CLIENT) +public interface IGuiElementHelper { + /** + * Adds a {@link IGuiElement} to the parent of this. + */ + void add(IGuiElement element); + + /** + * Centers a element to the center of the x axis of the parent element. + * + * @return the element + */ + IGuiElement centerElement(IGuiElement element); + + /** + * Creates and adds an item gui element. + */ + void addItem(int x, ItemStack itemStack); + + IGuiElementLayoutHelper layoutHelper(LayoutFactory layoutFactory, int width, int height); + + /** + * Adds the chromosomeName and the name of the active/not active allele, of the chromosome, with {@link #addText}. + */ + void addAllele(String chromosomeName, IIndividual individual, IChromosomeType chromosome, boolean active); + + /** + * Adds the chromosomeName and the result of toString with {@link #addText}. + */ + void addAllele(String chromosomeName, Function toString, IIndividual individual, IChromosomeType chromosome, boolean active); + + void addFertilityInfo(IAlleleInteger fertilityAllele, int x, int texOffset); + + void addToleranceInfo(IAlleleTolerance toleranceAllele, IAlleleSpecies species, String text); + + void addMutation(int x, int y, int width, int height, IMutation mutation, IAllele species, IBreedingTracker breedingTracker); + + void addMutationResultant(int x, int y, int width, int height, IMutation mutation, IBreedingTracker breedingTracker); + + /** + * Adds a text element with the default color,the align {@link GuiElementAlignment#LEFT} and the height 12. + */ + void addText(String text); + + /** + * Adds a text element with the align {@link GuiElementAlignment#LEFT} and the height 12. + */ + void addText(String text, int color); + + /** + * Adds a text element with the default color and the height 12. + */ + void addText(String text, GuiElementAlignment align); + + /** + * Adds a text element with the height 12. + */ + void addText(String text,GuiElementAlignment align, int color); + + /** + * Adds a text element. + */ + void addText(int x, int height, String text, GuiElementAlignment align, int color); + + /** + * @return The element to which all elements are added. + */ + IGuiElement getParent(); + + IGuiElementFactory factory(); +} diff --git a/src/main/java/forestry/api/core/IGuiElementLayout.java b/src/main/java/forestry/api/core/IGuiElementLayout.java new file mode 100644 index 000000000..94613c8b2 --- /dev/null +++ b/src/main/java/forestry/api/core/IGuiElementLayout.java @@ -0,0 +1,62 @@ +package forestry.api.core; + +import java.util.Collection; +import java.util.List; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public interface IGuiElementLayout extends IGuiElement { + /** + * Adds a element to this layout. + */ + IGuiElementLayout addElement(IGuiElement element); + + /** + * Removes a element from this layout. + */ + IGuiElementLayout removeElement(IGuiElement element); + + default IGuiElementLayout addElements(IGuiElement... elements){ + for(IGuiElement element : elements){ + addElement(element); + } + return this; + } + + default IGuiElementLayout removeElements(IGuiElement... elements){ + for(IGuiElement element : elements){ + removeElement(element); + } + return this; + } + + default IGuiElementLayout addElements(Collection elements){ + elements.forEach(element -> addElement(element)); + return this; + } + + default IGuiElementLayout removeElements(Collection elements){ + elements.forEach(element -> removeElement(element)); + return this; + } + + List getElements(); + + IGuiElementLayout setDistance(int distance); + + void addTooltip(String line); + + /** + * @return The tooltip that is displayed if the mouse is over this element and no element of this layout is under it. + */ + List getTooltip(); + + /** + * @return The distance between the different elements of this layout. + */ + int getDistance(); + + int getSize(); +} diff --git a/src/main/java/forestry/api/core/IGuiElementLayoutHelper.java b/src/main/java/forestry/api/core/IGuiElementLayoutHelper.java new file mode 100644 index 000000000..3345c824b --- /dev/null +++ b/src/main/java/forestry/api/core/IGuiElementLayoutHelper.java @@ -0,0 +1,36 @@ +package forestry.api.core; + +import java.util.Collection; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public interface IGuiElementLayoutHelper { + /** + * @return Only false if the helper has no space to add this element. + */ + boolean add(IGuiElement element); + + /** + * Removes all layouts and resets all variables of this helper. + */ + void clear(); + + /** + * Adds the layouts to the parent of the {@link IGuiElementHelper}. And calls {@link #clear()} + */ + void finish(); + + /** + * @return All layouts that were created with the help of this helper since the last {@link #clear()} or {@link #finish()}. + */ + Collection layouts(); + + interface LayoutFactory { + /** + * A factory method to create new layouts if the last layout is full. + */ + IGuiElementLayout createLayout(int xOffset, int yOffset); + } +} diff --git a/src/main/java/forestry/api/core/package-info.java b/src/main/java/forestry/api/core/package-info.java index ec1086adc..bf0db9833 100644 --- a/src/main/java/forestry/api/core/package-info.java +++ b/src/main/java/forestry/api/core/package-info.java @@ -5,7 +5,7 @@ ******************************************************************************/ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -@API(apiVersion = "5.2.0", owner = "Forestry", provides = "ForestryAPI|core") +@API(apiVersion = "5.3.0", owner = "Forestry", provides = "ForestryAPI|core") package forestry.api.core; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/forestry/api/genetics/EnumDatabaseTab.java b/src/main/java/forestry/api/genetics/EnumDatabaseTab.java new file mode 100644 index 000000000..2607f5aef --- /dev/null +++ b/src/main/java/forestry/api/genetics/EnumDatabaseTab.java @@ -0,0 +1,15 @@ +package forestry.api.genetics; + +/** + * Every instance of this enum represents a tab in the database. + */ +public enum EnumDatabaseTab { + //Used to display information about the active species of the individual. + ACTIVE_SPECIES, + //Used to display information about the inactive species of the individual. + INACTIVE_SPECIES, + //Used to display information about the products of the active species of the individual. + PRODUCTS, + //Used to display information about the mutations of the active species of the individual. + MUTATIONS; +} diff --git a/src/main/java/forestry/api/genetics/IDatabaseTab.java b/src/main/java/forestry/api/genetics/IDatabaseTab.java new file mode 100644 index 000000000..ad28743cd --- /dev/null +++ b/src/main/java/forestry/api/genetics/IDatabaseTab.java @@ -0,0 +1,37 @@ +package forestry.api.genetics; + +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.IGuiElementHelper; + +/** + * A tab of the database screen that shows some information about a {@link IIndividual}. + */ +@SideOnly(Side.CLIENT) +public interface IDatabaseTab { + /** + * Creates the gui elements that are displayed if this tab is selected in the database. + * + * @param individual The individual that is currently in the database selected. + * @param elementHelper A helper to create the gui elements. + */ + void createElements(IGuiElementHelper elementHelper, I individual, ItemStack itemStack); + + /** + * @return The slot of this tab. + */ + EnumDatabaseTab getTab(); + + /** + * Can be used to give the tab a custom tooltip. + */ + @Nullable + default String getTooltip(I individual){ + return null; + } +} diff --git a/src/main/java/forestry/api/genetics/IGenome.java b/src/main/java/forestry/api/genetics/IGenome.java index 156fe2d7e..299082a17 100644 --- a/src/main/java/forestry/api/genetics/IGenome.java +++ b/src/main/java/forestry/api/genetics/IGenome.java @@ -14,17 +14,38 @@ import forestry.api.core.INbtWritable; */ public interface IGenome extends INbtWritable { + /** + * @return The active species of this genome. + */ IAlleleSpecies getPrimary(); + /** + * @return The inactive species of this genome. + */ IAlleleSpecies getSecondary(); + /** + * @return A array with all chromosomes of this genome. + */ IChromosome[] getChromosomes(); + /** + * @return The active allele of this chromosome type. + */ IAllele getActiveAllele(IChromosomeType chromosomeType); + /** + * @return The inactive allele of this chromosome type. + */ IAllele getInactiveAllele(IChromosomeType chromosomeType); + /** + * @return true if the given other IGenome has the amount of chromosomes and their alleles are identical. + */ boolean isGeneticEqual(IGenome other); + /** + * @return The root of this species and describes the class of species of this genome. + */ ISpeciesRoot getSpeciesRoot(); } diff --git a/src/main/java/forestry/api/genetics/IHousing.java b/src/main/java/forestry/api/genetics/IHousing.java index fcf33c28f..b544995b5 100644 --- a/src/main/java/forestry/api/genetics/IHousing.java +++ b/src/main/java/forestry/api/genetics/IHousing.java @@ -12,6 +12,9 @@ import net.minecraft.util.math.BlockPos; */ public interface IHousing { + /** + * The coordinates of the housing. + */ BlockPos getCoordinates(); } diff --git a/src/main/java/forestry/api/genetics/IIndividual.java b/src/main/java/forestry/api/genetics/IIndividual.java index e080f79fd..fd596cacb 100644 --- a/src/main/java/forestry/api/genetics/IIndividual.java +++ b/src/main/java/forestry/api/genetics/IIndividual.java @@ -16,10 +16,19 @@ import forestry.api.core.INbtWritable; */ public interface IIndividual extends INbtWritable { + /** + * @return The uid of the active species of this individual. + */ String getIdent(); + /** + * @return The display name of the active species of this individual. + */ String getDisplayName(); + /** + * Adds some information about the individual to the list. + */ void addTooltip(List list); /** @@ -29,12 +38,24 @@ public interface IIndividual extends INbtWritable { */ boolean analyze(); + /** + * @return true if the IIndividual has been analyzed previously. + */ boolean isAnalyzed(); + /** + * @return true if the active species of this individual has a effect. + */ boolean hasEffect(); + /** + * @return true if the active species of this individual is secret. + */ boolean isSecret(); + /** + * @return The genetic data of this individual. + */ IGenome getGenome(); /** @@ -49,6 +70,9 @@ public interface IIndividual extends INbtWritable { */ IIndividual copy(); + /** + * @return true if this individual has the same active and inactive species. + */ boolean isPureBred(IChromosomeType chromosomeType); } diff --git a/src/main/java/forestry/api/genetics/ISpeciesPlugin.java b/src/main/java/forestry/api/genetics/ISpeciesPlugin.java new file mode 100644 index 000000000..c517968c2 --- /dev/null +++ b/src/main/java/forestry/api/genetics/ISpeciesPlugin.java @@ -0,0 +1,102 @@ +package forestry.api.genetics; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.IGuiElementHelper; + +/** + * An ISpeciesPlugin provides methods that are used in the alyzer and database to display information about an + * individual. + */ +@SideOnly(Side.CLIENT) +public interface ISpeciesPlugin { + + /** + * A map that contains a {@link ItemStack} for every possible {@link IAlleleSpecies}. + * This item stack represents the species in the database and alyzer gui. + * + * The key of the map is the uid of the species. + */ + Map getIndividualStacks(); + + + /* ALYZER */ + /** + * Creates the first page of the alyzer. + * + * @param gui A instance of the alyzer gui. + * @param elementHelper A helper to create the gui elements. + * @param individual The individual that is currently in the alyzer slot. + */ + default void createFirstPage(GuiScreen gui, IGuiElementHelper elementHelper, I individual){ + } + + /** + * Creates the second page of the alyzer. + * + * @param gui A instance of the alyzer gui. + * @param elementHelper A helper to create the gui elements. + * @param individual The individual that is currently in the alyzer slot. + */ + default void createSecondPage(GuiScreen gui, IGuiElementHelper elementHelper, I individual){ + } + + /** + * Creates the third page of the alyzer. This page is usually used to display the products of the individual. + * + * @param gui A instance of the alyzer gui. + * @param elementHelper A helper to create the gui elements. + * @param individual The individual that is currently in the alyzer slot. + */ + default void createThirdPage(GuiScreen gui, IGuiElementHelper elementHelper, I individual){ + } + + /** + * The hints that will be shown in the alyzer gui. + */ + List getHints(); + + /* DATABASE */ + /** + * Provides a instance of a {@link IDatabaseTab} that is used to display information about the species of a individual in the + * database. + * + * @param active True if this tab is used to display the active species of the individual. + * + * @return null if this plugin does not support the database. + */ + default IDatabaseTab getSpeciesTab(boolean active){ + return null; + } + + /** + * Can be used to provide a custom products tab for the database. + * If this is Null forestry uses the default mutation tab to display the products. + */ + @Nullable + default IDatabaseTab getProductsTab(){ + return null; + } + + /** + * Can be used to provide a custom mutation tab for the database. + * If this is Null forestry uses the default mutation tab to display the mutations. + */ + @Nullable + default IDatabaseTab getMutationTab(){ + return null; + } + + /** + * A item stack that represents the database tab in the database gui. + */ + ItemStack getTabDatabaseIconItem(EnumDatabaseTab tab); +} diff --git a/src/main/java/forestry/api/genetics/ISpeciesRoot.java b/src/main/java/forestry/api/genetics/ISpeciesRoot.java index 379eab099..ceca13a8f 100644 --- a/src/main/java/forestry/api/genetics/ISpeciesRoot.java +++ b/src/main/java/forestry/api/genetics/ISpeciesRoot.java @@ -11,12 +11,15 @@ import java.util.List; import java.util.Map; import java.util.Random; -import com.mojang.authlib.GameProfile; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + /** * Describes a class of species (i.e. bees, trees, butterflies), provides helper functions and access to common functionality. */ @@ -72,6 +75,9 @@ public interface ISpeciesRoot { @Nullable IIndividualTranslator getTranslator(Object translatorKey); + @Nullable + I translateMember(O objectToTranslator); + @Nullable ISpeciesType getType(ItemStack itemStack); @@ -160,6 +166,12 @@ public interface ISpeciesRoot { */ List getCombinations(IAllele other); + /** + * @param other Allele to match mutations against. + * @return All registered mutations the give allele is resolute of. + */ + List getResultantMutations(IAllele other); + /** * @return all possible mutations that result from breeding two species * @since Forestry 3.7 @@ -197,4 +209,19 @@ public interface ISpeciesRoot { * Plugin to add information for the handheld genetic analyzer. */ IAlyzerPlugin getAlyzerPlugin(); + + /** + * A array with the size of 4. With the database tabs of this {@link IIndividual}. + */ + //IDatabaseTab[] getDatabaseTabs(); + + /** + * Plugin to add information for the handheld genetic analyzer and the database. + * @since 5.7 + */ + @Nullable + @SideOnly(Side.CLIENT) + default ISpeciesPlugin getSpeciesPlugin(){ + return null; + } } diff --git a/src/main/java/forestry/api/genetics/package-info.java b/src/main/java/forestry/api/genetics/package-info.java index 845f5a609..036e36aaf 100644 --- a/src/main/java/forestry/api/genetics/package-info.java +++ b/src/main/java/forestry/api/genetics/package-info.java @@ -5,10 +5,11 @@ ******************************************************************************/ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -@API(apiVersion = "4.7.1", owner = "ForestryAPI|core", provides = "ForestryAPI|genetics") +@API(apiVersion = "5.7.0", owner = "ForestryAPI|core", provides = "ForestryAPI|genetics") package forestry.api.genetics; import javax.annotation.ParametersAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; import net.minecraftforge.fml.common.API; + +import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java b/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java index 504e281cd..995cb7552 100644 --- a/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java +++ b/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java @@ -8,16 +8,19 @@ package forestry.api.lepidopterology; import java.util.Map; import java.util.Set; -import forestry.api.genetics.IAlleleSpecies; import net.minecraft.item.ItemStack; + import net.minecraftforge.common.BiomeDictionary; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.genetics.IAlleleSpecies; + public interface IAlleleButterflySpecies extends IAlleleSpecies { /** - * @return the IBeeRoot + * @return the IButterflyRoot */ @Override IButterflyRoot getRoot(); @@ -59,15 +62,16 @@ public interface IAlleleButterflySpecies extends IAlleleSpecies { */ boolean isNocturnal(); + /** + * @return The loot that drops if you kill a butterfly. + */ Map getButterflyLoot(); + /** + * @return The loot that drops if you destroy a leaf that contains a caterpillar. + */ Map getCaterpillarLoot(); @SideOnly(Side.CLIENT) void registerSprites(); - - /** - * @return The modid from the mod of the species. - */ - String getModID(); } diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 0f16e1a92..3cf2e16a9 100644 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -276,13 +276,13 @@ public class BeekeepingLogic implements IBeekeepingLogic { // Work cycles are throttled, rather than occurring every game tick. queenWorkCycleThrottle++; - if (queenWorkCycleThrottle >= PluginApiculture.ticksPerBeeWorkCycle) { + if (queenWorkCycleThrottle >= ModuleApiculture.ticksPerBeeWorkCycle) { queenWorkCycleThrottle = 0; doProduction(queen, housing, beeListener); World world = housing.getWorldObj(); List flowers = hasFlowersCache.getFlowers(world); - if (flowers.size() < PluginApiculture.maxFlowersSpawnedPerHive) { + if (flowers.size() < ModuleApiculture.maxFlowersSpawnedPerHive) { BlockPos blockPos = queen.plantFlowerRandom(housing, flowers); if (blockPos != null) { hasFlowersCache.addFlowerPos(blockPos); @@ -380,7 +380,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { NBTTagCompound nbttagcompound = new NBTTagCompound(); princess.writeToNBT(nbttagcompound); - queenStack = new ItemStack(PluginApiculture.getItems().beeQueenGE); + queenStack = new ItemStack(ModuleApiculture.getItems().beeQueenGE); queenStack.setTagCompound(nbttagcompound); beeInventory.setQueen(queenStack); @@ -410,7 +410,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { } else { Log.warning("Tried to spawn offspring off an unmated queen. Devolving her to a princess."); - ItemStack convert = new ItemStack(PluginApiculture.getItems().beePrincessGE); + ItemStack convert = new ItemStack(ModuleApiculture.getItems().beePrincessGE); NBTTagCompound nbttagcompound = new NBTTagCompound(); queen.writeToNBT(nbttagcompound); convert.setTagCompound(nbttagcompound); @@ -433,7 +433,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { IApiaristTracker breedingTracker = BeeManager.beeRoot.getBreedingTracker(world, beeHousing.getOwner()); // Princess - boolean secondPrincess = world.rand.nextInt(10000) < PluginApiculture.getSecondPrincessChance() * 100; + boolean secondPrincess = world.rand.nextInt(10000) < ModuleApiculture.getSecondPrincessChance() * 100; int count = secondPrincess ? 2 : 1; while (count > 0) { count--; diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/ModuleApiculture.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/apiculture/PluginApiculture.java rename to src/main/java/forestry/apiculture/ModuleApiculture.java index 27ee3c7d6..88efb02df --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/ModuleApiculture.java @@ -21,6 +21,7 @@ import java.util.Objects; import java.util.Random; import java.util.Set; +import net.minecraft.advancements.critereon.ItemPredicate; import net.minecraft.block.BlockFlower; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -28,6 +29,7 @@ import net.minecraft.entity.passive.EntityVillager; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.PotionTypes; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionUtils; import net.minecraft.util.NonNullList; @@ -41,6 +43,7 @@ import net.minecraft.world.storage.loot.LootTableList; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.brewing.BrewingRecipeRegistry; import net.minecraftforge.common.capabilities.CapabilityManager; @@ -110,8 +113,8 @@ import forestry.apiculture.worldgen.HiveDescription; import forestry.apiculture.worldgen.HiveGenHelper; import forestry.apiculture.worldgen.HiveRegistry; import forestry.core.ISaveEventHandler; -import forestry.core.PluginCore; -import forestry.core.PluginFluids; +import forestry.core.ModuleCore; +import forestry.core.ModuleFluids; import forestry.core.capabilities.NullStorage; import forestry.core.config.Config; import forestry.core.config.Constants; @@ -128,14 +131,14 @@ import forestry.core.utils.IMCUtil; import forestry.core.utils.Log; import forestry.core.utils.OreDictUtil; import forestry.core.utils.VillagerTradeLists; -import forestry.food.PluginFood; +import forestry.food.ModuleFood; import forestry.food.items.ItemRegistryFood; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.apiculture.description", lootTable = "apiculture") -public class PluginApiculture extends BlankForestryPlugin { +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.apiculture.description", lootTable = "apiculture") +public class ModuleApiculture extends BlankForestryModule { private static final String CONFIG_CATEGORY = "apiculture"; private static float secondPrincessChance = 0; @@ -150,6 +153,7 @@ public class PluginApiculture extends BlankForestryPlugin { private static HiveRegistry hiveRegistry; public static String beekeepingMode = "NORMAL"; + //TODO: Add to config public static final int ticksPerBeeWorkCycle = 550; public static int maxFlowersSpawnedPerHive = 20; @Nullable @@ -178,7 +182,6 @@ public class PluginApiculture extends BlankForestryPlugin { @Override public void setupAPI() { - super.setupAPI(); HiveManager.hiveRegistry = hiveRegistry = new HiveRegistry(); HiveManager.genHelper = new HiveGenHelper(); @@ -216,7 +219,6 @@ public class PluginApiculture extends BlankForestryPlugin { @Override public void preInit() { - super.preInit(); BeeDefinition.preInit(); @@ -228,7 +230,7 @@ public class PluginApiculture extends BlankForestryPlugin { } // Commands - PluginCore.rootCommand.addChildCommand(new CommandBee()); + ModuleCore.rootCommand.addChildCommand(new CommandBee()); } // TODO: Buildcraft for 1.9 @@ -355,7 +357,6 @@ public class PluginApiculture extends BlankForestryPlugin { @Override public void postInit() { - super.postInit(); registerDungeonLoot(); } @@ -404,7 +405,7 @@ public class PluginApiculture extends BlankForestryPlugin { @Override public void registerCrates() { - ItemRegistryCore coreItems = PluginCore.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); ItemRegistryApiculture items = getItems(); ICrateRegistry crateRegistry = StorageManager.crateRegistry; @@ -434,8 +435,8 @@ public class PluginApiculture extends BlankForestryPlugin { @Override public void registerRecipes() { - ItemRegistryCore coreItems = PluginCore.getItems(); - ItemRegistryFluids fluidItems = PluginFluids.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); + ItemRegistryFluids fluidItems = ModuleFluids.getItems(); ItemRegistryApiculture items = getItems(); BlockRegistryApiculture blocks = getBlocks(); @@ -504,15 +505,15 @@ public class PluginApiculture extends BlankForestryPlugin { for(int blockMeta = 0;blockMeta < EnumHoneyComb.VALUES.length - blockCount * 16;blockMeta++){ int itemMeta = blockMeta + blockCount * 16; RecipeUtil.addRecipe("comb." + itemMeta, new ItemStack(block, 1, blockMeta), - "###", - "###", + "###", + "###", "###", '#', items.beeComb.get(EnumHoneyComb.get(itemMeta), 1)); } } // FOOD STUFF - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FOOD)) { - ItemRegistryFood foodItems = PluginFood.getItems(); + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FOOD))) { + ItemRegistryFood foodItems = ModuleFood.getItems(); RecipeUtil.addRecipe("honeyed_slice", new ItemStack(foodItems.honeyedSlice, 4), "###", "#X#", "###", '#', items.honeyDrop, @@ -623,7 +624,7 @@ public class PluginApiculture extends BlankForestryPlugin { 'I', OreDictUtil.INGOT_IRON, 'W', coreItems.craftingMaterial.getWovenSilk()); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))) { // / SQUEEZER FluidStack honeyDropFluid = Fluids.FOR_HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP); RecipeManagers.squeezerManager.addRecipe(10, items.honeyDrop.getItemStack(), honeyDropFluid, items.propolis.getItemStack(), 5); @@ -852,7 +853,6 @@ public class PluginApiculture extends BlankForestryPlugin { @Override public void addLootPoolNames(Set lootPoolNames) { - super.addLootPoolNames(lootPoolNames); lootPoolNames.add("forestry_apiculture_items"); lootPoolNames.add("forestry_apiculture_bees"); } @@ -943,7 +943,7 @@ public class PluginApiculture extends BlankForestryPlugin { return true; } - return super.processIMCMessage(message); + return false; } @SubscribeEvent diff --git a/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java b/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java index 366ad5ed6..c6180388d 100755 --- a/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java +++ b/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java @@ -43,7 +43,7 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.apiculture.MaterialBeehive; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.tiles.TileHive; import forestry.core.blocks.IBlockWithMeta; import forestry.core.tiles.TileUtil; @@ -154,7 +154,7 @@ public class BlockBeeHives extends BlockContainer implements IItemModelRegister, if (hiveName == null || hiveName.equals(HiveType.SWARM.getHiveUid())) { return Collections.emptyList(); } - return PluginApiculture.getHiveRegistry().getDrops(hiveName); + return ModuleApiculture.getHiveRegistry().getDrops(hiveName); } @Nullable diff --git a/src/main/java/forestry/apiculture/blocks/BlockStump.java b/src/main/java/forestry/apiculture/blocks/BlockStump.java index 1d1668cdf..bdf6d4213 100755 --- a/src/main/java/forestry/apiculture/blocks/BlockStump.java +++ b/src/main/java/forestry/apiculture/blocks/BlockStump.java @@ -32,7 +32,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.tiles.TileCandle; import forestry.core.config.Constants; @@ -61,7 +61,7 @@ public class BlockStump extends BlockTorch implements IItemModelRegister { if (BlockCandle.lightingItems.contains(heldItem.getItem())) { IBlockState blockState = worldIn.getBlockState(pos); Block block = blockState.getBlock(); - IBlockState activatedState = PluginApiculture.getBlocks().candle.getStateFromMeta(block.getMetaFromState(blockState)); + IBlockState activatedState = ModuleApiculture.getBlocks().candle.getStateFromMeta(block.getMetaFromState(blockState)); worldIn.setBlockState(pos, activatedState, Constants.FLAG_BLOCK_SYNC); TileCandle tc = new TileCandle(); tc.setColour(16777215); // default to white diff --git a/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java b/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java index 80b71edca..8d5071554 100644 --- a/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java +++ b/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java @@ -3,7 +3,7 @@ package forestry.apiculture.compat; import com.google.common.base.Preconditions; import forestry.api.apiculture.BeeManager; import forestry.api.genetics.IAlleleSpecies; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.genetics.Genome; import forestry.core.utils.JeiUtil; @@ -16,7 +16,7 @@ import mezz.jei.api.JEIPlugin; public class ApicultureJeiPlugin implements IModPlugin { @Override public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) { - ItemRegistryApiculture items = PluginApiculture.getItems(); + ItemRegistryApiculture items = ModuleApiculture.getItems(); Preconditions.checkNotNull(items); ISubtypeRegistry.ISubtypeInterpreter beeSubtypeInterpreter = itemStack -> { @@ -31,7 +31,7 @@ public class ApicultureJeiPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { - ItemRegistryApiculture items = PluginApiculture.getItems(); + ItemRegistryApiculture items = ModuleApiculture.getItems(); Preconditions.checkNotNull(items); JeiUtil.addDescription(registry, "frames", diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java index 22540a11e..432dec3b3 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java @@ -15,19 +15,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import forestry.api.apiculture.IBeeHousingInventory; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IHiveFrame; -import forestry.apiculture.ApiaryBeeListener; -import forestry.apiculture.ApiaryBeeModifier; -import forestry.apiculture.IApiary; -import forestry.apiculture.PluginApiculture; -import forestry.apiculture.gui.ContainerMinecartBeehouse; -import forestry.apiculture.gui.GuiBeeHousing; -import forestry.apiculture.inventory.IApiaryInventory; -import forestry.apiculture.inventory.InventoryApiary; -import forestry.core.inventory.IInventoryAdapter; import net.minecraft.block.state.IBlockState; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; @@ -35,9 +22,24 @@ import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.util.Tuple; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.apiculture.IBeeHousingInventory; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IHiveFrame; +import forestry.apiculture.ApiaryBeeListener; +import forestry.apiculture.ApiaryBeeModifier; +import forestry.apiculture.IApiary; +import forestry.apiculture.ModuleApiculture; +import forestry.apiculture.gui.ContainerMinecartBeehouse; +import forestry.apiculture.gui.GuiBeeHousing; +import forestry.apiculture.inventory.IApiaryInventory; +import forestry.apiculture.inventory.InventoryApiary; +import forestry.core.inventory.IInventoryAdapter; + public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implements IApiary { private static final IBeeModifier beeModifier = new ApiaryBeeModifier(); @@ -76,12 +78,12 @@ public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implement @Override public IBlockState getDisplayTile() { - return PluginApiculture.getBlocks().apiary.getDefaultState(); + return ModuleApiculture.getBlocks().apiary.getDefaultState(); } @Override public ItemStack getCartItem() { - return PluginApiculture.getItems().minecartBeehouse.getApiaryMinecart(); + return ModuleApiculture.getItems().minecartBeehouse.getApiaryMinecart(); } @Override diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java index 5dc8d5a73..7b2c36c37 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java @@ -18,7 +18,7 @@ import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.apiculture.BeehouseBeeModifier; import forestry.apiculture.InventoryBeeHousing; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.gui.ContainerMinecartBeehouse; import forestry.apiculture.gui.GuiBeeHousing; import forestry.core.inventory.IInventoryAdapter; @@ -54,12 +54,12 @@ public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase { @Override public IBlockState getDisplayTile() { - return PluginApiculture.getBlocks().beeHouse.getDefaultState(); + return ModuleApiculture.getBlocks().beeHouse.getDefaultState(); } @Override public ItemStack getCartItem() { - return PluginApiculture.getItems().minecartBeehouse.getBeeHouseMinecart(); + return ModuleApiculture.getItems().minecartBeehouse.getBeeHouseMinecart(); } /* IBeeHousing */ diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java b/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java index bcc132c9d..e6d4c7722 100755 --- a/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java @@ -17,14 +17,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; public class ParticleBeeExplore extends Particle { private final Vec3d origin; public ParticleBeeExplore(World world, Vec3d origin, BlockPos destination, int color) { super(world, origin.x, origin.y, origin.z, 0.0D, 0.0D, 0.0D); - setParticleTexture(PluginApiculture.getBeeSprite()); + setParticleTexture(ModuleApiculture.getBeeSprite()); this.origin = origin; this.motionX = (destination.getX() + 0.5 - this.posX) * 0.015; diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java b/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java index 073e2b2a4..87cb1c726 100755 --- a/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java @@ -17,7 +17,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; public class ParticleBeeRoundTrip extends Particle { private final Vec3d origin; @@ -25,7 +25,7 @@ public class ParticleBeeRoundTrip extends Particle { public ParticleBeeRoundTrip(World world, Vec3d origin, BlockPos destination, int color) { super(world, origin.x, origin.y, origin.z, 0.0D, 0.0D, 0.0D); - setParticleTexture(PluginApiculture.getBeeSprite()); + setParticleTexture(ModuleApiculture.getBeeSprite()); this.origin = origin; this.destination = destination; diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java b/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java index 338ff891e..631495274 100755 --- a/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java @@ -16,7 +16,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; public class ParticleBeeTargetEntity extends Particle { private final Vec3d origin; @@ -24,7 +24,7 @@ public class ParticleBeeTargetEntity extends Particle { public ParticleBeeTargetEntity(World world, Vec3d origin, Entity entity, int color) { super(world, origin.x, origin.y, origin.z, 0.0D, 0.0D, 0.0D); - setParticleTexture(PluginApiculture.getBeeSprite()); + setParticleTexture(ModuleApiculture.getBeeSprite()); this.origin = origin; this.entity = entity; diff --git a/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java b/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java index bcc146e9a..bab8ad8cc 100755 --- a/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java +++ b/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java @@ -19,7 +19,7 @@ import forestry.api.apiculture.IApiaristTracker; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.core.genetics.BreedingTracker; public class ApiaristTracker extends BreedingTracker implements IApiaristTracker { @@ -28,7 +28,7 @@ public class ApiaristTracker extends BreedingTracker implements IApiaristTracker * Required for creation from map storage */ public ApiaristTracker(String s) { - super(s, PluginApiculture.beekeepingMode); + super(s, ModuleApiculture.beekeepingMode); } private int queensTotal = 0; diff --git a/src/main/java/forestry/apiculture/genetics/BeeAlyzerPlugin.java b/src/main/java/forestry/apiculture/genetics/BeeAlyzerPlugin.java index 54b50ca56..03f8d91db 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeAlyzerPlugin.java +++ b/src/main/java/forestry/apiculture/genetics/BeeAlyzerPlugin.java @@ -4,6 +4,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; @@ -13,7 +20,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IAlyzerPlugin; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.core.config.Config; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.gui.GuiAlyzer; @@ -22,11 +29,6 @@ import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.gui.widgets.WidgetManager; import forestry.core.utils.StringUtil; import forestry.core.utils.Translator; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BeeAlyzerPlugin implements IAlyzerPlugin { public static final BeeAlyzerPlugin INSTANCE = new BeeAlyzerPlugin(); @@ -35,7 +37,7 @@ public class BeeAlyzerPlugin implements IAlyzerPlugin { private BeeAlyzerPlugin() { NonNullList beeList = NonNullList.create(); - PluginApiculture.getItems().beeDroneGE.addCreativeItems(beeList, false); + ModuleApiculture.getItems().beeDroneGE.addCreativeItems(beeList, false); for (ItemStack beeStack : beeList) { IAlleleBeeSpecies species = BeeGenome.getSpecies(beeStack); iconStacks.put(species.getUID(), beeStack); diff --git a/src/main/java/forestry/apiculture/genetics/BeeDatabaseTab.java b/src/main/java/forestry/apiculture/genetics/BeeDatabaseTab.java new file mode 100644 index 000000000..0bffda328 --- /dev/null +++ b/src/main/java/forestry/apiculture/genetics/BeeDatabaseTab.java @@ -0,0 +1,120 @@ +package forestry.apiculture.genetics; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBee; +import forestry.api.core.GuiElementAlignment; +import forestry.api.core.IGuiElementHelper; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.EnumDatabaseTab; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IDatabaseTab; +import forestry.api.lepidopterology.EnumButterflyChromosome; +import forestry.core.genetics.alleles.AlleleBoolean; +import forestry.core.render.ColourProperties; +import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; + +@SideOnly(Side.CLIENT) +public class BeeDatabaseTab implements IDatabaseTab { + private final EnumDatabaseTab tab; + + BeeDatabaseTab(EnumDatabaseTab tab) { + this.tab = tab; + } + + @Override + public void createElements(IGuiElementHelper elementHelper, IBee bee, ItemStack itemStack) { + EnumBeeType type = BeeManager.beeRoot.getType(itemStack); + if (type == null) { + return; + } + IAlleleSpecies primarySpecies = bee.getGenome().getPrimary(); + boolean active = tab == EnumDatabaseTab.ACTIVE_SPECIES; + + elementHelper.addText(Translator.translateToLocal("for.gui.database.tab." + tab.name().toLowerCase() + ".name"), GuiElementAlignment.CENTER, 0xcfb53b); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.species"), bee, EnumBeeChromosome.SPECIES, active); + + IAlleleTolerance tempTolerance = (IAlleleTolerance) (active ? bee.getGenome().getActiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE) : bee.getGenome().getInactiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE)); + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.climate"), GuiElementAlignment.CENTER); + elementHelper.addToleranceInfo(tempTolerance, primarySpecies, AlleleManager.climateHelper.toDisplay(primarySpecies.getTemperature())); + + IAlleleTolerance humidTolerance = (IAlleleTolerance) (active ? bee.getGenome().getActiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE) : bee.getGenome().getInactiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE)); + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.humidity"), GuiElementAlignment.CENTER); + elementHelper.addToleranceInfo(humidTolerance, primarySpecies, AlleleManager.climateHelper.toDisplay(primarySpecies.getHumidity())); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.lifespan"), bee, EnumBeeChromosome.LIFESPAN, active); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.speed"), bee, EnumBeeChromosome.SPEED, active); + elementHelper.addAllele(Translator.translateToLocal("for.gui.pollination"), bee, EnumBeeChromosome.FLOWERING, active); + elementHelper.addAllele(Translator.translateToLocal("for.gui.flowers"), bee, EnumBeeChromosome.FLOWER_PROVIDER, active); + + IAlleleInteger primaryFertility = (IAlleleInteger) (active ? bee.getGenome().getActiveAllele(EnumBeeChromosome.FERTILITY) : bee.getGenome().getInactiveAllele(EnumBeeChromosome.FERTILITY)); + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.fertility"), GuiElementAlignment.CENTER); + + elementHelper.addFertilityInfo(primaryFertility, 0, 0); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.area"), bee, EnumBeeChromosome.TERRITORY, active); + elementHelper.addAllele(Translator.translateToLocal("for.gui.effect"), bee, EnumBeeChromosome.EFFECT, active); + + String yes = Translator.translateToLocal("for.yes"); + String no = Translator.translateToLocal("for.no"); + + String diurnal, nocturnal; + if(active) { + if (bee.getGenome().getNeverSleeps()) { + nocturnal = diurnal = yes; + } else { + nocturnal = bee.getGenome().getPrimary().isNocturnal() ? yes : no; + diurnal = !bee.getGenome().getPrimary().isNocturnal() ? yes : no; + } + }else { + if (((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumButterflyChromosome.NOCTURNAL)).getValue()) { + nocturnal = diurnal = yes; + } else { + nocturnal = bee.getGenome().getSecondary().isNocturnal() ? yes : no; + diurnal = !bee.getGenome().getSecondary().isNocturnal() ? yes : no; + } + } + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.diurnal"), GuiElementAlignment.CENTER); + elementHelper.addText(diurnal, GuiElementAlignment.CENTER, elementHelper.factory().getColorCoding(false)); + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.nocturnal"), GuiElementAlignment.CENTER); + elementHelper.addText(nocturnal, GuiElementAlignment.CENTER, elementHelper.factory().getColorCoding(false)); + + String flyer = StringUtil.readableBoolean(active ? bee.getGenome().getToleratesRain() : ((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TOLERATES_RAIN)).getValue(), yes, no); + elementHelper.addAllele(Translator.translateToLocal("for.gui.flyer"), (a) -> flyer, bee, EnumButterflyChromosome.TOLERANT_FLYER, active); + + String cave = StringUtil.readableBoolean(active ? bee.getGenome().getCaveDwelling() : ((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.CAVE_DWELLING)).getValue(), yes, no); + elementHelper.addAllele(Translator.translateToLocal("for.gui.fireresist"), (a) -> cave, bee, EnumButterflyChromosome.FIRE_RESIST, active); + + String displayText; + if (type == EnumBeeType.PRINCESS || type == EnumBeeType.QUEEN) { + String displayTextKey = "for.bees.stock.pristine"; + if (!bee.isNatural()) { + displayTextKey = "for.bees.stock.ignoble"; + } + displayText = Translator.translateToLocal(displayTextKey); + elementHelper.addText(displayText, GuiElementAlignment.CENTER, ColourProperties.INSTANCE.get("gui.beealyzer.binomial")); + } + } + + @Override + public EnumDatabaseTab getTab() { + return tab; + } +} diff --git a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java index c096074e4..e323b38eb 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java @@ -36,11 +36,11 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleSpeciesRegisterEvent; import forestry.api.genetics.IAllele; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.genetics.alleles.AlleleEffects; import forestry.apiculture.items.EnumHoneyComb; import forestry.apiculture.items.EnumPollenCluster; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; @@ -50,7 +50,7 @@ public enum BeeDefinition implements IBeeDefinition { FOREST(BeeBranchDefinition.HONEY, "nigrocincta", true, new Color(0x19d0ec), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f); + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f); } @Override @@ -67,7 +67,7 @@ public enum BeeDefinition implements IBeeDefinition { MEADOWS(BeeBranchDefinition.HONEY, "florea", true, new Color(0xef131e), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f); + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f); } @Override @@ -83,7 +83,7 @@ public enum BeeDefinition implements IBeeDefinition { COMMON(BeeBranchDefinition.HONEY, "cerana", true, new Color(0xb2b2b2), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.35f); + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.35f); } @Override @@ -105,7 +105,7 @@ public enum BeeDefinition implements IBeeDefinition { CULTIVATED(BeeBranchDefinition.HONEY, "mellifera", true, new Color(0x5734ec), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f); + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f); } @Override @@ -126,7 +126,7 @@ public enum BeeDefinition implements IBeeDefinition { NOBLE(BeeBranchDefinition.NOBLE, "nobilis", false, new Color(0xec9a19), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f); + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f); } @Override @@ -144,7 +144,7 @@ public enum BeeDefinition implements IBeeDefinition { MAJESTIC(BeeBranchDefinition.NOBLE, "regalis", true, new Color(0x7f0000), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.30f); + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.30f); } @Override @@ -162,8 +162,8 @@ public enum BeeDefinition implements IBeeDefinition { IMPERIAL(BeeBranchDefinition.NOBLE, "imperatorius", false, new Color(0xa3e02f), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f) - .addProduct(PluginApiculture.getItems().royalJelly.getItemStack(), 0.15f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f) + .addProduct(ModuleApiculture.getItems().royalJelly.getItemStack(), 0.15f) .setHasEffect(); } @@ -184,7 +184,7 @@ public enum BeeDefinition implements IBeeDefinition { DILIGENT(BeeBranchDefinition.INDUSTRIOUS, "sedulus", false, new Color(0xc219ec), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f); + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f); } @Override @@ -202,7 +202,7 @@ public enum BeeDefinition implements IBeeDefinition { UNWEARY(BeeBranchDefinition.INDUSTRIOUS, "assiduus", true, new Color(0x19ec5a), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.30f); + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.30f); } @Override @@ -219,8 +219,8 @@ public enum BeeDefinition implements IBeeDefinition { INDUSTRIOUS(BeeBranchDefinition.INDUSTRIOUS, "industria", false, new Color(0xffffff), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f) - .addProduct(PluginApiculture.getItems().pollenCluster.get(EnumPollenCluster.NORMAL, 1), 0.15f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f) + .addProduct(ModuleApiculture.getItems().pollenCluster.get(EnumPollenCluster.NORMAL, 1), 0.15f) .setHasEffect(); } @@ -241,7 +241,7 @@ public enum BeeDefinition implements IBeeDefinition { STEADFAST(BeeBranchDefinition.HEROIC, "legio", false, new Color(0x4d2b15), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.20f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.20f) .setHasEffect(); } @@ -261,7 +261,7 @@ public enum BeeDefinition implements IBeeDefinition { VALIANT(BeeBranchDefinition.HEROIC, "centurio", true, new Color(0x626bdd), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.30f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.30f) .addSpecialty(new ItemStack(Items.SUGAR), 0.15f); } @@ -281,7 +281,7 @@ public enum BeeDefinition implements IBeeDefinition { HEROIC(BeeBranchDefinition.HEROIC, "kraphti", false, new Color(0xb3d5e4), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.40f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.COCOA, 1), 0.40f) .setHasEffect(); } @@ -305,7 +305,7 @@ public enum BeeDefinition implements IBeeDefinition { SINISTER(BeeBranchDefinition.INFERNAL, "caecus", false, new Color(0xb3d5e4), new Color(0x9a2323)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f) .setTemperature(EnumTemperature.HELLISH) .setHumidity(EnumHumidity.ARID); } @@ -328,8 +328,8 @@ public enum BeeDefinition implements IBeeDefinition { FIENDISH(BeeBranchDefinition.INFERNAL, "diabolus", true, new Color(0xd7bee5), new Color(0x9a2323)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.55f) - .addProduct(PluginCore.getItems().ash.getItemStack(), 0.15f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.55f) + .addProduct(ModuleCore.getItems().ash.getItemStack(), 0.15f) .setTemperature(EnumTemperature.HELLISH) .setHumidity(EnumHumidity.ARID); } @@ -352,7 +352,7 @@ public enum BeeDefinition implements IBeeDefinition { DEMONIC(BeeBranchDefinition.INFERNAL, "draco", false, new Color(0xf4e400), new Color(0x9a2323)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f) .addProduct(new ItemStack(Items.GLOWSTONE_DUST), 0.15f) .setHasEffect() .setTemperature(EnumTemperature.HELLISH) @@ -377,7 +377,7 @@ public enum BeeDefinition implements IBeeDefinition { MODEST(BeeBranchDefinition.AUSTERE, "modicus", false, new Color(0xc5be86), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f) .setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); } @@ -396,7 +396,7 @@ public enum BeeDefinition implements IBeeDefinition { FRUGAL(BeeBranchDefinition.AUSTERE, "permodestus", true, new Color(0xe8dcb1), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.30f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.30f) .setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); } @@ -420,8 +420,8 @@ public enum BeeDefinition implements IBeeDefinition { AUSTERE(BeeBranchDefinition.AUSTERE, "correpere", false, new Color(0xfffac2), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f) - .addSpecialty(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.POWDERY, 1), 0.50f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f) + .addSpecialty(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.POWDERY, 1), 0.50f) .setHasEffect() .setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); @@ -447,7 +447,7 @@ public enum BeeDefinition implements IBeeDefinition { TROPICAL(BeeBranchDefinition.TROPICAL, "mendelia", false, new Color(0x378020), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f) .setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @@ -466,7 +466,7 @@ public enum BeeDefinition implements IBeeDefinition { EXOTIC(BeeBranchDefinition.TROPICAL, "darwini", true, new Color(0x304903), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f) .setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @@ -485,7 +485,7 @@ public enum BeeDefinition implements IBeeDefinition { EDENIC(BeeBranchDefinition.TROPICAL, "humboldti", false, new Color(0x393d0d), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f) .setHasEffect() .setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); @@ -509,7 +509,7 @@ public enum BeeDefinition implements IBeeDefinition { ENDED(BeeBranchDefinition.END, "notchi", false, new Color(0xe079fa), new Color(0xd9de9e)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.30f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.30f) .setTemperature(EnumTemperature.COLD); } @@ -526,7 +526,7 @@ public enum BeeDefinition implements IBeeDefinition { SPECTRAL(BeeBranchDefinition.END, "idolum", true, new Color(0xa98bed), new Color(0xd9de9e)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.50f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.50f) .setTemperature(EnumTemperature.COLD); } @@ -543,7 +543,7 @@ public enum BeeDefinition implements IBeeDefinition { PHANTASMAL(BeeBranchDefinition.END, "lemur", false, new Color(0xcc00fa), new Color(0xd9de9e)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.40f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.40f) .setHasEffect() .setTemperature(EnumTemperature.COLD); } @@ -565,7 +565,7 @@ public enum BeeDefinition implements IBeeDefinition { WINTRY(BeeBranchDefinition.FROZEN, "brumalis", false, new Color(0xa0ffc8), new Color(0xdaf5f3)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) .setTemperature(EnumTemperature.ICY); } @@ -584,8 +584,8 @@ public enum BeeDefinition implements IBeeDefinition { ICY(BeeBranchDefinition.FROZEN, "coagulis", true, new Color(0xa0ffff), new Color(0xdaf5f3)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f) - .addProduct(PluginCore.getItems().craftingMaterial.getIceShard(1), 0.20f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f) + .addProduct(ModuleCore.getItems().craftingMaterial.getIceShard(1), 0.20f) .setTemperature(EnumTemperature.ICY); } @@ -604,8 +604,8 @@ public enum BeeDefinition implements IBeeDefinition { GLACIAL(BeeBranchDefinition.FROZEN, "glacialis", false, new Color(0xefffff), new Color(0xdaf5f3)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f) - .addProduct(PluginCore.getItems().craftingMaterial.getIceShard(1), 0.40f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f) + .addProduct(ModuleCore.getItems().craftingMaterial.getIceShard(1), 0.40f) .setTemperature(EnumTemperature.ICY) .setHasEffect(); } @@ -627,7 +627,7 @@ public enum BeeDefinition implements IBeeDefinition { VINDICTIVE(BeeBranchDefinition.VENGEFUL, "ultio", false, new Color(0xeafff3), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.25f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.25f) .setIsNotCounted(); } @@ -645,7 +645,7 @@ public enum BeeDefinition implements IBeeDefinition { VENGEFUL(BeeBranchDefinition.VENGEFUL, "punire", false, new Color(0xc2de00), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f) .setIsNotCounted(); } @@ -664,7 +664,7 @@ public enum BeeDefinition implements IBeeDefinition { AVENGING(BeeBranchDefinition.VENGEFUL, "hostimentum", false, new Color(0xddff00), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f) .setHasEffect() .setIsNotCounted(); } @@ -686,7 +686,7 @@ public enum BeeDefinition implements IBeeDefinition { LEPORINE(BeeBranchDefinition.FESTIVE, "lepus", false, new Color(0xfeff8f), new Color(0x3cd757)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f) .addProduct(new ItemStack(Items.EGG), 0.10f) .setHasEffect() .setIsNotCounted(); @@ -713,8 +713,8 @@ public enum BeeDefinition implements IBeeDefinition { MERRY(BeeBranchDefinition.FESTIVE, "feliciter", false, new Color(0xffffff), new Color(0xd40000)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) - .addProduct(PluginCore.getItems().craftingMaterial.getIceShard(1), 0.20f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) + .addProduct(ModuleCore.getItems().craftingMaterial.getIceShard(1), 0.20f) .setTemperature(EnumTemperature.ICY) .setHasEffect() .setIsNotCounted(); @@ -742,8 +742,8 @@ public enum BeeDefinition implements IBeeDefinition { TIPSY(BeeBranchDefinition.FESTIVE, "ebrius", false, new Color(0xffffff), new Color(0xc219ec)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) - .addProduct(PluginCore.getItems().craftingMaterial.getIceShard(1), 0.20f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) + .addProduct(ModuleCore.getItems().craftingMaterial.getIceShard(1), 0.20f) .setTemperature(EnumTemperature.ICY) .setHasEffect() .setIsNotCounted(); @@ -772,7 +772,7 @@ public enum BeeDefinition implements IBeeDefinition { TRICKY(BeeBranchDefinition.FESTIVE, "libita", false, new Color(0x49413B), new Color(0xFF6A00)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f) .addProduct(new ItemStack(Items.COOKIE), 0.15f) .addSpecialty(new ItemStack(Items.SKULL, 1, 0), 0.02f) .addSpecialty(new ItemStack(Items.SKULL, 1, 2), 0.02f) @@ -807,7 +807,7 @@ public enum BeeDefinition implements IBeeDefinition { RURAL(BeeBranchDefinition.AGRARIAN, "rustico", false, new Color(0xfeff8f), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.20f); + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.20f); } @Override @@ -824,7 +824,7 @@ public enum BeeDefinition implements IBeeDefinition { FARMERLY(BeeBranchDefinition.AGRARIAN, "arator", true, new Color(0xD39728), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.27f); + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.27f); } @Override @@ -842,7 +842,7 @@ public enum BeeDefinition implements IBeeDefinition { AGRARIAN(BeeBranchDefinition.AGRARIAN, "arator", true, new Color(0xFFCA75), new Color(0xFFE047)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.35f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.35f) .setHasEffect(); } @@ -865,7 +865,7 @@ public enum BeeDefinition implements IBeeDefinition { MARSHY(BeeBranchDefinition.BOGGY, "adorasti", true, new Color(0x546626), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.30f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.30f) .setHumidity(EnumHumidity.DAMP); } @@ -882,7 +882,7 @@ public enum BeeDefinition implements IBeeDefinition { MIRY(BeeBranchDefinition.BOGGY, "humidium", true, new Color(0x92AF42), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.36f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.36f) .setHumidity(EnumHumidity.DAMP); } @@ -903,8 +903,8 @@ public enum BeeDefinition implements IBeeDefinition { BOGGY(BeeBranchDefinition.BOGGY, "paluster", true, new Color(0x698948), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.39f) - .addSpecialty(PluginCore.getItems().peat.getItemStack(), 0.08f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MOSSY, 1), 0.39f) + .addSpecialty(ModuleCore.getItems().peat.getItemStack(), 0.08f) .setHumidity(EnumHumidity.DAMP); } @@ -928,8 +928,8 @@ public enum BeeDefinition implements IBeeDefinition { MONASTIC(BeeBranchDefinition.MONASTIC, "monachus", false, new Color(0x42371c), new Color(0xfff7b6)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addProduct(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.30f) - .addSpecialty(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.10f) + beeSpecies.addProduct(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.30f) + .addSpecialty(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.10f) .setJubilanceProvider(new JubilanceProviderHermit()); } @@ -946,7 +946,7 @@ public enum BeeDefinition implements IBeeDefinition { SECLUDED(BeeBranchDefinition.MONASTIC, "contractus", true, new Color(0x7b6634), new Color(0xfff7b6)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addSpecialty(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f) + beeSpecies.addSpecialty(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f) .setJubilanceProvider(new JubilanceProviderHermit()); } @@ -963,7 +963,7 @@ public enum BeeDefinition implements IBeeDefinition { HERMITIC(BeeBranchDefinition.MONASTIC, "anachoreta", false, new Color(0xffd46c), new Color(0xfff7b6)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { - beeSpecies.addSpecialty(PluginApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f) + beeSpecies.addSpecialty(ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f) .setJubilanceProvider(new JubilanceProviderHermit()) .setHasEffect(); } diff --git a/src/main/java/forestry/apiculture/genetics/BeePlugin.java b/src/main/java/forestry/apiculture/genetics/BeePlugin.java new file mode 100644 index 000000000..20a9898eb --- /dev/null +++ b/src/main/java/forestry/apiculture/genetics/BeePlugin.java @@ -0,0 +1,71 @@ +package forestry.apiculture.genetics; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBee; +import forestry.api.genetics.EnumDatabaseTab; +import forestry.api.genetics.IDatabaseTab; +import forestry.api.genetics.ISpeciesPlugin; +import forestry.apiculture.ModuleApiculture; +import forestry.apiculture.items.EnumHoneyComb; +import forestry.core.config.Config; + +//TODO: Add support for the alyzer +@SideOnly(Side.CLIENT) +public class BeePlugin implements ISpeciesPlugin { + public static final BeePlugin INSTANCE = new BeePlugin(); + private static final BeeDatabaseTab ACTIVE = new BeeDatabaseTab(EnumDatabaseTab.ACTIVE_SPECIES); + private static final BeeDatabaseTab INACTIVE = new BeeDatabaseTab(EnumDatabaseTab.INACTIVE_SPECIES); + + protected final Map iconStacks = new HashMap<>(); + + private BeePlugin() { + NonNullList beeList = NonNullList.create(); + ModuleApiculture.getItems().beeDroneGE.addCreativeItems(beeList, false); + for (ItemStack beeStack : beeList) { + IAlleleBeeSpecies species = BeeGenome.getSpecies(beeStack); + iconStacks.put(species.getUID(), beeStack); + } + } + + @Override + public Map getIndividualStacks() { + return iconStacks; + } + + @Override + public List getHints() { + return Config.hints.get("beealyzer"); + } + + @Override + public IDatabaseTab getSpeciesTab(boolean active) { + if(active){ + return ACTIVE; + } + return INACTIVE; + } + + @Override + public ItemStack getTabDatabaseIconItem(EnumDatabaseTab tab) { + switch (tab){ + case ACTIVE_SPECIES: + return BeeDefinition.MEADOWS.getMemberStack(EnumBeeType.QUEEN); + case PRODUCTS: + return ModuleApiculture.getItems().beeComb.get(EnumHoneyComb.HONEY, 1); + case MUTATIONS: + return ModuleApiculture.getItems().frameImpregnated.getItemStack(); + } + return BeeDefinition.MEADOWS.getMemberStack(EnumBeeType.DRONE); + } +} diff --git a/src/main/java/forestry/apiculture/genetics/BeeRoot.java b/src/main/java/forestry/apiculture/genetics/BeeRoot.java index 570539e17..0168d929f 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeRoot.java +++ b/src/main/java/forestry/apiculture/genetics/BeeRoot.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.apiculture.genetics; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; @@ -17,8 +19,17 @@ import java.util.List; import java.util.Locale; import java.util.Map.Entry; -import com.google.common.base.Preconditions; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; @@ -40,18 +51,14 @@ import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesPlugin; import forestry.api.genetics.ISpeciesType; import forestry.apiculture.BeeHousingListener; import forestry.apiculture.BeeHousingModifier; import forestry.apiculture.BeekeepingLogic; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.genetics.SpeciesRoot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.FMLCommonHandler; public class BeeRoot extends SpeciesRoot implements IBeeRoot { @@ -113,7 +120,7 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot { public ItemStack getMemberStack(IIndividual individual, ISpeciesType type) { Preconditions.checkArgument(individual instanceof IBee, "individual is not a bee"); Preconditions.checkArgument(type instanceof EnumBeeType, "type is not an EnumBeeType"); - ItemRegistryApiculture apicultureItems = PluginApiculture.getItems(); + ItemRegistryApiculture apicultureItems = ModuleApiculture.getItems(); IBee bee = (IBee) individual; Item beeItem; @@ -149,7 +156,7 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot { @Override public EnumBeeType getType(ItemStack stack) { Item item = stack.getItem(); - ItemRegistryApiculture apicultureItems = PluginApiculture.getItems(); + ItemRegistryApiculture apicultureItems = ModuleApiculture.getItems(); if (apicultureItems.beeDroneGE == item) { return EnumBeeType.DRONE; @@ -343,6 +350,7 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot { tracker.setWorld(world); return tracker; + } @Override @@ -374,4 +382,10 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot { public IAlyzerPlugin getAlyzerPlugin() { return BeeAlyzerPlugin.INSTANCE; } + + @Override + @SideOnly(Side.CLIENT) + public ISpeciesPlugin getSpeciesPlugin() { + return BeePlugin.INSTANCE; + } } diff --git a/src/main/java/forestry/apiculture/gui/GuiImprinter.java b/src/main/java/forestry/apiculture/gui/GuiImprinter.java index 772109c29..255260fb4 100755 --- a/src/main/java/forestry/apiculture/gui/GuiImprinter.java +++ b/src/main/java/forestry/apiculture/gui/GuiImprinter.java @@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.genetics.BeeGenome; import forestry.apiculture.inventory.ItemInventoryImprinter; import forestry.core.config.Constants; @@ -45,7 +45,7 @@ public class GuiImprinter extends GuiForestry { this.ySize = 185; NonNullList beeList = NonNullList.create(); - PluginApiculture.getItems().beeDroneGE.addCreativeItems(beeList, false); + ModuleApiculture.getItems().beeDroneGE.addCreativeItems(beeList, false); for (ItemStack beeStack : beeList) { IAlleleBeeSpecies species = BeeGenome.getSpecies(beeStack); if (species != null) { diff --git a/src/main/java/forestry/apiculture/inventory/InventoryAlvearySieve.java b/src/main/java/forestry/apiculture/inventory/InventoryAlvearySieve.java index 1c38467d5..92f52aa78 100644 --- a/src/main/java/forestry/apiculture/inventory/InventoryAlvearySieve.java +++ b/src/main/java/forestry/apiculture/inventory/InventoryAlvearySieve.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.apiculture.inventory; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import forestry.apiculture.multiblock.TileAlvearySieve; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.inventory.InventoryAdapterTile; import forestry.core.inventory.watchers.ISlotPickupWatcher; import forestry.core.utils.ItemStackUtil; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; public class InventoryAlvearySieve extends InventoryAdapterTile implements ISlotPickupWatcher { public static final int SLOT_POLLEN_1 = 0; @@ -29,7 +30,7 @@ public class InventoryAlvearySieve extends InventoryAdapterTile hives = PluginApiculture.getHiveRegistry().getHives(); + List hives = ModuleApiculture.getHiveRegistry().getHives(); if (Config.generateBeehivesDebug) { decorateHivesDebug(world, rand, chunkX, chunkZ, hives); diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java index 9764e6ec8..df2bf1b37 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java @@ -25,7 +25,7 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.genetics.BeeDefinition; import forestry.core.config.Constants; import net.minecraft.block.Block; @@ -104,7 +104,7 @@ public enum HiveDescription implements IHiveDescription { private final IHiveGen hiveGen; HiveDescription(IHiveRegistry.HiveType hiveType, float genChance, BeeDefinition beeTemplate, IHiveGen hiveGen) { - this.blockState = PluginApiculture.getBlocks().beehives.getStateForType(hiveType); + this.blockState = ModuleApiculture.getBlocks().beehives.getStateForType(hiveType); this.genChance = genChance; this.beeGenome = beeTemplate.getGenome(); this.hiveGen = hiveGen; diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java index 3bac90627..219ef1729 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java @@ -19,7 +19,7 @@ import forestry.api.apiculture.hives.IHiveGen; import forestry.api.apiculture.hives.IHiveRegistry; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.tiles.TileHive; import forestry.core.tiles.TileUtil; import net.minecraft.block.state.IBlockState; @@ -44,7 +44,7 @@ public class HiveDescriptionSwarmer implements IHiveDescription { @Override public IBlockState getBlockState() { - return PluginApiculture.getBlocks().beehives.getStateForType(IHiveRegistry.HiveType.SWARM); + return ModuleApiculture.getBlocks().beehives.getStateForType(IHiveRegistry.HiveType.SWARM); } @Override diff --git a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java index 6b291ef9e..653fb69bd 100755 --- a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java @@ -26,6 +26,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; @@ -54,16 +55,16 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.flowers.Flower; import forestry.apiculture.flowers.FlowerRegistry; import forestry.apiculture.tiles.TileBeeHouse; -import forestry.arboriculture.PluginArboriculture; -import forestry.core.PluginCore; +import forestry.arboriculture.ModuleArboriculture; +import forestry.core.ModuleCore; import forestry.core.blocks.BlockBase; import forestry.core.config.Constants; import forestry.core.tiles.TileUtil; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModuleUids; public class VillageApiaristHouse extends StructureVillagePieces.House1 { @@ -195,7 +196,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { // Escritoire if (random.nextInt(2) == 0) { - IBlockState escritoireBlock = PluginCore.getBlocks().escritoire.getDefaultState().withProperty(BlockBase.FACING, EnumFacing.EAST); + IBlockState escritoireBlock = ModuleCore.getBlocks().escritoire.getDefaultState().withProperty(BlockBase.FACING, EnumFacing.EAST); setBlockState(world, escritoireBlock, 1, 1, 3, structBoundingBox); } @@ -312,11 +313,11 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { } IBlockState blockState = world.getBlockState(posNew); - if (PluginApiculture.getBlocks().beeHouse == blockState.getBlock() || !world.isBlockLoaded(posNew.down())) { + if (ModuleApiculture.getBlocks().beeHouse == blockState.getBlock() || !world.isBlockLoaded(posNew.down())) { return; } - IBlockState beeHouseDefaultState = PluginApiculture.getBlocks().beeHouse.getDefaultState(); + IBlockState beeHouseDefaultState = ModuleApiculture.getBlocks().beeHouse.getDefaultState(); world.setBlockState(posNew, beeHouseDefaultState, Constants.FLAG_BLOCK_SYNC); TileBeeHouse beeHouse = TileUtil.getTile(world, posNew, TileBeeHouse.class); @@ -381,9 +382,9 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { ForgeRegistry registry = (ForgeRegistry) ForgeRegistries.VILLAGER_PROFESSIONS; if (villagerCount <= 0) { - return registry.getID(PluginApiculture.villagerApiarist); - } else if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) { - return registry.getID(PluginArboriculture.villagerArborist); + return registry.getID(ModuleApiculture.villagerApiarist); + } else if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))) { + return registry.getID(ModuleArboriculture.villagerArborist); } else { return currentVillagerProfession; } @@ -407,7 +408,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { IWoodType woodType; boolean fireproof; - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))) { woodType = EnumForestryWoodType.getRandom(random); fireproof = random.nextInt(4) == 0; } else { diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/ModuleArboriculture.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/forestry/arboriculture/PluginArboriculture.java rename to src/main/java/forestry/arboriculture/ModuleArboriculture.java index b84c37d7d..ab6dbd665 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/ModuleArboriculture.java @@ -74,7 +74,6 @@ import forestry.arboriculture.blocks.BlockDefaultLeaves; import forestry.arboriculture.blocks.BlockForestryLeaves; import forestry.arboriculture.blocks.BlockRegistryArboriculture; import forestry.arboriculture.capabilities.ArmorNaturalist; -import forestry.arboriculture.charcoal.CharcoalPileWall; import forestry.arboriculture.commands.CommandTree; import forestry.arboriculture.genetics.TreeBranchDefinition; import forestry.arboriculture.genetics.TreeDefinition; @@ -95,7 +94,7 @@ import forestry.arboriculture.tiles.TileFruitPod; import forestry.arboriculture.tiles.TileLeaves; import forestry.arboriculture.tiles.TileSapling; import forestry.arboriculture.worldgen.TreeDecorator; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.capabilities.NullStorage; import forestry.core.config.Config; import forestry.core.config.Constants; @@ -107,14 +106,13 @@ import forestry.core.recipes.RecipeUtil; import forestry.core.render.TextureManagerForestry; import forestry.core.utils.IMCUtil; import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.OreDictUtil; import forestry.core.utils.VillagerTradeLists; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.ARBORICULTURE, name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.arboriculture.description", lootTable = "arboriculture") -public class PluginArboriculture extends BlankForestryPlugin { +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.ARBORICULTURE, name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.arboriculture.description", lootTable = "arboriculture") +public class ModuleArboriculture extends BlankForestryModule { @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "forestry.arboriculture.proxy.ProxyArboricultureClient", serverSide = "forestry.arboriculture.proxy.ProxyArboriculture") @@ -178,8 +176,6 @@ public class PluginArboriculture extends BlankForestryPlugin { @Override public void preInit() { - super.preInit(); - MinecraftForge.EVENT_BUS.register(this); if (Config.generateTrees) { @@ -216,19 +212,16 @@ public class PluginArboriculture extends BlankForestryPlugin { proxy.initializeModels(); // Commands - PluginCore.rootCommand.addChildCommand(new CommandTree()); + ModuleCore.rootCommand.addChildCommand(new CommandTree()); } @Override public void addLootPoolNames(Set lootPoolNames) { - super.addLootPoolNames(lootPoolNames); lootPoolNames.add("forestry_arboriculture_items"); } @Override public void doInit() { - super.doInit(); - // Create alleles registerAlleles(); TreeDefinition.initTrees(); @@ -268,18 +261,6 @@ public class PluginArboriculture extends BlankForestryPlugin { } } - @Override - public void postInit() { - TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.CLAY, 3)); - TreeManager.pileWalls.add(new CharcoalPileWall(PluginArboriculture.getBlocks().loam, 4)); - TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.END_STONE, 6)); - TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.END_BRICKS, 6)); - TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.DIRT, 2)); - TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.GRAVEL, 1)); - TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.NETHERRACK, 3)); - TreeManager.pileWalls.add(new CharcoalPileWall(PluginCore.getBlocks().ashBrick, 5)); - } - @Override public void registerCrates() { ICrateRegistry crateRegistry = StorageManager.crateRegistry; @@ -294,7 +275,7 @@ public class PluginArboriculture extends BlankForestryPlugin { @Override public void registerRecipes() { - ItemRegistryCore coreItems = PluginCore.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); BlockRegistryArboriculture blocks = getBlocks(); ItemRegistryArboriculture items = getItems(); @@ -405,7 +386,7 @@ public class PluginArboriculture extends BlankForestryPlugin { '#', fireproofPlanks.copy()); // Fabricator recipes - if (ForestryAPI.enabledPlugins.containsAll(Arrays.asList(ForestryPluginUids.FACTORY, ForestryPluginUids.APICULTURE))) { + if (ForestryAPI.enabledModules.containsAll(Arrays.asList(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY), new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE)))) { logs.setCount(1); fireproofLogs.setCount(1); RecipeManagers.fabricatorManager.addRecipe(ItemStack.EMPTY, Fluids.GLASS.getFluid(500), fireproofLogs.copy(), new Object[]{ @@ -426,7 +407,7 @@ public class PluginArboriculture extends BlankForestryPlugin { } } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))) { // SQUEEZER RECIPES int seedOilMultiplier = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed"); @@ -459,22 +440,6 @@ public class PluginArboriculture extends BlankForestryPlugin { '#', "blockGlass", 'X', "treeSapling", 'Y', "chestWood"); - - //Wood Pile - RecipeUtil.addShapelessRecipe("wood_pile", new ItemStack(blocks.woodPile), OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD); - RecipeUtil.addShapelessRecipe("wood_pile_decorative", new ItemStack(blocks.woodPile), blocks.woodPileDecorative); - RecipeUtil.addShapelessRecipe("decorative_wood_pile", new ItemStack(blocks.woodPileDecorative), blocks.woodPile); - - //Charcoal - RecipeUtil.addRecipe("charcoal_block", blocks.charcoal, - "###", - "###", - "###", - '#', new ItemStack(Items.COAL, 1, 1)); - RecipeUtil.addShapelessRecipe("charcoal", new ItemStack(Items.COAL, 9, 1), blocks.charcoal); - - //Dirt Pile Block - RecipeUtil.addShapelessRecipe("loam", new ItemStack(blocks.loam, 4), Items.CLAY_BALL, coreItems.compost, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, coreItems.compost, Items.CLAY_BALL); } private static void registerAlleles() { @@ -571,7 +536,7 @@ public class PluginArboriculture extends BlankForestryPlugin { } return true; } - return super.processIMCMessage(message); + return false; } @Override diff --git a/src/main/java/forestry/arboriculture/ModuleCharcoal.java b/src/main/java/forestry/arboriculture/ModuleCharcoal.java new file mode 100644 index 000000000..0af263ddd --- /dev/null +++ b/src/main/java/forestry/arboriculture/ModuleCharcoal.java @@ -0,0 +1,71 @@ +package forestry.arboriculture; + +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import forestry.api.arboriculture.TreeManager; +import forestry.arboriculture.blocks.BlockRegistryCharcoal; +import forestry.arboriculture.charcoal.CharcoalPileWall; +import forestry.core.ModuleCore; +import forestry.core.config.Constants; +import forestry.core.items.ItemRegistryCore; +import forestry.core.recipes.RecipeUtil; +import forestry.core.utils.OreDictUtil; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; + +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.CHARCOAL, name = "Charcoal", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.module.charcoal.description") +public class ModuleCharcoal extends BlankForestryModule { + @Nullable + private static BlockRegistryCharcoal blocks; + + public static BlockRegistryCharcoal getBlocks() { + Preconditions.checkState(blocks != null); + return blocks; + } + + + @Override + public void registerItemsAndBlocks() { + blocks = new BlockRegistryCharcoal(); + } + + @Override + public void postInit() { + TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.CLAY, 3)); + TreeManager.pileWalls.add(new CharcoalPileWall(getBlocks().loam, 4)); + TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.END_STONE, 6)); + TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.END_BRICKS, 6)); + TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.DIRT, 2)); + TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.GRAVEL, 1)); + TreeManager.pileWalls.add(new CharcoalPileWall(Blocks.NETHERRACK, 3)); + TreeManager.pileWalls.add(new CharcoalPileWall(ModuleCore.getBlocks().ashBrick, 5)); + } + + @Override + public void registerRecipes() { + BlockRegistryCharcoal blocks = getBlocks(); + ItemRegistryCore coreItems = ModuleCore.getItems(); + //Wood Pile + RecipeUtil.addShapelessRecipe("wood_pile", new ItemStack(blocks.woodPile), OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD, OreDictUtil.LOG_WOOD); + RecipeUtil.addShapelessRecipe("wood_pile_decorative", new ItemStack(blocks.woodPile), blocks.woodPileDecorative); + RecipeUtil.addShapelessRecipe("decorative_wood_pile", new ItemStack(blocks.woodPileDecorative), blocks.woodPile); + + //Charcoal + RecipeUtil.addRecipe("charcoal_block", blocks.charcoal, + "###", + "###", + "###", + '#', new ItemStack(Items.COAL, 1, 1)); + RecipeUtil.addShapelessRecipe("charcoal", new ItemStack(Items.COAL, 9, 1), blocks.charcoal); + + //Dirt Pile Block + RecipeUtil.addShapelessRecipe("loam", new ItemStack(blocks.loam, 4), Items.CLAY_BALL, coreItems.compost, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, OreDictUtil.SAND, Items.CLAY_BALL, coreItems.compost, Items.CLAY_BALL); + } +} diff --git a/src/main/java/forestry/arboriculture/WoodAccess.java b/src/main/java/forestry/arboriculture/WoodAccess.java index 2b5b34d5c..6119f81c5 100644 --- a/src/main/java/forestry/arboriculture/WoodAccess.java +++ b/src/main/java/forestry/arboriculture/WoodAccess.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.arboriculture; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; @@ -18,7 +20,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.google.common.base.Preconditions; +import net.minecraft.block.Block; +import net.minecraft.block.BlockNewLog; +import net.minecraft.block.BlockOldLog; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockWoodSlab; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import forestry.api.arboriculture.EnumVanillaWoodType; import forestry.api.arboriculture.IWoodAccess; import forestry.api.arboriculture.IWoodType; @@ -31,15 +42,6 @@ import forestry.arboriculture.blocks.BlockForestryPlanks; import forestry.arboriculture.blocks.BlockForestrySlab; import forestry.arboriculture.blocks.BlockForestryStairs; import forestry.arboriculture.blocks.PropertyWoodType; -import net.minecraft.block.Block; -import net.minecraft.block.BlockNewLog; -import net.minecraft.block.BlockOldLog; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockWoodSlab; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class WoodAccess implements IWoodAccess { @Nullable @@ -179,7 +181,7 @@ public class WoodAccess implements IWoodAccess { IWoodType woodType = woodTyped.getWoodType(meta); ItemStack itemStack = new ItemStack(woodTyped, 1, meta); if (!(woodType instanceof EnumVanillaWoodType)) { - PluginArboriculture.proxy.registerWoodModel(woodTyped, true); + ModuleArboriculture.proxy.registerWoodModel(woodTyped, true); } register(woodType, woodBlockKind, fireproof, blockState, itemStack); } @@ -194,7 +196,7 @@ public class WoodAccess implements IWoodAccess { IWoodType woodType = woodTyped.getWoodType(0); ItemStack itemStack = new ItemStack(woodTyped); if (!(woodType instanceof EnumVanillaWoodType)) { - PluginArboriculture.proxy.registerWoodModel(woodTyped, false); + ModuleArboriculture.proxy.registerWoodModel(woodTyped, false); } register(woodType, woodBlockKind, fireproof, blockState, itemStack); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockAsh.java b/src/main/java/forestry/arboriculture/blocks/BlockAsh.java index 8d6766502..31b12b738 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockAsh.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockAsh.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; public class BlockAsh extends Block implements IStateMapperRegister, IItemModelRegister { @@ -73,7 +73,7 @@ public class BlockAsh extends Block implements IStateMapperRegister, IItemModelR Random rand = world instanceof World ? ((World)world).rand : new Random(); int amount = state.getValue(AMOUNT) + 9 + rand.nextInt(1 + fortune); drops.add(new ItemStack(Items.COAL, amount, 1)); - drops.add(new ItemStack(PluginCore.getItems().ash, 1 + rand.nextInt(amount / 4))); + drops.add(new ItemStack(ModuleCore.getItems().ash, 1 + rand.nextInt(amount / 4))); return drops; } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index 021cd3d3a..fe91b9627 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -50,7 +50,7 @@ import forestry.api.core.IToolScoop; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IButterfly; -import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.ModuleArboriculture; import forestry.arboriculture.tiles.TileLeaves; import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; @@ -215,6 +215,6 @@ public class BlockForestryLeaves extends BlockAbstractLeaves implements ITileEnt } } } - return PluginArboriculture.proxy.getFoliageColorBasic(); + return ModuleArboriculture.proxy.getFoliageColorBasic(); } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java index d4626d7ff..6326612fd 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java @@ -18,7 +18,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; @@ -70,12 +69,6 @@ public class BlockRegistryArboriculture extends BlockRegistry { public final List leavesDecorative; private final Map speciesToLeavesDecorative; public final Map podsMap; - - public final BlockCharcoal charcoal; - public final BlockWoodPile woodPile; - public final BlockDecorativeWoodPile woodPileDecorative; - public final BlockAsh ash; - public final Block loam; public final BlockArboriculture treeChest; @@ -273,39 +266,6 @@ public class BlockRegistryArboriculture extends BlockRegistry { speciesToLeavesDecorative.put(speciesUid, new ItemStack(leaves, 1, meta)); } } - - charcoal = new BlockCharcoal(); - ItemBlockForestry itemBlockCharcoal = new ItemBlockForestry(charcoal) { - @Override - public int getItemBurnTime(ItemStack itemStack) { - return 16000; - } - }; - registerBlock(charcoal, itemBlockCharcoal, "charcoal"); - - woodPile = new BlockWoodPile(); - ItemBlockForestry itemBlockWoodPile = new ItemBlockForestry(woodPile) { - @Override - public int getItemBurnTime(ItemStack itemStack) { - return 1200; - } - }; - registerBlock(woodPile, itemBlockWoodPile, "wood_pile"); - - woodPileDecorative = new BlockDecorativeWoodPile(); - ItemBlockForestry itemBlockWoodPileDecorative = new ItemBlockForestry(woodPileDecorative) { - @Override - public int getItemBurnTime(ItemStack itemStack) { - return 1200; - } - }; - registerBlock(woodPileDecorative, itemBlockWoodPileDecorative, "wood_pile_decorative"); - - ash = new BlockAsh(); - registerBlock(ash, new ItemBlockForestry(ash), "ash_block"); - - loam = new BlockLoam(); - registerBlock(loam, new ItemBlockForestry<>(loam), "loam"); // Pods AlleleFruits.registerAlleles(); diff --git a/src/main/java/forestry/arboriculture/blocks/BlockRegistryCharcoal.java b/src/main/java/forestry/arboriculture/blocks/BlockRegistryCharcoal.java new file mode 100644 index 000000000..1da8e6f7c --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/BlockRegistryCharcoal.java @@ -0,0 +1,50 @@ +package forestry.arboriculture.blocks; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +import forestry.core.blocks.BlockRegistry; +import forestry.core.items.ItemBlockForestry; + +public class BlockRegistryCharcoal extends BlockRegistry { + public final BlockCharcoal charcoal; + public final BlockWoodPile woodPile; + public final BlockDecorativeWoodPile woodPileDecorative; + public final BlockAsh ash; + public final Block loam; + + public BlockRegistryCharcoal() { + charcoal = new BlockCharcoal(); + ItemBlockForestry itemBlockCharcoal = new ItemBlockForestry(charcoal) { + @Override + public int getItemBurnTime(ItemStack itemStack) { + return 16000; + } + }; + registerBlock(charcoal, itemBlockCharcoal, "charcoal"); + + woodPile = new BlockWoodPile(); + ItemBlockForestry itemBlockWoodPile = new ItemBlockForestry(woodPile) { + @Override + public int getItemBurnTime(ItemStack itemStack) { + return 1200; + } + }; + registerBlock(woodPile, itemBlockWoodPile, "wood_pile"); + + woodPileDecorative = new BlockDecorativeWoodPile(); + ItemBlockForestry itemBlockWoodPileDecorative = new ItemBlockForestry(woodPileDecorative) { + @Override + public int getItemBurnTime(ItemStack itemStack) { + return 1200; + } + }; + registerBlock(woodPileDecorative, itemBlockWoodPileDecorative, "wood_pile_decorative"); + + ash = new BlockAsh(); + registerBlock(ash, new ItemBlockForestry(ash), "ash_block"); + + loam = new BlockLoam(); + registerBlock(loam, new ItemBlockForestry<>(loam), "loam"); + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/BlockWoodPile.java b/src/main/java/forestry/arboriculture/blocks/BlockWoodPile.java index 1aaabaae4..77e4aaf40 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockWoodPile.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockWoodPile.java @@ -31,7 +31,7 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; -import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.ModuleCharcoal; public class BlockWoodPile extends Block implements IItemModelRegister, IStateMapperRegister { @@ -135,7 +135,7 @@ public class BlockWoodPile extends Block implements IItemModelRegister, IStateMa if(state.getValue(AGE) < 7){ world.setBlockState(pos, state.withProperty(AGE, state.getValue(AGE) + 1), 2); }else{ - IBlockState ashState = PluginArboriculture.getBlocks().ash.getDefaultState(); + IBlockState ashState = ModuleCharcoal.getBlocks().ash.getDefaultState(); world.setBlockState(pos, ashState.withProperty(BlockAsh.AMOUNT, Math.round(getCharcoalAmount(world, pos))), 2); } } @@ -207,7 +207,7 @@ public class BlockWoodPile extends Block implements IItemModelRegister, IStateMa IBlockState state = world.getBlockState(testPos); if(state.getBlock() == Blocks.AIR){ break; - }else if(state.getBlock() == this || state.getBlock() == PluginArboriculture.getBlocks().charcoal){ + }else if(state.getBlock() == this || state.getBlock() == ModuleCharcoal.getBlocks().charcoal){ if(i == 15){ return getCharcoalFaceAmount(world, testPos, facing); } diff --git a/src/main/java/forestry/arboriculture/charcoal/CharcoalPileWall.java b/src/main/java/forestry/arboriculture/charcoal/CharcoalPileWall.java index f5ddfc248..43b4db987 100644 --- a/src/main/java/forestry/arboriculture/charcoal/CharcoalPileWall.java +++ b/src/main/java/forestry/arboriculture/charcoal/CharcoalPileWall.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.arboriculture.charcoal; -import forestry.api.arboriculture.ICharcoalPileWall; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import forestry.api.arboriculture.ICharcoalPileWall; + public class CharcoalPileWall implements ICharcoalPileWall { private final IBlockState blockState; @@ -46,7 +47,7 @@ public class CharcoalPileWall implements ICharcoalPileWall { } @Override - public NonNullList getDisplyItems() { + public NonNullList getDisplayItems() { if(block == Blocks.AIR){ return NonNullList.withSize(1, new ItemStack(blockState.getBlock(), 1, blockState.getBlock().getMetaFromState(blockState))); }else if(blockState == Blocks.AIR.getDefaultState()){ @@ -54,5 +55,10 @@ public class CharcoalPileWall implements ICharcoalPileWall { } return NonNullList.create(); } + + @Override + public NonNullList getDisplyItems() { + return getDisplayItems(); + } } diff --git a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java index 7386c5970..ddc18ea11 100644 --- a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java +++ b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java @@ -1,14 +1,16 @@ package forestry.arboriculture.charcoal.jei; +import net.minecraft.item.ItemStack; + import forestry.api.arboriculture.TreeManager; -import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.ModuleCharcoal; import forestry.arboriculture.charcoal.CharcoalPileWall; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import mezz.jei.api.recipe.IRecipeCategoryRegistration; -import net.minecraft.item.ItemStack; @JEIPlugin public class CharcoalJeiPlugin implements IModPlugin { @@ -25,7 +27,7 @@ public class CharcoalJeiPlugin implements IModPlugin { public void register(IModRegistry registry) { registry.handleRecipes(CharcoalPileWall.class, CharcoalPileWallWrapper::new, RECIPE_UID); registry.addRecipes(TreeManager.pileWalls, RECIPE_UID); - registry.addRecipeCatalyst(new ItemStack(PluginArboriculture.getBlocks().woodPile), RECIPE_UID); + registry.addRecipeCatalyst(new ItemStack(ModuleCharcoal.getBlocks().woodPile), RECIPE_UID); } } diff --git a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalPileWallCategory.java b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalPileWallCategory.java index 988e6c717..efc118697 100644 --- a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalPileWallCategory.java +++ b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalPileWallCategory.java @@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.ModuleCharcoal; import forestry.core.config.Constants; import forestry.core.recipes.jei.ForestryRecipeCategory; import forestry.core.recipes.jei.ForestryTooltipCallback; @@ -63,7 +63,7 @@ public class CharcoalPileWallCategory extends ForestryRecipeCategory outputs = ImmutableList.of( charcoal, ash diff --git a/src/main/java/forestry/arboriculture/compat/ArboricultureJeiPlugin.java b/src/main/java/forestry/arboriculture/compat/ArboricultureJeiPlugin.java index 63dd9093e..c7ca46763 100644 --- a/src/main/java/forestry/arboriculture/compat/ArboricultureJeiPlugin.java +++ b/src/main/java/forestry/arboriculture/compat/ArboricultureJeiPlugin.java @@ -1,7 +1,8 @@ package forestry.arboriculture.compat; import com.google.common.base.Preconditions; -import forestry.arboriculture.PluginArboriculture; + +import forestry.arboriculture.ModuleArboriculture; import forestry.arboriculture.items.ItemRegistryArboriculture; import forestry.core.utils.JeiUtil; import mezz.jei.api.IModPlugin; @@ -12,7 +13,7 @@ import mezz.jei.api.JEIPlugin; public class ArboricultureJeiPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { - ItemRegistryArboriculture items = PluginArboriculture.getItems(); + ItemRegistryArboriculture items = ModuleArboriculture.getItems(); Preconditions.checkNotNull(items); JeiUtil.addDescription(registry, diff --git a/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java b/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java index ae22c92e4..74b9cacb6 100755 --- a/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java +++ b/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java @@ -16,7 +16,7 @@ import forestry.api.arboriculture.IArboristTracker; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; -import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.ModuleArboriculture; import forestry.core.genetics.BreedingTracker; public class ArboristTracker extends BreedingTracker implements IArboristTracker { @@ -25,7 +25,7 @@ public class ArboristTracker extends BreedingTracker implements IArboristTracker * Required for creation from map storage */ public ArboristTracker(String s) { - super(s, PluginArboriculture.treekeepingMode); + super(s, ModuleArboriculture.treekeepingMode); } @Override diff --git a/src/main/java/forestry/arboriculture/genetics/LeafProvider.java b/src/main/java/forestry/arboriculture/genetics/LeafProvider.java index b290c9536..81f70aee0 100644 --- a/src/main/java/forestry/arboriculture/genetics/LeafProvider.java +++ b/src/main/java/forestry/arboriculture/genetics/LeafProvider.java @@ -1,11 +1,12 @@ package forestry.arboriculture.genetics; +import net.minecraft.item.ItemStack; + import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ILeafProvider; import forestry.api.genetics.IAllele; -import forestry.arboriculture.PluginArboriculture; -import net.minecraft.item.ItemStack; +import forestry.arboriculture.ModuleArboriculture; public class LeafProvider implements ILeafProvider { @@ -25,7 +26,7 @@ public class LeafProvider implements ILeafProvider { if(allele == null){ allele = TreeDefinition.Oak.getTemplate()[EnumTreeChromosome.SPECIES.ordinal()]; } - return PluginArboriculture.getBlocks().getDecorativeLeaves(allele.getUID()); + return ModuleArboriculture.getBlocks().getDecorativeLeaves(allele.getUID()); } } \ No newline at end of file diff --git a/src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java b/src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java index f5845aa4e..726454492 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java @@ -16,6 +16,15 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.EnumFruitFamily; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumTreeChromosome; @@ -27,7 +36,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlyzerPlugin; import forestry.api.genetics.IFruitFamily; -import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.ModuleArboriculture; import forestry.arboriculture.genetics.alleles.AlleleFruits; import forestry.core.config.Config; import forestry.core.gui.GuiAlyzer; @@ -35,13 +44,6 @@ import forestry.core.gui.TextLayoutHelper; import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.gui.widgets.WidgetManager; import forestry.core.utils.Translator; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class TreeAlyzerPlugin implements IAlyzerPlugin { public static final TreeAlyzerPlugin INSTANCE = new TreeAlyzerPlugin(); @@ -50,7 +52,7 @@ public class TreeAlyzerPlugin implements IAlyzerPlugin { private TreeAlyzerPlugin() { NonNullList treeList = NonNullList.create(); - PluginArboriculture.getItems().sapling.addCreativeItems(treeList, false); + ModuleArboriculture.getItems().sapling.addCreativeItems(treeList, false); for (ItemStack treeStack : treeList) { IAlleleTreeSpecies species = TreeGenome.getSpecies(treeStack); iconStacks.put(species.getUID(), treeStack); diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDatabaseTab.java b/src/main/java/forestry/arboriculture/genetics/TreeDatabaseTab.java new file mode 100644 index 000000000..4a7a877b8 --- /dev/null +++ b/src/main/java/forestry/arboriculture/genetics/TreeDatabaseTab.java @@ -0,0 +1,92 @@ +package forestry.arboriculture.genetics; + +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.arboriculture.EnumFruitFamily; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.ITree; +import forestry.api.core.GuiElementAlignment; +import forestry.api.core.IGuiElementHelper; +import forestry.api.genetics.EnumDatabaseTab; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IDatabaseTab; +import forestry.api.genetics.IFruitFamily; +import forestry.arboriculture.genetics.alleles.AlleleFruits; +import forestry.core.utils.Translator; + +@SideOnly(Side.CLIENT) +public class TreeDatabaseTab implements IDatabaseTab { + private final EnumDatabaseTab tab; + + TreeDatabaseTab(EnumDatabaseTab tab) { + this.tab = tab; + } + + @Override + public void createElements(IGuiElementHelper elementHelper, ITree tree, ItemStack itemStack) { + IAlleleTreeSpecies primarySpecies = tree.getGenome().getPrimary(); + boolean active = tab == EnumDatabaseTab.ACTIVE_SPECIES; + IAlleleTreeSpecies species = active ? primarySpecies : tree.getGenome().getSecondary(); + int speciesColor = elementHelper.factory().getColorCoding(species.isDominant()); + + elementHelper.addText(Translator.translateToLocal("for.gui.database.tab." + tab.name().toLowerCase() + ".name"), GuiElementAlignment.CENTER, 0xcfb53b); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.species"), tree, EnumTreeChromosome.SPECIES, active); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.saplings"), tree, EnumTreeChromosome.FERTILITY, active); + elementHelper.addAllele(Translator.translateToLocal("for.gui.maturity"), tree, EnumTreeChromosome.MATURATION, active); + elementHelper.addAllele(Translator.translateToLocal("for.gui.height"), tree, EnumTreeChromosome.HEIGHT, active); + + IAlleleInteger girth = (IAlleleInteger) (active ? tree.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH) : tree.getGenome().getInactiveAllele(EnumTreeChromosome.GIRTH)); + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.girth"), GuiElementAlignment.CENTER); + elementHelper.addText(String.format("%sx%s", girth.getValue(), girth.getValue()), GuiElementAlignment.CENTER, elementHelper.factory().getColorCoding(girth.isDominant())); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.yield"), tree, EnumTreeChromosome.YIELD, active); + elementHelper.addAllele(Translator.translateToLocal("for.gui.sappiness"), tree, EnumTreeChromosome.SAPPINESS, active); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.effect"), tree, EnumTreeChromosome.EFFECT, active); + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.native"), GuiElementAlignment.CENTER); + elementHelper.addText(Translator.translateToLocal("for.gui." + tree.getGenome().getPrimary().getPlantType().toString().toLowerCase(Locale.ENGLISH)), GuiElementAlignment.CENTER, speciesColor); + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.supports"), GuiElementAlignment.CENTER); + List families = new ArrayList<>(tree.getGenome().getPrimary().getSuitableFruit()); + + for (IFruitFamily fruitFamily : families) { + elementHelper.addText(fruitFamily.getName(), GuiElementAlignment.CENTER, speciesColor); + } + + IAlleleFruit fruit = (IAlleleFruit) (active ? tree.getGenome().getActiveAllele(EnumTreeChromosome.FRUITS) : tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS)); + int colorCoding = elementHelper.factory().getColorCoding(tree.getGenome().getActiveAllele(EnumTreeChromosome.FRUITS).isDominant()); + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.fruits"), GuiElementAlignment.CENTER); + String strike = ""; + if (!species.getSuitableFruit().contains(fruit.getProvider().getFamily()) && fruit != AlleleFruits.fruitNone) { + strike = TextFormatting.STRIKETHROUGH.toString(); + } + elementHelper.addText(strike + fruit.getProvider().getDescription(), GuiElementAlignment.CENTER, colorCoding); + + IFruitFamily family = fruit.getProvider().getFamily(); + + if (family != null && !family.getUID().equals(EnumFruitFamily.NONE.getUID())) { + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.family"), GuiElementAlignment.CENTER); + elementHelper.addText(family.getName(), GuiElementAlignment.CENTER, colorCoding); + } + + } + + @Override + public EnumDatabaseTab getTab() { + return tab; + } +} diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index 91a0aac5b..196dd8156 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -51,7 +51,7 @@ import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleSpeciesRegisterEvent; import forestry.api.genetics.IAllele; import forestry.api.world.ITreeGenData; -import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.ModuleArboriculture; import forestry.arboriculture.genetics.alleles.AlleleFruits; import forestry.arboriculture.models.ModelProviderFactory; import forestry.arboriculture.tiles.TileLeaves; @@ -1000,10 +1000,10 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe public boolean setLeaves(ITreeGenome genome, World world, @Nullable GameProfile owner, BlockPos pos) { if (owner == null && genome.matchesTemplateGenome()) { String speciesUid = genome.getPrimary().getUID(); - IBlockState defaultLeaves = PluginArboriculture.getBlocks().getDefaultLeaves(speciesUid); + IBlockState defaultLeaves = ModuleArboriculture.getBlocks().getDefaultLeaves(speciesUid); return world.setBlockState(pos, defaultLeaves); } else { - IBlockState leaves = PluginArboriculture.getBlocks().leaves.getDefaultState(); + IBlockState leaves = ModuleArboriculture.getBlocks().leaves.getDefaultState(); boolean placed = world.setBlockState(pos, leaves); if (!placed) { return false; diff --git a/src/main/java/forestry/arboriculture/genetics/TreePlugin.java b/src/main/java/forestry/arboriculture/genetics/TreePlugin.java new file mode 100644 index 000000000..f14418b92 --- /dev/null +++ b/src/main/java/forestry/arboriculture/genetics/TreePlugin.java @@ -0,0 +1,71 @@ +package forestry.arboriculture.genetics; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.ITree; +import forestry.api.genetics.EnumDatabaseTab; +import forestry.api.genetics.IDatabaseTab; +import forestry.api.genetics.ISpeciesPlugin; +import forestry.arboriculture.ModuleArboriculture; +import forestry.core.config.Config; +import forestry.core.items.ItemFruit; + +//TODO: Add support for the alyzer +@SideOnly(Side.CLIENT) +public class TreePlugin implements ISpeciesPlugin { + public static final TreePlugin INSTANCE = new TreePlugin(); + private static final TreeDatabaseTab ACTIVE = new TreeDatabaseTab(EnumDatabaseTab.ACTIVE_SPECIES); + private static final TreeDatabaseTab INACTIVE = new TreeDatabaseTab(EnumDatabaseTab.INACTIVE_SPECIES); + + protected final Map iconStacks = new HashMap<>(); + + private TreePlugin() { + NonNullList treeList = NonNullList.create(); + ModuleArboriculture.getItems().sapling.addCreativeItems(treeList, false); + for (ItemStack treeStack : treeList) { + IAlleleTreeSpecies species = TreeGenome.getSpecies(treeStack); + iconStacks.put(species.getUID(), treeStack); + } + } + + @Override + public Map getIndividualStacks() { + return iconStacks; + } + + @Override + public List getHints() { + return Config.hints.get("treealyzer"); + } + + @Override + public IDatabaseTab getSpeciesTab(boolean active) { + if(active){ + return ACTIVE; + } + return INACTIVE; + } + + @Override + public ItemStack getTabDatabaseIconItem(EnumDatabaseTab tab) { + switch (tab){ + case ACTIVE_SPECIES: + return TreeDefinition.Cherry.getMemberStack(EnumGermlingType.SAPLING); + case PRODUCTS: + return ItemFruit.EnumFruit.CHERRY.getStack(); + case MUTATIONS: + return ModuleArboriculture.getItems().grafter.getItemStack(); + } + return TreeDefinition.Cherry.getMemberStack(EnumGermlingType.POLLEN); + } +} diff --git a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java index 831125703..3d71770f8 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.arboriculture.genetics; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; @@ -21,8 +23,25 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; -import com.google.common.base.Preconditions; +import net.minecraft.block.Block; +import net.minecraft.block.BlockHorizontal; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.oredict.OreDictionary; + +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; @@ -45,8 +64,9 @@ import forestry.api.genetics.IFruitFamily; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.IPollinatable; +import forestry.api.genetics.ISpeciesPlugin; import forestry.api.genetics.ISpeciesType; -import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.ModuleArboriculture; import forestry.arboriculture.blocks.BlockFruitPod; import forestry.arboriculture.blocks.BlockRegistryArboriculture; import forestry.arboriculture.blocks.BlockSapling; @@ -57,20 +77,7 @@ import forestry.core.genetics.SpeciesRoot; import forestry.core.network.packets.PacketFXSignal; import forestry.core.tiles.TileUtil; import forestry.core.utils.BlockUtil; -import forestry.core.utils.GeneticsUtil; import forestry.core.utils.NetworkUtil; -import net.minecraft.block.Block; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.oredict.OreDictionary; public class TreeRoot extends SpeciesRoot implements ITreeRoot { public static final String UID = "rootTrees"; @@ -134,7 +141,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { if (stack.isEmpty()) { return null; } - ItemRegistryArboriculture items = PluginArboriculture.getItems(); + ItemRegistryArboriculture items = ModuleArboriculture.getItems(); Item item = stack.getItem(); if (items.sapling == item) { @@ -180,7 +187,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { public ItemStack getMemberStack(IIndividual tree, ISpeciesType type) { Preconditions.checkArgument(tree instanceof ITree, "individual is not a tree"); Preconditions.checkArgument(type instanceof EnumGermlingType, "type is not an EnumGermlingType"); - ItemRegistryArboriculture items = PluginArboriculture.getItems(); + ItemRegistryArboriculture items = ModuleArboriculture.getItems(); Item germlingItem; switch ((EnumGermlingType) type) { @@ -206,7 +213,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { @Override public boolean plantSapling(World world, ITree tree, GameProfile owner, BlockPos pos) { - BlockRegistryArboriculture blocks = PluginArboriculture.getBlocks(); + BlockRegistryArboriculture blocks = ModuleArboriculture.getBlocks(); IBlockState state = blocks.saplingGE.getDefaultState().withProperty(BlockSapling.TREE, tree.getGenome().getPrimary()); boolean placed = world.setBlockState(pos, state); @@ -237,7 +244,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { @Override public boolean setFruitBlock(World world, ITreeGenome genome, IAlleleFruit allele, float sappiness, BlockPos pos) { - BlockRegistryArboriculture blocks = PluginArboriculture.getBlocks(); + BlockRegistryArboriculture blocks = ModuleArboriculture.getBlocks(); EnumFacing facing = BlockUtil.getValidPodFacing(world, pos); if (facing != null) { @@ -426,6 +433,12 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { return TreeAlyzerPlugin.INSTANCE; } + @Override + @SideOnly(Side.CLIENT) + public ISpeciesPlugin getSpeciesPlugin() { + return TreePlugin.INSTANCE; + } + @Override public ICheckPollinatable createPollinatable(IIndividual individual) { Preconditions.checkArgument(individual instanceof ITree, "individual must be a tree"); diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java index 9b6a80e7e..8697de249 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java @@ -10,12 +10,6 @@ ******************************************************************************/ package forestry.arboriculture.items; -import forestry.arboriculture.PluginArboriculture; -import forestry.arboriculture.blocks.BlockAbstractLeaves; -import forestry.arboriculture.tiles.TileLeaves; -import forestry.core.items.IColoredItem; -import forestry.core.items.ItemBlockForestry; -import forestry.core.utils.Translator; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; @@ -23,9 +17,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.arboriculture.ModuleArboriculture; +import forestry.arboriculture.blocks.BlockAbstractLeaves; +import forestry.arboriculture.tiles.TileLeaves; +import forestry.core.items.IColoredItem; +import forestry.core.items.ItemBlockForestry; +import forestry.core.utils.Translator; + public class ItemBlockLeaves extends ItemBlockForestry implements IColoredItem { public ItemBlockLeaves(BlockAbstractLeaves block) { @@ -62,7 +64,7 @@ public class ItemBlockLeaves extends ItemBlockForestry impl @SideOnly(Side.CLIENT) public int getColorFromItemstack(ItemStack itemStack, int renderPass) { if (itemStack.getTagCompound() == null) { - return PluginArboriculture.proxy.getFoliageColorBasic(); + return ModuleArboriculture.proxy.getFoliageColorBasic(); } TileLeaves tileLeaves = new TileLeaves(); diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java index f19d9242a..fba44c600 100644 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java @@ -42,7 +42,7 @@ import forestry.api.arboriculture.IWoodStateMapper; import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.WoodBlockKind; import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.ModuleArboriculture; import forestry.arboriculture.blocks.BlockArbSlab; import forestry.arboriculture.blocks.BlockDecorativeLeaves; import forestry.arboriculture.blocks.BlockDefaultLeaves; @@ -69,11 +69,11 @@ public class ProxyArboricultureClient extends ProxyArboriculture { ModelResourceLocation blockModelLocation = new ModelResourceLocation("forestry:leaves"); ModelResourceLocation itemModelLocation = new ModelResourceLocation("forestry:leaves", "inventory"); BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModelLocation, - new ModelLeaves(), PluginArboriculture.getBlocks().leaves); + new ModelLeaves(), ModuleArboriculture.getBlocks().leaves); ModelManager.getInstance().registerCustomBlockModel(blockModelIndex); } - for (BlockDecorativeLeaves leaves : PluginArboriculture.getBlocks().leavesDecorative) { + for (BlockDecorativeLeaves leaves : ModuleArboriculture.getBlocks().leavesDecorative) { String resourceName = "forestry:leaves.decorative." + leaves.getBlockNumber(); ModelResourceLocation blockModelLocation = new ModelResourceLocation(resourceName); ModelResourceLocation itemModeLocation = new ModelResourceLocation(resourceName, "inventory"); @@ -82,7 +82,7 @@ public class ProxyArboricultureClient extends ProxyArboriculture { ModelManager.getInstance().registerCustomBlockModel(blockModelIndex); } - for (BlockDefaultLeaves leaves : PluginArboriculture.getBlocks().leavesDefault) { + for (BlockDefaultLeaves leaves : ModuleArboriculture.getBlocks().leavesDefault) { String resourceName = "forestry:leaves.default." + leaves.getBlockNumber(); ModelResourceLocation blockModelLocation = new ModelResourceLocation(resourceName); ModelResourceLocation itemModeLocation = new ModelResourceLocation(resourceName, "inventory"); @@ -92,10 +92,10 @@ public class ProxyArboricultureClient extends ProxyArboriculture { } ModelLoaderRegistry.registerLoader(WoodModelLoader.INSTANCE); - for (BlockArbSlab slab : PluginArboriculture.getBlocks().slabsDouble) { + for (BlockArbSlab slab : ModuleArboriculture.getBlocks().slabsDouble) { registerWoodModel(slab, true); } - for (BlockArbSlab slab : PluginArboriculture.getBlocks().slabsDoubleFireproof) { + for (BlockArbSlab slab : ModuleArboriculture.getBlocks().slabsDoubleFireproof) { registerWoodModel(slab, true); } } diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java index 03ccb9573..5dc31cd55 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java @@ -14,6 +14,21 @@ import javax.annotation.Nullable; import java.io.IOException; import java.util.Random; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; + +import net.minecraftforge.common.EnumPlantType; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.EnumFruitFamily; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; @@ -38,7 +53,7 @@ import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; import forestry.api.lepidopterology.IButterflyNursery; -import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.ModuleArboriculture; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.genetics.alleles.AlleleFruits; import forestry.arboriculture.network.IRipeningPacketReceiver; @@ -49,18 +64,6 @@ import forestry.core.utils.ClimateUtil; import forestry.core.utils.ColourUtil; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.NetworkUtil; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.common.EnumPlantType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class TileLeaves extends TileTreeContainer implements IPollinatable, IFruitBearer, IButterflyNursery, IRipeningPacketReceiver { @@ -139,7 +142,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru if (!checkedForConversionToDefaultLeaves) { if (shouldConvertToDefaultLeaves()) { - IBlockState defaultLeaves = PluginArboriculture.getBlocks().getDefaultLeaves(primary.getUID()); + IBlockState defaultLeaves = ModuleArboriculture.getBlocks().getDefaultLeaves(primary.getUID()); worldIn.setBlockState(getPos(), defaultLeaves); return; } diff --git a/src/main/java/forestry/core/CreativeTabForestry.java b/src/main/java/forestry/core/CreativeTabForestry.java index 56605785c..9065cf657 100755 --- a/src/main/java/forestry/core/CreativeTabForestry.java +++ b/src/main/java/forestry/core/CreativeTabForestry.java @@ -32,24 +32,24 @@ import forestry.arboriculture.genetics.TreeDefinition; import forestry.core.config.Constants; import forestry.lepidopterology.genetics.Butterfly; import forestry.lepidopterology.genetics.ButterflyDefinition; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModuleUids; public class CreativeTabForestry extends CreativeTabs { static { - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) { Tabs.tabAgriculture = new CreativeTabForestry(1, "agriculture"); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { Tabs.tabApiculture = new CreativeTabForestry(2, "apiculture"); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))) { Tabs.tabArboriculture = new CreativeTabForestry(3, "arboriculture"); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.LEPIDOPTEROLOGY))) { Tabs.tabLepidopterology = new CreativeTabForestry(4, "lepidopterology"); } } @@ -81,7 +81,7 @@ public class CreativeTabForestry extends CreativeTabs { break; } if (iconItem == null) { - iconItem = PluginCore.getItems().wrench; + iconItem = ModuleCore.getItems().wrench; } return new ItemStack(iconItem); } diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index c9ae1a92b..b128772a5 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -40,7 +40,7 @@ import forestry.core.errors.ErrorStateRegistry; import forestry.core.models.ModelBlockCached; import forestry.core.models.ModelBlockCustomCached; import forestry.core.render.TextureManagerForestry; -import forestry.plugins.PluginManager; +import forestry.modules.ModuleManager; public class EventHandlerCore { @@ -54,7 +54,7 @@ public class EventHandlerCore { return; } - for (IPickupHandler handler : PluginManager.pickupHandlers) { + for (IPickupHandler handler : ModuleManager.pickupHandlers) { if (handler.onItemPickup(event.getEntityPlayer(), event.getItem())) { event.setResult(Result.ALLOW); return; @@ -87,21 +87,21 @@ public class EventHandlerCore { public void handleWorldLoad(WorldEvent.Load event) { World world = event.getWorld(); - for (ISaveEventHandler handler : PluginManager.saveEventHandlers) { + for (ISaveEventHandler handler : ModuleManager.saveEventHandlers) { handler.onWorldLoad(world); } } @SubscribeEvent public void handleWorldSave(WorldEvent.Save event) { - for (ISaveEventHandler handler : PluginManager.saveEventHandlers) { + for (ISaveEventHandler handler : ModuleManager.saveEventHandlers) { handler.onWorldSave(event.getWorld()); } } @SubscribeEvent public void handleWorldUnload(WorldEvent.Unload event) { - for (ISaveEventHandler handler : PluginManager.saveEventHandlers) { + for (ISaveEventHandler handler : ModuleManager.saveEventHandlers) { handler.onWorldUnload(event.getWorld()); } } @@ -122,9 +122,9 @@ public class EventHandlerCore { return; } - Set lootPoolNames = PluginManager.getLootPoolNames(); + Set lootPoolNames = ModuleManager.getLootPoolNames(); - for (String lootTableFile : PluginManager.getLootTableFiles()) { + for (String lootTableFile : ModuleManager.getLootTableFiles()) { ResourceLocation resourceLocation = new ResourceLocation(Constants.MOD_ID, event.getName().getResourcePath() + "/" + lootTableFile); URL url = EventHandlerCore.class.getResource("/assets/" + resourceLocation.getResourceDomain() + "/loot_tables/" + resourceLocation.getResourcePath() + ".json"); if (url != null) { diff --git a/src/main/java/forestry/core/PluginCore.java b/src/main/java/forestry/core/ModuleCore.java similarity index 95% rename from src/main/java/forestry/core/PluginCore.java rename to src/main/java/forestry/core/ModuleCore.java index ca9e26ae5..52c0731e4 100644 --- a/src/main/java/forestry/core/PluginCore.java +++ b/src/main/java/forestry/core/ModuleCore.java @@ -22,6 +22,7 @@ import net.minecraft.command.ICommand; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.functions.LootFunctionManager; import net.minecraftforge.client.event.ModelBakeEvent; @@ -49,7 +50,7 @@ import forestry.core.circuits.CircuitRegistry; import forestry.core.circuits.SolderManager; import forestry.core.climate.ClimateFactory; import forestry.core.climate.ClimateManager; -import forestry.core.commands.CommandPlugins; +import forestry.core.commands.CommandModules; import forestry.core.commands.RootCommand; import forestry.core.config.Config; import forestry.core.config.Constants; @@ -73,12 +74,12 @@ import forestry.core.utils.ClimateUtil; import forestry.core.utils.ForestryModEnvWarningCallable; import forestry.core.utils.OreDictUtil; import forestry.core.utils.World2ObjectMap; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.CORE, name = "Core", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.core.description") -public class PluginCore extends BlankForestryPlugin { +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.CORE, name = "Core", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.core.description", coreModule = true) +public class ModuleCore extends BlankForestryModule { public static final RootCommand rootCommand = new RootCommand(); @Nullable public static ItemRegistryCore items; @@ -101,7 +102,7 @@ public class PluginCore extends BlankForestryPlugin { } @Override - public Set getDependencyUids() { + public Set getDependencyUids() { return Collections.emptySet(); } @@ -132,19 +133,17 @@ public class PluginCore extends BlankForestryPlugin { @Override public void preInit() { - super.preInit(); GameProfileDataSerializer.register(); MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(World2ObjectMap.class); - rootCommand.addChildCommand(new CommandPlugins()); + rootCommand.addChildCommand(new CommandModules()); } @Override public void doInit() { - super.doInit(); AlleleHelper alleleHelper = AlleleHelper.getInstance(); BlockRegistryCore blocks = getBlocks(); @@ -241,7 +240,7 @@ public class PluginCore extends BlankForestryPlugin { public void registerRecipes() { BlockRegistryCore blocks = getBlocks(); ItemRegistryCore items = getItems(); - ItemRegistryFluids fluidItems = PluginFluids.getItems(); + ItemRegistryFluids fluidItems = ModuleFluids.getItems(); /* SMELTING RECIPES */ RecipeUtil.addSmelting(blocks.resources.get(EnumResourceType.APATITE, 1), items.apatite, 0.5f); @@ -291,7 +290,7 @@ public class PluginCore extends BlankForestryPlugin { // / WEB RecipeUtil.addRecipe("silk_wisp_to_web", new ItemStack(Blocks.WEB, 4), "# #", " # ", "# #", '#', items.craftingMaterial.getSilkWisp()); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))) { // / CARPENTER // Portable ANALYZER RecipeManagers.carpenterManager.addRecipe(100, new FluidStack(FluidRegistry.WATER, 2000), ItemStack.EMPTY, items.portableAlyzer.getItemStack(), @@ -432,7 +431,7 @@ public class PluginCore extends BlankForestryPlugin { RecipeUtil.addShapelessRecipe("block_to_bronze", ingotBronze, OreDictUtil.BLOCK_BRONZE); } - if(!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)){ + if(!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))){ RecipeUtil.addSmelting(new ItemStack(items.ash, 2), new ItemStack(Items.COAL, 1, 1), 0.15F); } @@ -450,7 +449,7 @@ public class PluginCore extends BlankForestryPlugin { '#', Items.BRICK); // alternate recipes - if (!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { + if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { RecipeManagers.centrifugeManager.addRecipe(5, new ItemStack(Items.STRING), ImmutableMap.of( items.craftingMaterial.getSilkWisp(), 0.15f )); diff --git a/src/main/java/forestry/core/PluginFluids.java b/src/main/java/forestry/core/ModuleFluids.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/forestry/core/PluginFluids.java rename to src/main/java/forestry/core/ModuleFluids.java index 0e57405b6..977bfe006 --- a/src/main/java/forestry/core/PluginFluids.java +++ b/src/main/java/forestry/core/ModuleFluids.java @@ -39,12 +39,12 @@ import forestry.core.items.ItemRegistryFluids; import forestry.core.proxy.Proxies; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.Log; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.FLUIDS, name = "Fluids", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.fluids.description") -public class PluginFluids extends BlankForestryPlugin { +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.FLUIDS, name = "Fluids", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.module.fluids.description") +public class ModuleFluids extends BlankForestryModule { @Nullable private static ItemRegistryFluids items; @@ -117,7 +117,7 @@ public class PluginFluids extends BlankForestryPlugin { @Override public void doInit() { if (RecipeManagers.squeezerManager != null) { - ItemRegistryCore itemRegistryCore = PluginCore.getItems(); + ItemRegistryCore itemRegistryCore = ModuleCore.getItems(); RecipeManagers.squeezerManager.addContainerRecipe(10, getItems().canEmpty.getItemStack(), itemRegistryCore.ingotTin.copy(), 0.05f); RecipeManagers.squeezerManager.addContainerRecipe(10, getItems().waxCapsuleEmpty.getItemStack(), itemRegistryCore.beeswax.getItemStack(), 0.10f); RecipeManagers.squeezerManager.addContainerRecipe(10, getItems().refractoryEmpty.getItemStack(), itemRegistryCore.refractoryWax.getItemStack(), 0.10f); diff --git a/src/main/java/forestry/core/TickHandlerCoreServer.java b/src/main/java/forestry/core/TickHandlerCoreServer.java index 4f9ab7b36..9ede8b0d1 100755 --- a/src/main/java/forestry/core/TickHandlerCoreServer.java +++ b/src/main/java/forestry/core/TickHandlerCoreServer.java @@ -16,18 +16,17 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import it.unimi.dsi.fastutil.ints.IntArraySet; -import it.unimi.dsi.fastutil.ints.IntSet; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; - import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderServer; import net.minecraft.world.gen.IChunkGenerator; + import net.minecraftforge.event.world.ChunkDataEvent; + import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent; @@ -36,7 +35,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.worldgen.WorldGenerator; -import forestry.plugins.PluginManager; +import forestry.modules.ModuleManager; + +import it.unimi.dsi.fastutil.ints.IntArraySet; +import it.unimi.dsi.fastutil.ints.IntSet; public class TickHandlerCoreServer { @@ -57,7 +59,7 @@ public class TickHandlerCoreServer { if (Config.enableBackpackResupply) { for (Object obj : event.world.playerEntities) { EntityPlayer player = (EntityPlayer) obj; - for (IResupplyHandler handler : PluginManager.resupplyHandlers) { + for (IResupplyHandler handler : ModuleManager.resupplyHandlers) { handler.resupply(player); } } diff --git a/src/main/java/forestry/core/advancements/AdvancementManager.java b/src/main/java/forestry/core/advancements/AdvancementManager.java new file mode 100644 index 000000000..9d9eafeb2 --- /dev/null +++ b/src/main/java/forestry/core/advancements/AdvancementManager.java @@ -0,0 +1,34 @@ +package forestry.core.advancements; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.advancements.ICriterionInstance; +import net.minecraft.advancements.ICriterionTrigger; + +import net.minecraftforge.fml.relauncher.ReflectionHelper; + +import forestry.core.utils.Log; + +public class AdvancementManager { + + private static Method criterionRegister; + + public static void registerTriggers() { + registerAdvancementTrigger(SpeciesDiscoveredTrigger.INSTANCE); + } + + private static ICriterionTrigger registerAdvancementTrigger(ICriterionTrigger trigger) { + if(criterionRegister == null) { + criterionRegister = ReflectionHelper.findMethod(CriteriaTriggers.class, "register", "func_192118_a", ICriterionTrigger.class); + criterionRegister.setAccessible(true); + } + try { + trigger = (ICriterionTrigger) criterionRegister.invoke(null, trigger); + } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException error) { + Log.error("Failed to register a trigger " + trigger.getId() + " .", error); + } + return trigger; + } +} diff --git a/src/main/java/forestry/core/advancements/SpeciesDiscoveredTrigger.java b/src/main/java/forestry/core/advancements/SpeciesDiscoveredTrigger.java new file mode 100644 index 000000000..001932328 --- /dev/null +++ b/src/main/java/forestry/core/advancements/SpeciesDiscoveredTrigger.java @@ -0,0 +1,141 @@ +package forestry.core.advancements; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonObject; +import com.google.gson.JsonSyntaxException; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.minecraft.advancements.ICriterionTrigger; +import net.minecraft.advancements.PlayerAdvancements; +import net.minecraft.advancements.critereon.AbstractCriterionInstance; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.JsonUtils; +import net.minecraft.util.ResourceLocation; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.core.config.Constants; + +public class SpeciesDiscoveredTrigger implements ICriterionTrigger { + private static final ResourceLocation ID = new ResourceLocation(Constants.MOD_ID, "species_discovered"); + + public static final SpeciesDiscoveredTrigger INSTANCE = new SpeciesDiscoveredTrigger(); + + private final Map listeners = Maps.newHashMap(); + + @Override + public ResourceLocation getId() { + return ID; + } + + public void addListener(PlayerAdvancements advancements, ICriterionTrigger.Listener listener) { + Listeners listeners = this.listeners.get(advancements); + + if (listeners == null) { + listeners = new Listeners(advancements); + this.listeners.put(advancements, listeners); + } + + listeners.add(listener); + } + + public void removeListener(PlayerAdvancements advancements, ICriterionTrigger.Listener listener) { + Listeners listeners = this.listeners.get(advancements); + + if (listeners != null) { + listeners.remove(listener); + + if (listeners.isEmpty()) { + this.listeners.remove(advancements); + } + } + } + + public void removeAllListeners(PlayerAdvancements advancements) { + this.listeners.remove(advancements); + } + + public Instance deserializeInstance(JsonObject json, JsonDeserializationContext context) { + String uid = JsonUtils.getString(json, "uid"); + IAllele allele = AlleleManager.alleleRegistry.getAllele(uid); + + if (allele == null) { + throw new JsonSyntaxException("Unknown allele '" + uid + "'"); + } + else + { + return new Instance(allele); + } + } + + public void trigger(EntityPlayerMP player, IAllele allele) { + Listeners listeners = this.listeners.get(player.getAdvancements()); + + if (listeners != null) { + listeners.trigger(allele); + } + } + + public static class Instance extends AbstractCriterionInstance { + private final IAllele allele; + + public Instance(IAllele allele) + { + super(ID); + this.allele = allele; + } + + public boolean test(IAllele allele) + { + return this.allele == allele; + } + } + + private static class Listeners { + private final PlayerAdvancements playerAdvancements; + private final Set> listeners = Sets.newHashSet(); + + public Listeners(PlayerAdvancements playerAdvancementsIn) { + this.playerAdvancements = playerAdvancementsIn; + } + + public boolean isEmpty() { + return this.listeners.isEmpty(); + } + + public void add(ICriterionTrigger.Listener listener) { + this.listeners.add(listener); + } + + public void remove(ICriterionTrigger.Listener listener) { + this.listeners.remove(listener); + } + + public void trigger(IAllele allele) { + List> list = null; + + for (ICriterionTrigger.Listener listener : this.listeners) { + Instance instance = listener.getCriterionInstance(); + if (instance.test(allele)) { + if (list == null) { + list = Lists.newArrayList(); + } + + list.add(listener); + } + } + + if (list != null) { + for (ICriterionTrigger.Listener listener : list) { + listener.grantCriterion(this.playerAdvancements); + } + } + } + } +} diff --git a/src/main/java/forestry/core/blocks/properties/BlockAshStairs.java b/src/main/java/forestry/core/blocks/BlockAshStairs.java similarity index 94% rename from src/main/java/forestry/core/blocks/properties/BlockAshStairs.java rename to src/main/java/forestry/core/blocks/BlockAshStairs.java index 583690f91..180028065 100644 --- a/src/main/java/forestry/core/blocks/properties/BlockAshStairs.java +++ b/src/main/java/forestry/core/blocks/BlockAshStairs.java @@ -1,4 +1,4 @@ -package forestry.core.blocks.properties; +package forestry.core.blocks; import net.minecraft.block.BlockStairs; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/forestry/core/blocks/BlockBogEarth.java b/src/main/java/forestry/core/blocks/BlockBogEarth.java index be2ab3e48..ff7c4e5ef 100755 --- a/src/main/java/forestry/core/blocks/BlockBogEarth.java +++ b/src/main/java/forestry/core/blocks/BlockBogEarth.java @@ -38,7 +38,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.core.CreativeTabForestry; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.config.Constants; /** @@ -109,7 +109,7 @@ public class BlockBogEarth extends Block implements IItemModelRegister, IBlockWi SoilType type = SoilType.fromMaturity(maturity); if (type == SoilType.PEAT) { - drops.add(PluginCore.getItems().peat.getItemStack(2)); + drops.add(ModuleCore.getItems().peat.getItemStack(2)); drops.add(new ItemStack(Blocks.DIRT)); } else { drops.add(new ItemStack(this, 1, SoilType.BOG_EARTH.ordinal())); diff --git a/src/main/java/forestry/core/blocks/BlockRegistry.java b/src/main/java/forestry/core/blocks/BlockRegistry.java index 2c2048c33..d654e4fce 100755 --- a/src/main/java/forestry/core/blocks/BlockRegistry.java +++ b/src/main/java/forestry/core/blocks/BlockRegistry.java @@ -17,17 +17,18 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.fml.common.registry.ForgeRegistries; + import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import forestry.core.utils.MigrationHelper; -import forestry.plugins.PluginManager; +import forestry.modules.ModuleManager; public abstract class BlockRegistry { protected void registerBlock(T block, @Nullable ItemBlock itemBlock, String name) { - if (PluginManager.getStage() != PluginManager.Stage.REGISTER) { + if (ModuleManager.getStage() != ModuleManager.Stage.REGISTER) { throw new RuntimeException("Tried to register Block outside of REGISTER"); } diff --git a/src/main/java/forestry/core/blocks/BlockRegistryCore.java b/src/main/java/forestry/core/blocks/BlockRegistryCore.java index f270cde14..73e5e7012 100644 --- a/src/main/java/forestry/core/blocks/BlockRegistryCore.java +++ b/src/main/java/forestry/core/blocks/BlockRegistryCore.java @@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import forestry.core.blocks.properties.BlockAshStairs; import forestry.core.items.ItemBlockForestry; import forestry.core.utils.OreDictUtil; diff --git a/src/main/java/forestry/core/blocks/BlockResourceOre.java b/src/main/java/forestry/core/blocks/BlockResourceOre.java index c6c7788ab..3458170ff 100755 --- a/src/main/java/forestry/core/blocks/BlockResourceOre.java +++ b/src/main/java/forestry/core/blocks/BlockResourceOre.java @@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.core.CreativeTabForestry; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; public class BlockResourceOre extends Block implements IItemModelRegister, IBlockWithMeta { public static final PropertyEnum ORE_RESOURCES = PropertyEnum.create("resource", EnumResourceType.class, input -> input != null && input.hasOre()); @@ -79,7 +79,7 @@ public class BlockResourceOre extends Block implements IItemModelRegister, IBloc int amount = (2 + RANDOM.nextInt(5)) * (fortuneModifier + 1); if (amount > 0) { - drops.add(PluginCore.getItems().apatite.getItemStack(amount)); + drops.add(ModuleCore.getItems().apatite.getItemStack(amount)); } break; } diff --git a/src/main/java/forestry/core/circuits/CircuitRegistry.java b/src/main/java/forestry/core/circuits/CircuitRegistry.java index a559ef87c..28fb56e59 100755 --- a/src/main/java/forestry/core/circuits/CircuitRegistry.java +++ b/src/main/java/forestry/core/circuits/CircuitRegistry.java @@ -24,7 +24,7 @@ import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitLibrary; import forestry.api.circuits.ICircuitRegistry; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; public class CircuitRegistry implements ICircuitRegistry { @@ -103,7 +103,7 @@ public class CircuitRegistry implements ICircuitRegistry { @Override public boolean isChipset(ItemStack itemstack) { - return itemstack.getItem() == PluginCore.getItems().circuitboards; + return itemstack.getItem() == ModuleCore.getItems().circuitboards; } @Override diff --git a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java index 50aa10cbb..95f894a45 100755 --- a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java +++ b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java @@ -30,7 +30,7 @@ import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitLayout; import forestry.api.core.IModelManager; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.items.IColoredItem; import forestry.core.items.ItemForestry; @@ -95,7 +95,7 @@ public class ItemCircuitBoard extends ItemForestry implements IColoredItem { } public static ItemStack createCircuitboard(EnumCircuitBoardType type, @Nullable ICircuitLayout layout, ICircuit[] circuits) { - ItemStack chipset = PluginCore.getItems().circuitboards.get(type); + ItemStack chipset = ModuleCore.getItems().circuitboards.get(type); NBTTagCompound nbttagcompound = new NBTTagCompound(); new CircuitBoard(type, layout, circuits).writeToNBT(nbttagcompound); chipset.setTagCompound(nbttagcompound); diff --git a/src/main/java/forestry/core/commands/CommandPlugins.java b/src/main/java/forestry/core/commands/CommandModules.java similarity index 61% rename from src/main/java/forestry/core/commands/CommandPlugins.java rename to src/main/java/forestry/core/commands/CommandModules.java index fd80dfd22..82d58e9c8 100644 --- a/src/main/java/forestry/core/commands/CommandPlugins.java +++ b/src/main/java/forestry/core/commands/CommandModules.java @@ -10,52 +10,57 @@ ******************************************************************************/ package forestry.core.commands; -import forestry.core.utils.Translator; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.IForestryPlugin; -import forestry.plugins.PluginManager; +import javax.annotation.Nullable; +import java.util.List; + import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; +import forestry.core.utils.Translator; +import forestry.modules.ForestryModule; +import forestry.modules.IForestryModule; +import forestry.modules.ModuleManager; + /** * @author CovertJaguar */ -public class CommandPlugins extends SubCommand { +public class CommandModules extends SubCommand { - public CommandPlugins() { - super("plugins"); - addAlias("plug"); + public CommandModules() { + super("module"); + addAlias("mod"); addChildCommand(new CommandPluginsInfo()); } @Override public void executeSubCommand(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { if (args.length == 0) { - listPluginsForSender(sender); + listModulesForSender(sender); } else { CommandHelpers.throwWrongUsage(sender, this); } } - private static void listPluginsForSender(ICommandSender sender) { + private static void listModulesForSender(ICommandSender sender) { StringBuilder pluginList = new StringBuilder(); - for (IForestryPlugin plugin : PluginManager.getLoadedPlugins()) { + for (IForestryModule module : ModuleManager.getLoadedModules()) { if (pluginList.length() > 0) { pluginList.append(", "); } - pluginList.append(makeListEntry(plugin)); + pluginList.append(makeListEntry(module)); } CommandHelpers.sendChatMessage(sender, pluginList.toString()); } - private static String makeListEntry(IForestryPlugin plugin) { - String entry = plugin.isAvailable() ? TextFormatting.GREEN.toString() : TextFormatting.RED.toString(); + private static String makeListEntry(IForestryModule module) { + String entry = module.isAvailable() ? TextFormatting.GREEN.toString() : TextFormatting.RED.toString(); - ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); if (info != null) { - entry += info.pluginID(); + entry += info.moduleID(); if (!info.version().isEmpty()) { entry += " (" + info.version() + ")"; } @@ -76,35 +81,47 @@ public class CommandPlugins extends SubCommand { @Override public void executeSubCommand(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { if (args.length == 1) { - listPluginInfoForSender(sender, args[0]); + listModuleInfoForSender(sender, args[0]); } else { CommandHelpers.throwWrongUsage(sender, this); } } - private static void listPluginInfoForSender(ICommandSender sender, String pluginUid) throws CommandException { - IForestryPlugin found = null; - for (IForestryPlugin plugin : PluginManager.getLoadedPlugins()) { - ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); + @Override + public List getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) { + List tabCompletions = super.getTabCompletions(server, sender, args, targetPos); + for (IForestryModule module : ModuleManager.getLoadedModules()) { + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + if (info != null) { + tabCompletions.add(info.moduleID()); + } + } + return tabCompletions; + } + + private static void listModuleInfoForSender(ICommandSender sender, String pluginUid) throws CommandException { + IForestryModule found = null; + for (IForestryModule module : ModuleManager.getLoadedModules()) { + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); if (info == null) { continue; } - if (info.pluginID().equalsIgnoreCase(pluginUid) || info.name().equalsIgnoreCase(pluginUid)) { - found = plugin; + if (info.moduleID().equalsIgnoreCase(pluginUid) || info.name().equalsIgnoreCase(pluginUid)) { + found = module; break; } } if (found == null) { - throw new CommandException(Translator.translateToLocalFormatted("for.chat.plugins.error", pluginUid)); + throw new CommandException(Translator.translateToLocalFormatted("for.chat.modules.error", pluginUid)); } TextFormatting formatting = found.isAvailable() ? TextFormatting.GREEN : TextFormatting.RED; - ForestryPlugin info = found.getClass().getAnnotation(ForestryPlugin.class); + ForestryModule info = found.getClass().getAnnotation(ForestryModule.class); if (info != null) { - CommandHelpers.sendChatMessage(sender, formatting + "Plugin: " + info.name()); + CommandHelpers.sendChatMessage(sender, formatting + "Module: " + info.name()); if (!info.version().isEmpty()) { CommandHelpers.sendChatMessage(sender, TextFormatting.BLUE + "Version: " + info.version()); } diff --git a/src/main/java/forestry/core/genetics/BreedingTracker.java b/src/main/java/forestry/core/genetics/BreedingTracker.java index 6fed56c36..b20bdba0a 100755 --- a/src/main/java/forestry/core/genetics/BreedingTracker.java +++ b/src/main/java/forestry/core/genetics/BreedingTracker.java @@ -35,6 +35,7 @@ import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; +import forestry.core.advancements.SpeciesDiscoveredTrigger; import forestry.core.network.packets.PacketGenomeTrackerSync; import forestry.core.utils.NetworkUtil; @@ -125,6 +126,10 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin writeToNBT(nbtTagCompound, discoveredSpecies, discoveredMutations, researchedMutations); PacketGenomeTrackerSync packet = new PacketGenomeTrackerSync(nbtTagCompound); NetworkUtil.sendToPlayer(packet, player); + + for(String species : discoveredSpecies) { + SpeciesDiscoveredTrigger.INSTANCE.trigger(( EntityPlayerMP)player, AlleleManager.alleleRegistry.getAllele(species)); + } } } } diff --git a/src/main/java/forestry/core/genetics/Chromosome.java b/src/main/java/forestry/core/genetics/Chromosome.java index fa6f0fb84..e2666b84d 100755 --- a/src/main/java/forestry/core/genetics/Chromosome.java +++ b/src/main/java/forestry/core/genetics/Chromosome.java @@ -38,6 +38,17 @@ public class Chromosome implements IChromosome { return new Chromosome(primary, secondary); } + public static Chromosome create(@Nullable String primarySpeciesUid, @Nullable String secondarySpeciesUid, IChromosomeType chromosomeType, String primaryUID, String secondaryUID) { + IAllele primary = AlleleManager.alleleRegistry.getAllele(primaryUID); + IAllele secondary = AlleleManager.alleleRegistry.getAllele(secondaryUID); + + primary = validateAllele(primarySpeciesUid, chromosomeType, primary); + secondary = validateAllele(secondarySpeciesUid, chromosomeType, secondary); + + + return new Chromosome(primary, secondary); + } + private static IAllele validateAllele(@Nullable String speciesUid, IChromosomeType chromosomeType, @Nullable IAllele allele) { if (!chromosomeType.getAlleleClass().isInstance(allele)) { ISpeciesRoot speciesRoot = chromosomeType.getSpeciesRoot(); @@ -112,16 +123,16 @@ public class Chromosome implements IChromosome { IAllele choice1; if (rand.nextBoolean()) { - choice1 = parent1.getPrimaryAllele(); + choice1 = parent1.getActiveAllele(); } else { - choice1 = parent1.getSecondaryAllele(); + choice1 = parent1.getInactiveAllele(); } IAllele choice2; if (rand.nextBoolean()) { - choice2 = parent2.getPrimaryAllele(); + choice2 = parent2.getActiveAllele(); } else { - choice2 = parent2.getSecondaryAllele(); + choice2 = parent2.getInactiveAllele(); } if (rand.nextBoolean()) { diff --git a/src/main/java/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java index 7e87b103d..8bf2083ef 100755 --- a/src/main/java/forestry/core/genetics/Genome.java +++ b/src/main/java/forestry/core/genetics/Genome.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import com.google.common.base.Objects; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; @@ -163,30 +162,54 @@ public abstract class Genome implements IGenome { private static IChromosome[] getChromosomes(NBTTagCompound genomeNBT, ISpeciesRoot speciesRoot) { + //Handle old nbt format + if(genomeNBT.hasKey("Chromosomes")) { + NBTTagList chromosomesNBT = genomeNBT.getTagList("Chromosomes", 10); + IChromosome[] chromosomes = new IChromosome[speciesRoot.getDefaultTemplate().length]; - NBTTagList chromosomesNBT = genomeNBT.getTagList("Chromosomes", 10); - IChromosome[] chromosomes = new IChromosome[speciesRoot.getDefaultTemplate().length]; + String primarySpeciesUid = null; + String secondarySpeciesUid = null; - String primarySpeciesUid = null; - String secondarySpeciesUid = null; + for (int i = 0; i < chromosomesNBT.tagCount(); i++) { + NBTTagCompound chromosomeNBT = chromosomesNBT.getCompoundTagAt(i); + byte chromosomeOrdinal = chromosomeNBT.getByte(SLOT_TAG); - for (int i = 0; i < chromosomesNBT.tagCount(); i++) { - NBTTagCompound chromosomeNBT = chromosomesNBT.getCompoundTagAt(i); - byte chromosomeOrdinal = chromosomeNBT.getByte(SLOT_TAG); + if (chromosomeOrdinal >= 0 && chromosomeOrdinal < chromosomes.length) { + IChromosomeType chromosomeType = speciesRoot.getKaryotype()[chromosomeOrdinal]; + Chromosome chromosome = Chromosome.create(primarySpeciesUid, secondarySpeciesUid, chromosomeType, chromosomeNBT); + chromosomes[chromosomeOrdinal] = chromosome; - if (chromosomeOrdinal >= 0 && chromosomeOrdinal < chromosomes.length) { - IChromosomeType chromosomeType = speciesRoot.getKaryotype()[chromosomeOrdinal]; - Chromosome chromosome = Chromosome.create(primarySpeciesUid, secondarySpeciesUid, chromosomeType, chromosomeNBT); - chromosomes[chromosomeOrdinal] = chromosome; + if (chromosomeOrdinal == speciesRoot.getSpeciesChromosomeType().ordinal()) { + primarySpeciesUid = chromosome.getPrimaryAllele().getUID(); + secondarySpeciesUid = chromosome.getSecondaryAllele().getUID(); + } + } + } + return chromosomes; + }else{ + NBTTagCompound activeTag = genomeNBT.getCompoundTag("Active"); + NBTTagCompound inactiveTag = genomeNBT.getCompoundTag("Inactive"); + IChromosomeType[] karyotype = speciesRoot.getKaryotype(); + IChromosome[] chromosomes = new IChromosome[karyotype.length]; - if (chromosomeOrdinal == speciesRoot.getSpeciesChromosomeType().ordinal()) { + String primarySpeciesUid = null; + String secondarySpeciesUid = null; + + for(int index = 0;index < chromosomes.length;index++){ + IChromosomeType chromosomeType = karyotype[index]; + String typeName = chromosomeType.getName(); + String activeAllele = activeTag.getString(typeName); + String inactiveAllele = inactiveTag.getString(typeName); + Chromosome chromosome = Chromosome.create(primarySpeciesUid, secondarySpeciesUid, chromosomeType, activeAllele, inactiveAllele); + chromosomes[index] = chromosome; + + if (index == speciesRoot.getSpeciesChromosomeType().ordinal()) { primarySpeciesUid = chromosome.getPrimaryAllele().getUID(); secondarySpeciesUid = chromosome.getSecondaryAllele().getUID(); } } + return chromosomes; } - - return chromosomes; } protected static IAllele getActiveAllele(ItemStack itemStack, IChromosomeType chromosomeType, ISpeciesRoot speciesRoot) { @@ -196,7 +219,6 @@ public abstract class Genome implements IGenome { @Override public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { - NBTTagList nbttaglist = new NBTTagList(); for (int i = 0; i < chromosomes.length; i++) { if (chromosomes[i] != null) { diff --git a/src/main/java/forestry/core/genetics/SpeciesRoot.java b/src/main/java/forestry/core/genetics/SpeciesRoot.java index 793652083..b3b77b403 100755 --- a/src/main/java/forestry/core/genetics/SpeciesRoot.java +++ b/src/main/java/forestry/core/genetics/SpeciesRoot.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Random; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import forestry.api.genetics.IAllele; @@ -107,6 +108,25 @@ public abstract class SpeciesRoot implements ISpeciesRoot { return (IIndividualTranslator) translators.get(translatorKey); } + @Nullable + @Override + public I translateMember(O objectToTranslator) { + Object translatorKey = null; + if(objectToTranslator instanceof ItemStack){ + translatorKey = ((ItemStack) objectToTranslator).getItem(); + }else if(objectToTranslator instanceof IBlockState){ + translatorKey = ((IBlockState) objectToTranslator).getBlock(); + } + if(translatorKey == null){ + return null; + } + IIndividualTranslator translator = getTranslator(translatorKey); + if(translator == null){ + return null; + } + return translator.getIndividualFromObject(objectToTranslator); + } + /* MUTATIONS */ @Override public List getCombinations(IAllele other) { @@ -120,6 +140,24 @@ public abstract class SpeciesRoot implements ISpeciesRoot { return combinations; } + @Override + public List getResultantMutations(IAllele other) { + List mutations = new ArrayList<>(); + int speciesIndex = getSpeciesChromosomeType().ordinal(); + for (IMutation mutation : getMutations(false)) { + IAllele[] template = mutation.getTemplate(); + if(template == null || template.length <= speciesIndex){ + continue; + } + IAllele speciesAllele = template[speciesIndex]; + if (speciesAllele == other) { + mutations.add(mutation); + } + } + + return mutations; + } + @Override public List getCombinations(IAlleleSpecies parentSpecies0, IAlleleSpecies parentSpecies1, boolean shuffle) { List combinations = new ArrayList<>(); diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java index 2041b9627..5ce865241 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java @@ -17,6 +17,9 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.Vec3i; + import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.core.ForestryAPI; @@ -30,8 +33,7 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.apiculture.flowers.FlowerProvider; import forestry.core.config.Constants; -import forestry.plugins.ForestryPluginUids; -import net.minecraft.util.math.Vec3i; +import forestry.modules.ForestryModuleUids; public class AlleleHelper implements IAlleleHelper { @@ -49,13 +51,13 @@ public class AlleleHelper implements IAlleleHelper { } public void init() { - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { createAlleles(EnumAllele.Fertility.class, EnumBeeChromosome.FERTILITY); createAlleles(EnumAllele.Flowering.class, EnumBeeChromosome.FLOWERING); createAlleles(EnumAllele.Territory.class, EnumBeeChromosome.TERRITORY); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE) || ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE)) || ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.LEPIDOPTEROLOGY))) { createAlleles(EnumAllele.Speed.class, EnumBeeChromosome.SPEED, EnumButterflyChromosome.SPEED @@ -76,7 +78,7 @@ public class AlleleHelper implements IAlleleHelper { ); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))) { createAlleles(EnumAllele.Height.class, EnumTreeChromosome.HEIGHT); createAlleles(EnumAllele.Saplings.class, EnumTreeChromosome.FERTILITY); createAlleles(EnumAllele.Yield.class, EnumTreeChromosome.YIELD); @@ -85,7 +87,7 @@ public class AlleleHelper implements IAlleleHelper { createAlleles(EnumAllele.Sappiness.class, EnumTreeChromosome.SAPPINESS); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.LEPIDOPTEROLOGY))) { createAlleles(EnumAllele.Size.class, EnumButterflyChromosome.SIZE); } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java index 444cf3db1..32e1c469b 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.core.genetics.alleles; +import com.google.common.collect.HashMultimap; + import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; @@ -19,8 +21,10 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import com.google.common.collect.HashMultimap; +import net.minecraft.item.ItemStack; + import com.mojang.authlib.GameProfile; + import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleHandler; import forestry.api.genetics.IAlleleRegistry; @@ -32,10 +36,9 @@ import forestry.api.genetics.IFruitFamily; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.genetics.Classification; import forestry.core.genetics.ItemResearchNote.EnumNoteType; -import net.minecraft.item.ItemStack; public class AlleleRegistry implements IAlleleRegistry { @@ -291,11 +294,11 @@ public class AlleleRegistry implements IAlleleRegistry { /* RESEARCH */ @Override public ItemStack getSpeciesNoteStack(GameProfile researcher, IAlleleSpecies species) { - return EnumNoteType.createSpeciesNoteStack(PluginCore.getItems().researchNote, researcher, species); + return EnumNoteType.createSpeciesNoteStack(ModuleCore.getItems().researchNote, researcher, species); } @Override public ItemStack getMutationNoteStack(GameProfile researcher, IMutation mutation) { - return EnumNoteType.createMutationNoteStack(PluginCore.getItems().researchNote, researcher, mutation); + return EnumNoteType.createMutationNoteStack(ModuleCore.getItems().researchNote, researcher, mutation); } } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java index f2a410ce4..88b13b12b 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java @@ -15,7 +15,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; @@ -26,16 +33,13 @@ import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.items.ItemRegistryApiculture; +import forestry.core.config.Constants; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Translator; -import forestry.plugins.ForestryPluginUids; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; +import forestry.modules.ForestryModuleUids; public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuilder, IAlleleSpecies { private final String binomial; @@ -78,8 +82,8 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuil return 0f; } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - ItemRegistryApiculture beeItems = PluginApiculture.getItems(); + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { + ItemRegistryApiculture beeItems = ModuleApiculture.getItems(); Item item = itemstack.getItem(); if (beeItems.honeyDrop == item) { return 0.5f; diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java index c95eeff8c..93c230adc 100755 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java @@ -17,6 +17,7 @@ import net.minecraft.inventory.IContainerListener; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.IFluidTank; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/forestry/core/gui/Drawable.java b/src/main/java/forestry/core/gui/Drawable.java new file mode 100644 index 000000000..2b24c3c00 --- /dev/null +++ b/src/main/java/forestry/core/gui/Drawable.java @@ -0,0 +1,56 @@ +package forestry.core.gui; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class Drawable { + public final int u; + public final int v; + public final int width; + public final int height; + + public final ResourceLocation textureLocation; + public int textureWidth = 256; + public int textureHeight = 256; + + public Drawable(ResourceLocation textureLocation, int u, int v, int width, int height) { + this.textureLocation = textureLocation; + this.u = u; + this.v = v; + this.width = width; + this.height = height; + } + + public Drawable(ResourceLocation textureLocation, int u, int v, int width, int height, int textureWidth, int textureHeight) { + this.u = u; + this.v = v; + this.width = width; + this.height = height; + this.textureLocation = textureLocation; + this.textureWidth = textureWidth; + this.textureHeight = textureHeight; + } + + public Drawable setTextureSize(int textureWidth, int textureHeight) { + this.textureWidth = textureWidth; + this.textureHeight = textureHeight; + return this; + } + + public void draw(int xOffset, int yOffset) { + TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); + textureManager.bindTexture(textureLocation); + + // Enable correct lighting. + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + + Gui.drawModalRectWithCustomSizedTexture(xOffset, yOffset, u, v, width, height, textureWidth, textureHeight); + } +} diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index 8c8c404d0..0397b3d2b 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -214,11 +214,9 @@ public abstract class GuiForestry extends GuiContainer { @Override protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { - bindTexture(textureFile); + drawBackground(); - int x = (width - xSize) / 2; - int y = (height - ySize) / 2; - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + widgetManager.updateWidgets(mouseX - guiLeft, mouseY - guiTop); RenderHelper.enableGUIStandardItemLighting(); GlStateManager.disableLighting(); @@ -234,6 +232,14 @@ public abstract class GuiForestry extends GuiContainer { bindTexture(textureFile); } + protected void drawBackground(){ + bindTexture(textureFile); + + int x = (width - xSize) / 2; + int y = (height - ySize) / 2; + drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + } + protected void drawWidgets() { ledgerManager.drawLedgers(); widgetManager.drawWidgets(); @@ -275,4 +281,8 @@ public abstract class GuiForestry extends GuiContainer { public List getExtraGuiAreas() { return ledgerManager.getLedgerAreas(); } + + public TextLayoutHelper getTextLayout() { + return textLayout; + } } diff --git a/src/main/java/forestry/core/gui/GuiIdRegistry.java b/src/main/java/forestry/core/gui/GuiIdRegistry.java index edf8a6811..a52da4b77 100644 --- a/src/main/java/forestry/core/gui/GuiIdRegistry.java +++ b/src/main/java/forestry/core/gui/GuiIdRegistry.java @@ -28,6 +28,7 @@ import forestry.apiculture.tiles.TileBeeHouse; import forestry.core.items.ItemAlyzer; import forestry.core.items.ItemSolderingIron; import forestry.core.tiles.TileAnalyzer; +import forestry.database.tiles.TileDatabase; import forestry.core.tiles.TileEscritoire; import forestry.core.tiles.TileNaturalistChest; import forestry.energy.tiles.TileEngineBiogas; @@ -76,6 +77,8 @@ public class GuiIdRegistry { TileRaintank.class, TileWorktable.class, + TileDatabase.class, + TileBottler.class, TileCarpenter.class, TileCentrifuge.class, @@ -88,7 +91,7 @@ public class GuiIdRegistry { TileFarm.class, TileGreenhouse.class, - TileClimatiser.class, + TileClimatiser.class, TileHygroregulator.class, TileEngineBiogas.class, diff --git a/src/main/java/forestry/core/gui/GuiUtil.java b/src/main/java/forestry/core/gui/GuiUtil.java index acb88a07d..7e89b8c43 100755 --- a/src/main/java/forestry/core/gui/GuiUtil.java +++ b/src/main/java/forestry/core/gui/GuiUtil.java @@ -30,12 +30,16 @@ import forestry.core.gui.tooltips.ToolTip; @SideOnly(Side.CLIENT) public class GuiUtil { public static void drawItemStack(GuiForestry gui, ItemStack stack, int xPos, int yPos) { + drawItemStack(gui.getFontRenderer(), stack, xPos, yPos); + } + + public static void drawItemStack(FontRenderer fontRenderer, ItemStack stack, int xPos, int yPos) { FontRenderer font = null; if (!stack.isEmpty()) { font = stack.getItem().getFontRenderer(stack); } if (font == null) { - font = gui.getFontRenderer(); + font = fontRenderer; } RenderItem itemRender = Minecraft.getMinecraft().getRenderItem(); diff --git a/src/main/java/forestry/core/gui/TextLayoutHelper.java b/src/main/java/forestry/core/gui/TextLayoutHelper.java index 4ff73ee60..a4179bff9 100644 --- a/src/main/java/forestry/core/gui/TextLayoutHelper.java +++ b/src/main/java/forestry/core/gui/TextLayoutHelper.java @@ -10,11 +10,13 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.core.render.ColourProperties; import net.minecraft.client.renderer.GlStateManager; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.render.ColourProperties; + @SideOnly(Side.CLIENT) public class TextLayoutHelper { private static final int LINE_HEIGHT = 12; @@ -37,8 +39,11 @@ public class TextLayoutHelper { GlStateManager.pushMatrix(); } - public void startPage(int column0, int column1, int column2) { + public void startPage(int column0, int column1) { + startPage(column0, column1, 0); + } + public void startPage(int column0, int column1, int column2) { this.column0 = column0; this.column1 = column1; this.column2 = column2; @@ -85,11 +90,19 @@ public class TextLayoutHelper { } public void drawCenteredLine(String text, int x, int width, int color) { - guiForestry.getFontRenderer().drawString(text, guiForestry.getGuiLeft() + x + getCenteredOffset(text, width), guiForestry.getGuiTop() + line, color); + drawCenteredLine(text, x, 0, width, color); + } + + public void drawCenteredLine(String text, int x, int y, int width, int color) { + guiForestry.getFontRenderer().drawString(text, guiForestry.getGuiLeft() + x + getCenteredOffset(text, width), guiForestry.getGuiTop() + y + line, color); } public void drawLine(String text, int x, int color) { - guiForestry.getFontRenderer().drawString(text, guiForestry.getGuiLeft() + x, guiForestry.getGuiTop() + line, color); + drawLine(text, x, 0, color); + } + + public void drawLine(String text, int x, int y, int color) { + guiForestry.getFontRenderer().drawString(text, guiForestry.getGuiLeft() + x, guiForestry.getGuiTop() + y + line, color); } public void drawSplitLine(String text, int x, int maxWidth, int color) { diff --git a/src/main/java/forestry/core/gui/buttons/StandardButtonTextureSets.java b/src/main/java/forestry/core/gui/buttons/StandardButtonTextureSets.java index d4dbfa439..d9c74488b 100755 --- a/src/main/java/forestry/core/gui/buttons/StandardButtonTextureSets.java +++ b/src/main/java/forestry/core/gui/buttons/StandardButtonTextureSets.java @@ -19,6 +19,11 @@ public enum StandardButtonTextureSets implements IButtonTextureSet { SMALL_BUTTON(0, 80, 15, 200), LOCKED_BUTTON(224, 0, 16, 16), UNLOCKED_BUTTON(240, 0, 16, 16), + SMALL_BLANK_BUTTON(208, 48, 16, 16), + ARROW_DOWN_BUTTON(224, 48, 16, 16), + ARROW_UP_BUTTON(240, 48, 16, 16), + DOWN_BUTTON(224, 96, 10, 16), + UP_BUTTON(240, 96, 10, 16), LEFT_BUTTON(204, 0, 16, 10), RIGHT_BUTTON(214, 0, 16, 10), LEFT_BUTTON_SMALL(238, 220, 12, 9), diff --git a/src/main/java/forestry/core/gui/elements/GuiElement.java b/src/main/java/forestry/core/gui/elements/GuiElement.java new file mode 100644 index 000000000..e72f63ed9 --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElement.java @@ -0,0 +1,71 @@ +package forestry.core.gui.elements; + +import javax.annotation.Nullable; + +import net.minecraft.client.gui.Gui; + +import forestry.api.core.IGuiElement; + +public abstract class GuiElement extends Gui implements IGuiElement { + protected final int xPos; + protected final int yPos; + protected int xOffset = 0; + protected int yOffset = 0; + protected int width; + protected int height; + + public GuiElement(int xPos, int yPos, int width, int height) { + this.xPos = xPos; + this.yPos = yPos; + this.width = width; + this.height = height; + } + + @Override + public int getX() { + return xPos + xOffset; + } + + @Override + public int getY() { + return yPos + yOffset; + } + + @Override + public int getWidth() { + return width; + } + + @Override + public int getHeight() { + return height; + } + + @Override + public void setXOffset(int xOffset) { + this.xOffset = xOffset; + } + + @Override + public void setYOffset(int yOffset) { + this.yOffset = yOffset; + } + + @Override + public boolean isMouseOver(int mouseX, int mouseY) { + int xPos = getX(); + int yPos = getY(); + return mouseX >= xPos && mouseX <= xPos + getWidth() && mouseY >= yPos && mouseY <= yPos + getHeight(); + } + + @Nullable + @Override + public IGuiElement getParent() { + return null; + } + + @Override + public void setParent(@Nullable IGuiElement parent) { + + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementDrawable.java b/src/main/java/forestry/core/gui/elements/GuiElementDrawable.java new file mode 100644 index 000000000..8f9d03b14 --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementDrawable.java @@ -0,0 +1,17 @@ +package forestry.core.gui.elements; + +import forestry.core.gui.Drawable; + +public class GuiElementDrawable extends GuiElement { + private final Drawable drawable; + + public GuiElementDrawable(int xPos, int yPos, Drawable drawable) { + super(xPos, yPos, drawable.width, drawable.height); + this.drawable = drawable; + } + + @Override + public void draw(int startX, int startY) { + drawable.draw(getX() + startX, getY() + startY); + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementFactory.java b/src/main/java/forestry/core/gui/elements/GuiElementFactory.java new file mode 100644 index 000000000..06a6d6125 --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementFactory.java @@ -0,0 +1,273 @@ +package forestry.core.gui.elements; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import forestry.api.core.IGuiElement; +import forestry.api.core.IGuiElementFactory; +import forestry.api.core.IGuiElementHelper; +import forestry.api.core.IGuiElementLayout; +import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IAlyzerPlugin; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesPlugin; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.config.Constants; +import forestry.core.genetics.mutations.EnumMutateChance; +import forestry.core.gui.Drawable; +import forestry.core.render.ColourProperties; + +public class GuiElementFactory implements IGuiElementFactory { + public static final ResourceLocation TEXTURE = new ResourceLocation(Constants.MOD_ID, Constants.TEXTURE_PATH_GUI + "/database_mutation_screen.png"); + + public static final Drawable QUESTION_MARK = new Drawable(TEXTURE, 78, 240, 16, 16); + public static final Drawable DOWN_SYMBOL = new Drawable(TEXTURE, 0, 247, 15, 9); + public static final Drawable UP_SYMBOL = new Drawable(TEXTURE, 15, 247, 15, 9); + public static final Drawable BOOTH_SYMBOL = new Drawable(TEXTURE, 30, 247, 15, 9); + public static final Drawable NONE_SYMBOL = new Drawable(TEXTURE, 45, 247, 15, 9); + + public static final GuiElementFactory INSTANCE = new GuiElementFactory(); + + private GuiElementFactory() { + } + + + @Override + public IGuiElementHelper createHelper(IGuiElementLayout element) { + return new GuiElementHelper(element); + } + + @Override + public IGuiElementLayout createVertical(int xPos, int yPos, int width) { + return new GuiElementVertical(xPos, yPos, width); + } + + @Override + public IGuiElementLayout createHorizontal(int xPos, int yPos, int height) { + return new GuiElementHorizontal(xPos, yPos, height); + } + + @Override + public IGuiElementLayout createPanel(int xPos, int yPos, int width, int height) { + return new GuiElementPanel(xPos, yPos, width, height); + } + + public final int getColorCoding(boolean dominant) { + if (dominant) { + return ColourProperties.INSTANCE.get("gui.beealyzer.dominant"); + } else { + return ColourProperties.INSTANCE.get("gui.beealyzer.recessive"); + } + } + + public IGuiElement createFertilityInfo(IAlleleInteger fertilityAllele, int x, int texOffset) { + String fertilityString = Integer.toString(fertilityAllele.getValue()) + " x"; + + IGuiElementLayout layout = createHorizontal(x, 0, 0).setDistance(2); + layout.addElement(new GuiElementText(0, 0, 12, fertilityString, getColorCoding(fertilityAllele.isDominant()))); + layout.addElement(new GuiElementDrawable(0, -1, new Drawable(TEXTURE, 60, 240 + texOffset, 12, 8))); + return layout; + } + + public IGuiElement createToleranceInfo(IAlleleTolerance toleranceAllele, IAlleleSpecies species, String text){ + IGuiElementLayout layout = createHorizontal(0, 0, 0).setDistance(0); + layout.addElement(new GuiElementText(0, 0, 12, text, getColorCoding(species.isDominant()))); + layout.addElement(createToleranceInfo(toleranceAllele, 0)); + return layout; + } + + private IGuiElementLayout createToleranceInfo(IAlleleTolerance toleranceAllele, int x) { + int textColor = getColorCoding(toleranceAllele.isDominant()); + EnumTolerance tolerance = toleranceAllele.getValue(); + String text = "(" + toleranceAllele.getAlleleName() + ")"; + + IGuiElementLayout layout = createHorizontal(x, 0, 0).setDistance(2); + + switch (tolerance) { + case BOTH_1: + case BOTH_2: + case BOTH_3: + case BOTH_4: + case BOTH_5: + layout.addElement(createBothSymbol(0, -1)); + layout.addElement(new GuiElementText(0, 0, 12, text, textColor)); + break; + case DOWN_1: + case DOWN_2: + case DOWN_3: + case DOWN_4: + case DOWN_5: + layout.addElement(createDownSymbol(0, -1)); + layout.addElement(new GuiElementText(0, 0, 12, text, textColor)); + break; + case UP_1: + case UP_2: + case UP_3: + case UP_4: + case UP_5: + layout.addElement(createUpSymbol(0, -1)); + layout.addElement(new GuiElementText(0, 0, 12, text, textColor)); + break; + default: + layout.addElement(createNoneSymbol(0, -1)); + layout.addElement(new GuiElementText(0, 0, 12, "(0)", textColor)); + break; + } + return layout; + } + + public IGuiElementLayout createMutationResultant(int x, int y, int width, int height, IMutation mutation, IBreedingTracker breedingTracker){ + if (breedingTracker.isDiscovered(mutation)) { + IGuiElementLayout element = new GuiElementPanel(x, y, width, height); + IAlyzerPlugin plugin = mutation.getRoot().getAlyzerPlugin(); + Map iconStacks = plugin.getIconStacks(); + + ItemStack firstPartner = iconStacks.get(mutation.getAllele0().getUID()); + ItemStack secondPartner = iconStacks.get(mutation.getAllele1().getUID()); + element.addElements(new GuiElementItemStack(0, 0, firstPartner), createProbabilityAdd(mutation, 21, 4), new GuiElementItemStack(33, 0, secondPartner)); + return element; + } + // Do not display secret undiscovered mutations. + if (mutation.isSecret()) { + return null; + } + + return createUnknownMutationGroup(x, y, width, height, mutation); + } + + public IGuiElementLayout createMutation(int x, int y, int width, int height, IMutation mutation, IAllele species, IBreedingTracker breedingTracker){ + if (breedingTracker.isDiscovered(mutation)) { + GuiElementPanel element = new GuiElementPanel(x, y, width, height); + ISpeciesRoot speciesRoot = mutation.getRoot(); + int speciesIndex = speciesRoot.getSpeciesChromosomeType().ordinal(); + ISpeciesPlugin plugin = mutation.getRoot().getSpeciesPlugin(); + Map iconStacks = plugin.getIndividualStacks(); + + ItemStack partner = iconStacks.get(mutation.getPartner(species).getUID()); + IAllele resultAllele = mutation.getTemplate()[speciesIndex]; + ItemStack result = iconStacks.get(resultAllele.getUID()); + element.addElements(new GuiElementItemStack(0, 0, partner), new GuiElementItemStack( 33, 0, result)); + element.addElements(createProbabilityArrow(mutation, 18, 4, breedingTracker)); + return element; + } + // Do not display secret undiscovered mutations. + if (mutation.isSecret()) { + return null; + } + + return createUnknownMutationGroup(x, y, width, height, mutation, breedingTracker); + } + + private static IGuiElementLayout createUnknownMutationGroup(int x, int y, int width, int height, IMutation mutation){ + GuiElementPanel element = new GuiElementPanel(x, y, width, height); + + element.addElements(createQuestionMark(0, 0), createProbabilityAdd(mutation, 21, 4), createQuestionMark( 32, 0)); + return element; + } + + private static IGuiElementLayout createUnknownMutationGroup(int x, int y, int width, int height, IMutation mutation, IBreedingTracker breedingTracker){ + GuiElementPanel element = new GuiElementPanel(x, y, width, height); + + element.addElements(createQuestionMark(0, 0), createQuestionMark( 32, 0)); + element.addElements(createProbabilityArrow(mutation, 18, 4, breedingTracker)); + return element; + } + + private static Collection createProbabilityArrow(IMutation combination, int x, int y, IBreedingTracker breedingTracker) { + float chance = combination.getBaseChance(); + int line = 247; + int column = 100; + switch (EnumMutateChance.rateChance(chance)) { + case HIGHEST: + column = 100; + break; + case HIGHER: + column = 100 + 15; + break; + case HIGH: + column = 100 + 15 * 2; + break; + case NORMAL: + column = 100 + 15 * 3; + break; + case LOW: + column = 100 + 15 * 4; + break; + case LOWEST: + column = 100 + 15 * 5; + default: + break; + } + + List elements = new ArrayList<>(); + // Probability arrow + elements.add(new GuiElementDrawable(x, y, new Drawable(TEXTURE, column, line, 15, 9))); + + boolean researched = breedingTracker.isResearched(combination); + if (researched) { + elements.add(new GuiElementText(x + 9, y + 1, 10, 10, "+")); + } + + return elements; + } + + private static GuiElementDrawable createProbabilityAdd(IMutation mutation, int x, int y) { + float chance = mutation.getBaseChance(); + int line = 247; + int column = 190; + switch (EnumMutateChance.rateChance(chance)) { + case HIGHEST: + column = 190; + break; + case HIGHER: + column = 190 + 9; + break; + case HIGH: + column = 190 + 9 * 2; + break; + case NORMAL: + column = 190 + 9 * 3; + break; + case LOW: + column = 190 + 9 * 4; + break; + case LOWEST: + column = 190 + 9 * 5; + default: + break; + } + + // Probability add + return new GuiElementDrawable(x, y, new Drawable(TEXTURE, column, line, 9, 9)); + } + + private static GuiElementDrawable createQuestionMark(int x, int y) { + return new GuiElementDrawable(x, y, QUESTION_MARK); + } + + private static GuiElementDrawable createDownSymbol(int x, int y) { + return new GuiElementDrawable(x, y, DOWN_SYMBOL); + } + + private static GuiElementDrawable createUpSymbol(int x, int y) { + return new GuiElementDrawable(x, y, UP_SYMBOL); + } + + private static GuiElementDrawable createBothSymbol(int x, int y) { + return new GuiElementDrawable(x, y, BOOTH_SYMBOL); + } + + private static GuiElementDrawable createNoneSymbol(int x, int y) { + return new GuiElementDrawable(x, y, NONE_SYMBOL); + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementHelper.java b/src/main/java/forestry/core/gui/elements/GuiElementHelper.java new file mode 100644 index 000000000..97d03a4ae --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementHelper.java @@ -0,0 +1,137 @@ +package forestry.core.gui.elements; + +import java.util.function.Function; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + +import forestry.api.core.GuiElementAlignment; +import forestry.api.core.IGuiElement; +import forestry.api.core.IGuiElementFactory; +import forestry.api.core.IGuiElementHelper; +import forestry.api.core.IGuiElementLayout; +import forestry.api.core.IGuiElementLayoutHelper; +import forestry.api.core.IGuiElementLayoutHelper.LayoutFactory; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.core.render.ColourProperties; + +public class GuiElementHelper implements IGuiElementHelper { + private final IGuiElementLayout parent; + private final int defaultColor; + + public GuiElementHelper(IGuiElementLayout parent) { + this.parent = parent; + this.defaultColor = ColourProperties.INSTANCE.get("gui.screen"); + } + + public GuiElementLayoutHelper layoutHelper(LayoutFactory layoutFactory, int width, int height) { + return new GuiElementLayoutHelper(layoutFactory, width, height, this); + } + + public void add(IGuiElementLayoutHelper groupHelper) { + groupHelper.layouts().forEach(element -> add(element)); + } + + public void add(IGuiElement element) { + parent.addElement(element); + } + + public void addItem(int x, ItemStack itemStack) { + parent.addElement(new GuiElementItemStack(x, 0, itemStack)); + } + + @Override + public final void addAllele(String chromosomeName, IIndividual individual, IChromosomeType chromosome, boolean active) { + addAllele(chromosomeName, allele -> allele.getAlleleName(), individual, chromosome, active); + } + + @Override + public final void addAllele(String chromosomeName, Function toString, IIndividual individual, IChromosomeType chromosome, boolean active) { + A allele; + if (active) { + allele = (A) individual.getGenome().getActiveAllele(chromosome); + } else { + allele = (A) individual.getGenome().getInactiveAllele(chromosome); + } + addText(TextFormatting.UNDERLINE + chromosomeName, GuiElementAlignment.CENTER); + addText(toString.apply(allele), GuiElementAlignment.CENTER, factory().getColorCoding(allele.isDominant())); + } + + @Override + public void addMutation(int x, int y, int width, int height, IMutation mutation, IAllele species, IBreedingTracker breedingTracker) { + IGuiElement element = factory().createMutation(x, y, width, height, mutation, species, breedingTracker); + if(element == null){ + return; + } + add(element); + } + + @Override + public void addMutationResultant(int x, int y, int width, int height, IMutation mutation, IBreedingTracker breedingTracker) { + IGuiElement element = factory().createMutationResultant(x, y, width, height, mutation, breedingTracker); + if(element == null){ + return; + } + add(element); + } + + public void addFertilityInfo(IAlleleInteger fertilityAllele, int x, int texOffset) { + add(centerElement(factory().createFertilityInfo(fertilityAllele, x, texOffset))); + } + + public void addToleranceInfo(IAlleleTolerance toleranceAllele, IAlleleSpecies species, String text){ + add(centerElement(factory().createToleranceInfo(toleranceAllele, species, text))); + } + + public void addText(String text) { + addText(0, text, defaultColor); + } + + public void addText(String text, int color) { + addText(0, text, color); + } + + @Override + public void addText(String text, GuiElementAlignment align) { + addText(text, align, defaultColor); + } + + public void addText(String text, GuiElementAlignment align, int color) { + addText(0, text, align, color); + } + + public void addText(int x, String text, int color) { + addText(x, text, GuiElementAlignment.LEFT, color); + } + + public void addText(int x, String text, GuiElementAlignment align, int color) { + addText(x, 12, text, align, color); + } + + public void addText(int x, int height, String text, GuiElementAlignment align, int color) { + parent.addElement(new GuiElementText(x, 0, parent.getWidth(), height, text, align, color)); + } + + @Override + public IGuiElement centerElement(IGuiElement element) { + element.setXOffset((parent.getWidth() - element.getWidth()) / 2); + return element; + } + + @Override + public IGuiElementLayout getParent() { + return parent; + } + + @Override + public IGuiElementFactory factory() { + return GuiElementFactory.INSTANCE; + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementHorizontal.java b/src/main/java/forestry/core/gui/elements/GuiElementHorizontal.java new file mode 100644 index 000000000..7a2abbdf8 --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementHorizontal.java @@ -0,0 +1,43 @@ +package forestry.core.gui.elements; + +import forestry.api.core.IGuiElement; +import forestry.api.core.IGuiElementLayout; + +public class GuiElementHorizontal extends GuiElementLayout { + public GuiElementHorizontal(int xPos, int yPos, int height) { + super(xPos, yPos, 0, height); + } + + public void setWidth(int width) { + this.width = width; + } + + public IGuiElementLayout addElement(IGuiElement element) { + elements.add(element); + element.setXOffset(width); + width += element.getWidth() + distance; + return this; + } + + public IGuiElementLayout removeElement(IGuiElement element) { + elements.remove(element); + width -= element.getWidth() + distance; + element.setXOffset(0); + return this; + } + + @Override + public int getHeight() { + if(height > 0){ + return height; + } + int height = 0; + for (IGuiElement element : elements) { + int elementHeight = element.getHeight(); + if (elementHeight > height) { + height = elementHeight; + } + } + return height; + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementItemStack.java b/src/main/java/forestry/core/gui/elements/GuiElementItemStack.java new file mode 100644 index 000000000..fe06595d4 --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementItemStack.java @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.gui.elements; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.core.gui.GuiUtil; + +public class GuiElementItemStack extends GuiElement { + private final ItemStack itemStack; + + public GuiElementItemStack(int xPos, int yPos, ItemStack itemStack) { + super(xPos, yPos, 16, 16); + this.itemStack = itemStack; + } + + @Override + public void draw(int startX, int startY) { + if (!itemStack.isEmpty()) { + GuiUtil.drawItemStack(Minecraft.getMinecraft().fontRenderer, itemStack, getX() + startX, getY() + startY); + } + } + + @SideOnly(Side.CLIENT) + @Override + public List getToolTip(int mouseX, int mouseY) { + Minecraft minecraft = Minecraft.getMinecraft(); + EntityPlayer player = minecraft.player; + List tip = new ArrayList<>(); + if (!itemStack.isEmpty()) { + tip.addAll(itemStack.getTooltip(player, minecraft.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL)); + } + return tip; + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementLayout.java b/src/main/java/forestry/core/gui/elements/GuiElementLayout.java new file mode 100644 index 000000000..f38c52536 --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementLayout.java @@ -0,0 +1,70 @@ +package forestry.core.gui.elements; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import forestry.api.core.IGuiElement; +import forestry.api.core.IGuiElementLayout; + +public abstract class GuiElementLayout extends GuiElement implements IGuiElementLayout { + protected final List elements = new ArrayList<>(); + protected final List tooltip = new ArrayList<>(); + + /* The distance between the different elements of this group. */ + public int distance; + + public GuiElementLayout(int xPos, int yPos, int width, int height) { + super(xPos, yPos, width, height); + } + + public GuiElementLayout setDistance(int distance) { + this.distance = distance; + return this; + } + + public void addTooltip(String line){ + tooltip.add(line); + } + + public List getTooltip() { + return tooltip; + } + + @Override + public int getDistance() { + return distance; + } + + public List getElements() { + return elements; + } + + @Override + public int getSize() { + return elements.size(); + } + + @Override + public void draw(int startX, int startY) { + elements.forEach(element -> element.draw(startX + getX(), startY + getY())); + } + + @Override + public List getToolTip(int mouseX, int mouseY) { + mouseX -= getX(); + mouseY -= getY(); + for (IGuiElement element : elements) { + if (element.isMouseOver(mouseX, mouseY)) { + List toolTip = element.getToolTip(mouseX, mouseY); + if (!toolTip.isEmpty()) { + return toolTip; + } + } + } + if(!tooltip.isEmpty()){ + return tooltip; + } + return Collections.emptyList(); + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementLayoutHelper.java b/src/main/java/forestry/core/gui/elements/GuiElementLayoutHelper.java new file mode 100644 index 000000000..b97948dab --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementLayoutHelper.java @@ -0,0 +1,87 @@ +package forestry.core.gui.elements; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import forestry.api.core.IGuiElement; +import forestry.api.core.IGuiElementHelper; +import forestry.api.core.IGuiElementLayout; +import forestry.api.core.IGuiElementLayoutHelper; + +public class GuiElementLayoutHelper implements IGuiElementLayoutHelper { + private final List layouts = new ArrayList<>(); + private final LayoutFactory layoutFactory; + private final int width; + private final int height; + private final IGuiElementHelper parent; + private int xOffset; + private int yOffset; + private IGuiElementLayout currentLayout; + private boolean horizontal; + + public GuiElementLayoutHelper(LayoutFactory layoutFactory, int width, int height, IGuiElementHelper parent) { + this.layoutFactory = layoutFactory; + this.width = width; + this.height = height; + this.parent = parent; + } + + /** + * @return Only false if the helper has no space to add this element. + */ + public boolean add(IGuiElement element) { + if (currentLayout == null) { + layouts.add(currentLayout = layoutFactory.createLayout(0, 0)); + this.horizontal = currentLayout instanceof GuiElementVertical; + } + int groupWidth = currentLayout.getWidth(); + int groupHeight = currentLayout.getHeight(); + int eleWidth = element.getX() + element.getWidth(); + int eleHeight = element.getY() + element.getHeight(); + if (horizontal) { + if (yOffset >= height) { + if (width != 0 && xOffset > width) { + return false; + } + xOffset += currentLayout.getWidth(); + layouts.add(currentLayout = layoutFactory.createLayout(0, 0)); + groupHeight = currentLayout.getHeight(); + } + groupHeight += eleHeight; + yOffset = groupHeight; + } else { + if (xOffset >= width) { + if (height != 0 && yOffset > height) { + return false; + } + yOffset += currentLayout.getHeight(); + layouts.add(currentLayout = layoutFactory.createLayout(0, 0)); + groupWidth = currentLayout.getWidth(); + } + groupWidth += eleWidth; + xOffset = groupWidth; + } + currentLayout.addElement(element); + return true; + } + + @Override + public void finish() { + for (IGuiElement element : layouts) { + parent.add(element); + } + clear(); + } + + public void clear() { + layouts.clear(); + currentLayout = null; + xOffset = 0; + yOffset = 0; + } + + public Collection layouts() { + return layouts; + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementPanel.java b/src/main/java/forestry/core/gui/elements/GuiElementPanel.java new file mode 100644 index 000000000..141752092 --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementPanel.java @@ -0,0 +1,50 @@ +package forestry.core.gui.elements; + +import forestry.api.core.IGuiElement; +import forestry.api.core.IGuiElementLayout; + +public class GuiElementPanel extends GuiElementLayout { + public GuiElementPanel(int xPos, int yPos, int width, int height) { + super(xPos, yPos, width, height); + } + + public IGuiElementLayout addElement(IGuiElement element) { + elements.add(element); + return this; + } + + public IGuiElementLayout removeElement(IGuiElement element) { + elements.remove(element); + return this; + } + + @Override + public int getWidth() { + if(width > 0){ + return width; + } + int width = 0; + for (IGuiElement element : elements) { + int elementWidth = element.getWidth(); + if (elementWidth > width) { + width = elementWidth; + } + } + return width; + } + + @Override + public int getHeight() { + if(height > 0){ + return height; + } + int height = 0; + for (IGuiElement element : elements) { + int elementHeight = element.getHeight(); + if (elementHeight > height) { + height = elementHeight; + } + } + return height; + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementScrollable.java b/src/main/java/forestry/core/gui/elements/GuiElementScrollable.java new file mode 100644 index 000000000..fb6bf972d --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementScrollable.java @@ -0,0 +1,94 @@ +package forestry.core.gui.elements; + +import com.google.common.collect.Lists; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import forestry.api.core.IGuiElement; +import forestry.core.gui.widgets.IScrollable; + +public class GuiElementScrollable extends GuiElementVertical implements IScrollable { + protected final List visibleElements = new ArrayList<>(); + protected final int sizeX; + protected int elementOffset; + + public GuiElementScrollable(int xPos, int yPos, int width, int height) { + super(xPos, yPos, width); + this.sizeX = height; + } + + public void updateVisibleElements(int offset) { + visibleElements.clear(); + int height = 0; + int widgetEnd = yPos + sizeX; + for (int i = 0; i < elements.size(); i++) { + IGuiElement element = elements.get(i); + if (i < offset) { + height += element.getHeight(); + continue; + } + elementOffset = -height; + int elementHeight = element.getY() + element.getHeight() + elementOffset; + if (elementHeight > widgetEnd) { + continue; + } + visibleElements.add(element); + } + } + + public int getInvisibleElementCount() { + int count = 0; + int widgetEnd = yPos + sizeX; + for (int i = 0; i < elements.size(); i++) { + IGuiElement element = elements.get(i); + int elementHeight = element.getY() + element.getHeight(); + if (elementHeight > widgetEnd) { + count++; + } + } + return count; + } + + @Override + public void draw(int startX, int startY) { + for (IGuiElement element : visibleElements) { + element.draw(startX + getX(), startY + getY() + elementOffset); + } + } + + @Override + public List getToolTip(int mouseX, int mouseY) { + mouseY -= getY() + elementOffset; + mouseX -= getX(); + for (IGuiElement element : visibleElements) { + if (element.isMouseOver(mouseX, mouseY)) { + List toolTip = element.getToolTip(mouseX, mouseY); + if (!toolTip.isEmpty()) { + return toolTip; + } + } + } + return Collections.emptyList(); + } + + @Override + public void onScroll(int value) { + updateVisibleElements(value); + } + + public void clear() { + removeElements(Lists.newArrayList(elements)); + } + + @Override + public boolean isFocused(int mouseX, int mouseY) { + return isMouseOver(mouseX, mouseY); + } + + @Override + public int getHeight() { + return sizeX; + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementText.java b/src/main/java/forestry/core/gui/elements/GuiElementText.java new file mode 100644 index 000000000..d15f12f03 --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementText.java @@ -0,0 +1,68 @@ +package forestry.core.gui.elements; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.GlStateManager; + +import forestry.api.core.GuiElementAlignment; +import forestry.core.render.ColourProperties; + +public class GuiElementText extends GuiElement { + public static final FontRenderer FONT_RENDERER = Minecraft.getMinecraft().fontRenderer; + + protected final String text; + protected final int color; + protected final GuiElementAlignment align; + + public GuiElementText(int xPos, int yPos, int height, String text) { + this(xPos, yPos, FONT_RENDERER.getStringWidth(text), height, text, GuiElementAlignment.LEFT); + } + + public GuiElementText(int xPos, int yPos, int height, String text, int color) { + this(xPos, yPos, FONT_RENDERER.getStringWidth(text), height, text, GuiElementAlignment.LEFT, color); + } + + public GuiElementText(int xPos, int yPos, int width, int height, String text) { + this(xPos, yPos, width, height, text, GuiElementAlignment.LEFT); + } + + public GuiElementText(int xPos, int yPos, int width, int height, String text, GuiElementAlignment align) { + this(xPos, yPos, width, height, text, align, ColourProperties.INSTANCE.get("gui.screen")); + } + + public GuiElementText(String text, GuiElementAlignment align, int color) { + this(0, 0, FONT_RENDERER.getStringWidth(text), 12, text, align, color); + } + + public GuiElementText(int xPos, int yPos, int width, int height, String text, int color) { + this(xPos, yPos, width, height, text, GuiElementAlignment.LEFT, color); + } + + public GuiElementText(int xPos, int yPos, int width, int height, String text, GuiElementAlignment align, int color) { + super(xPos, yPos, width, height); + this.text = text; + this.align = align; + this.color = color; + } + + public String getText() { + return text; + } + + @Override + public void draw(int startX, int startY) { + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + FONT_RENDERER.drawString(text, getX() + getOffset() + startX, getY() + startY, color); + } + + public int getOffset() { + switch (align) { + case RIGHT: + return width - FONT_RENDERER.getStringWidth(text); + case CENTER: + return (width - FONT_RENDERER.getStringWidth(text)) / 2; + default: + return 0; + } + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementVertical.java b/src/main/java/forestry/core/gui/elements/GuiElementVertical.java new file mode 100644 index 000000000..ccd97d356 --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementVertical.java @@ -0,0 +1,43 @@ +package forestry.core.gui.elements; + +import forestry.api.core.IGuiElement; +import forestry.api.core.IGuiElementLayout; + +public class GuiElementVertical extends GuiElementLayout { + public GuiElementVertical(int xPos, int yPos, int width) { + super(xPos, yPos, width, 0); + } + + public void setHeight(int height) { + this.height = height; + } + + public IGuiElementLayout addElement(IGuiElement element) { + elements.add(element); + element.setYOffset(height); + height += element.getHeight() + distance; + return this; + } + + public IGuiElementLayout removeElement(IGuiElement element) { + elements.remove(element); + height -= element.getHeight() + distance; + element.setYOffset(0); + return this; + } + + @Override + public int getWidth() { + if(width > 0){ + return width; + } + int width = 0; + for (IGuiElement element : elements) { + int elementWidth = element.getWidth(); + if (elementWidth > width) { + width = elementWidth; + } + } + return width; + } +} diff --git a/src/main/java/forestry/core/gui/elements/GuiElementWrapped.java b/src/main/java/forestry/core/gui/elements/GuiElementWrapped.java new file mode 100644 index 000000000..77ddf8b50 --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/GuiElementWrapped.java @@ -0,0 +1,49 @@ +package forestry.core.gui.elements; + +import java.util.List; + +import forestry.api.core.GuiElementAlignment; +import forestry.api.core.IGuiElement; + +public class GuiElementWrapped extends GuiElement { + private final IGuiElement element; + private final GuiElementAlignment align; + + public GuiElementWrapped(int xPos, int yPos, int width, int height, IGuiElement element, GuiElementAlignment align) { + super(xPos, yPos, width, height); + this.element = element; + this.align = align; + } + + @Override + public void draw(int startX, int startY) { + + } + + @Override + public List getToolTip(int mouseX, int mouseY) { + return null; + } + + public int getXOffset() { + switch (align) { + case RIGHT: + return getWidth() - element.getWidth(); + case CENTER: + return (getWidth() - element.getWidth()) / 2; + default: + return 0; + } + } + + public int getYOffset() { + switch (align) { + case RIGHT: + return getHeight() - element.getHeight(); + case CENTER: + return (getHeight() - element.getHeight()) / 2; + default: + return 0; + } + } +} diff --git a/src/main/java/forestry/core/gui/elements/package-info.java b/src/main/java/forestry/core/gui/elements/package-info.java new file mode 100644 index 000000000..c77b673aa --- /dev/null +++ b/src/main/java/forestry/core/gui/elements/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.core.gui.elements; + +import javax.annotation.ParametersAreNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/core/gui/widgets/IScrollable.java b/src/main/java/forestry/core/gui/widgets/IScrollable.java new file mode 100644 index 000000000..2e23d912d --- /dev/null +++ b/src/main/java/forestry/core/gui/widgets/IScrollable.java @@ -0,0 +1,12 @@ +package forestry.core.gui.widgets; + +public interface IScrollable { + + void onScroll(int value); + + /** + * @param mouseX the mouse x position relative to the screen + * @param mouseY the mouse y position relative to the screen + */ + boolean isFocused(int mouseX, int mouseY); +} diff --git a/src/main/java/forestry/core/gui/widgets/Widget.java b/src/main/java/forestry/core/gui/widgets/Widget.java index 49f8c3a04..0251e8f3f 100755 --- a/src/main/java/forestry/core/gui/widgets/Widget.java +++ b/src/main/java/forestry/core/gui/widgets/Widget.java @@ -11,6 +11,7 @@ package forestry.core.gui.widgets; import javax.annotation.Nullable; +import java.awt.Rectangle; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -43,8 +44,16 @@ public abstract class Widget implements IToolTipProvider { return height; } + public Rectangle getRectangle(int startX, int startY){ + return new Rectangle(startX + xPos, startY + yPos, width, height); + } + public abstract void draw(int startX, int startY); + public void update(int mouseX, int mouseY){ + + } + @Nullable @Override public ToolTip getToolTip(int mouseX, int mouseY) { diff --git a/src/main/java/forestry/core/gui/widgets/WidgetElementProvider.java b/src/main/java/forestry/core/gui/widgets/WidgetElementProvider.java new file mode 100644 index 000000000..f8c38444c --- /dev/null +++ b/src/main/java/forestry/core/gui/widgets/WidgetElementProvider.java @@ -0,0 +1,50 @@ +package forestry.core.gui.widgets; + +import javax.annotation.Nullable; + +import java.util.List; + +import forestry.core.gui.elements.GuiElementScrollable; +import forestry.core.gui.tooltips.ToolTip; + +public class WidgetElementProvider extends Widget implements IScrollable{ + protected GuiElementScrollable scrollable; + + public WidgetElementProvider(WidgetManager manager, int xPos, int yPos, int width, int height, GuiElementScrollable scrollable) { + super(manager, xPos, yPos); + this.scrollable = scrollable; + this.width = width; + this.height = height; + } + + @Override + public void draw(int startX, int startY) { + scrollable.draw(startX + xPos, startY + yPos); + } + + @Nullable + @Override + public ToolTip getToolTip(int mouseX, int mouseY) { + mouseX-=xPos; + mouseY-=yPos; + List tooltip = scrollable.getToolTip(mouseX, mouseY); + if(tooltip.isEmpty()){ + return null; + } + ToolTip toolTip = new ToolTip(); + toolTip.add(tooltip); + return toolTip; + } + + @Override + public boolean isFocused(int mouseX, int mouseY) { + mouseX-=xPos; + mouseY-=yPos; + return scrollable.isFocused(mouseX, mouseY); + } + + @Override + public void onScroll(int value) { + scrollable.onScroll(value); + } +} diff --git a/src/main/java/forestry/core/gui/widgets/WidgetManager.java b/src/main/java/forestry/core/gui/widgets/WidgetManager.java index 29fe24cd2..731a44708 100644 --- a/src/main/java/forestry/core/gui/widgets/WidgetManager.java +++ b/src/main/java/forestry/core/gui/widgets/WidgetManager.java @@ -14,11 +14,13 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import forestry.core.gui.GuiForestry; import net.minecraft.client.Minecraft; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.gui.GuiForestry; + @SideOnly(Side.CLIENT) public class WidgetManager { @@ -64,6 +66,12 @@ public class WidgetManager { } } + public void updateWidgets(int mouseX, int mouseY) { + for (Widget slot : widgets) { + slot.update(mouseX, mouseY); + } + } + public void handleMouseClicked(int mouseX, int mouseY, int mouseButton) { Widget slot = getAtPosition(mouseX - gui.getGuiLeft(), mouseY - gui.getGuiTop()); if (slot != null) { @@ -74,7 +82,7 @@ public class WidgetManager { public boolean handleMouseRelease(int mouseX, int mouseY, int eventType) { boolean hasToStop = false; for (Widget slot : widgets) { - hasToStop|=slot.handleMouseRelease(mouseX, mouseY, eventType); + hasToStop|=slot.handleMouseRelease(mouseX- gui.getGuiLeft(), mouseY - gui.getGuiTop(), eventType); } return hasToStop; } diff --git a/src/main/java/forestry/core/gui/widgets/WidgetScrollBar.java b/src/main/java/forestry/core/gui/widgets/WidgetScrollBar.java new file mode 100644 index 000000000..182734985 --- /dev/null +++ b/src/main/java/forestry/core/gui/widgets/WidgetScrollBar.java @@ -0,0 +1,172 @@ +package forestry.core.gui.widgets; + +import java.util.Optional; + +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.util.math.MathHelper; + +import org.lwjgl.input.Mouse; + +import forestry.core.gui.Drawable; + +public class WidgetScrollBar extends Widget { + private Optional background; + private WidgetSlider slider; + private boolean visible; + + private int minValue; + private int maxValue; + private int step; + + private int currentValue; + private IScrollable listener; + + private boolean isScrolling; + private boolean wasClicked; + + private int initialMouseClickY; + + public WidgetScrollBar(WidgetManager manager, int xPos, int yPos, int width, int height, Drawable sliderTexture) { + super(manager, xPos, yPos); + + this.background = Optional.empty(); + this.width = width; + this.height = height; + + isScrolling = false; + wasClicked = false; + visible = true; + slider = new WidgetSlider(manager, xPos, yPos, sliderTexture); + } + + public WidgetScrollBar(WidgetManager manager, int xPos, int yPos, Drawable backgroundTexture, boolean hasBorder, Drawable sliderTexture) { + super(manager, xPos, yPos); + + int offset = hasBorder ? 1 : 0; + + this.background = Optional.of(backgroundTexture); + this.width = backgroundTexture.width; + this.height = backgroundTexture.height; + + isScrolling = false; + wasClicked = false; + visible = true; + slider = new WidgetSlider(manager, xPos + offset, yPos + offset, sliderTexture); + } + + public void setParameters(IScrollable listener, int minValue, int maxValue, int step){ + this.listener = listener; + this.minValue = minValue; + this.maxValue = maxValue; + this.step = step; + + setValue(currentValue); + } + + public void setVisible(boolean visible) { + this.visible = visible; + } + + public boolean isVisible() { + return visible; + } + + public int getValue() { + return MathHelper.clamp(currentValue, minValue, maxValue); + } + + public int setValue(int value) { + currentValue = MathHelper.clamp(value, minValue, maxValue); + if(listener != null){ + listener.onScroll(currentValue); + } + int offset; + if(value >= maxValue){ + offset = height - slider.height; + }else if(value <= minValue){ + offset = 0; + }else{ + offset = (int)(((float)(currentValue - minValue) / (maxValue - minValue)) * (float) (height - slider.height)); + } + slider.setOffset(0, offset); + return currentValue; + } + + @Override + public void draw(int startX, int startY) { + if(!isVisible()) { + return; + } + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + if(background.isPresent()){ + background.get().draw(startX + xPos, startY + yPos); + } + slider.draw(startX, startY); + } + + @Override + public void update(int mouseX, int mouseY) { + if(!isVisible()) { + return; + } + boolean mouseDown = Mouse.isButtonDown(0); + + if(listener == null || listener.isFocused(mouseX, mouseY)) { + int wheel = Mouse.getDWheel(); + if (wheel > 0) { + setValue(currentValue - step); + return; + } else if (wheel < 0) { + setValue(currentValue + step); + return; + } + } + + //the position of the mouse relative to the position of the widget + int y = mouseY - yPos; + + if(!mouseDown && wasClicked){ + wasClicked = false; + } + + //not clicked and scrolling -> stop scrolling + if (!mouseDown && isScrolling) { + this.isScrolling = false; + } + + //clicked on the slider and scrolling + if (this.isScrolling) { + float range = maxValue - minValue; + float value = (float)(y - initialMouseClickY) / (float)(height - slider.height); + value *= range; + if(value < (float) step / 2f){ + setValue(minValue); + }else if(value > maxValue - ((float) step / 2f)){ + setValue(maxValue); + }else { + setValue((int) (minValue + (float) step * Math.round(value))); + } + } + //clicked on the slider + else if(slider.isMouseOver(mouseX, mouseY)){ + if(mouseDown){ + isScrolling = true; + initialMouseClickY = y - slider.getYOffset(); + } + } + //clicked on the bar but not on the slider + else if(mouseDown && !wasClicked && isMouseOver(mouseX, mouseY)){ + float range = maxValue - minValue; + float value = (float)(y - slider.height / 2) / (float)(height - slider.height); + value *= range; + if(value < (float) step / 2f){ + setValue(minValue); + }else if(value > maxValue - ((float) step / 2f)){ + setValue(maxValue); + }else { + setValue((int) (minValue + (float) step * Math.round(value))); + } + wasClicked = true; + } + } +} diff --git a/src/main/java/forestry/core/gui/widgets/WidgetSlider.java b/src/main/java/forestry/core/gui/widgets/WidgetSlider.java new file mode 100644 index 000000000..ee8b0ba62 --- /dev/null +++ b/src/main/java/forestry/core/gui/widgets/WidgetSlider.java @@ -0,0 +1,45 @@ +package forestry.core.gui.widgets; + +import net.minecraft.client.renderer.GlStateManager; + +import forestry.core.gui.Drawable; + +public class WidgetSlider extends Widget { + private final Drawable texture; + + private int xOffset; + private int yOffset; + + public WidgetSlider(WidgetManager manager, int xPos, int yPos, Drawable texture) { + super(manager, xPos, yPos); + this.texture = texture; + this.width = texture.width; + this.height = texture.height; + } + + public void setOffset(int xOffset, int yOffset) { + this.xOffset = xOffset; + this.yOffset = yOffset; + } + + public int getXOffset() { + return xOffset; + } + + public int getYOffset() { + return yOffset; + } + + @Override + public void draw(int startX, int startY) { + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + texture.draw(startX + xPos + xOffset, startY + yPos + yOffset); + } + + @Override + public boolean isMouseOver(int mouseX, int mouseY) { + int xPos = this.xPos + xOffset; + int yPos = this.yPos + yOffset; + return mouseX >= xPos && mouseX <= xPos + this.width && mouseY >= yPos && mouseY <= yPos + this.height; + } +} diff --git a/src/main/java/forestry/core/inventory/InventoryAnalyzer.java b/src/main/java/forestry/core/inventory/InventoryAnalyzer.java index d0b50724e..88b042781 100644 --- a/src/main/java/forestry/core/inventory/InventoryAnalyzer.java +++ b/src/main/java/forestry/core/inventory/InventoryAnalyzer.java @@ -10,17 +10,21 @@ ******************************************************************************/ package forestry.core.inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; + import forestry.api.arboriculture.TreeManager; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; +import forestry.core.config.Constants; import forestry.core.tiles.TileAnalyzer; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.SlotUtil; -import forestry.plugins.ForestryPluginUids; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; +import forestry.modules.ForestryModuleUids; public class InventoryAnalyzer extends InventoryAdapterTile { public static final short SLOT_ANALYZE = 0; @@ -53,7 +57,7 @@ public class InventoryAnalyzer extends InventoryAdapterTile { @Override public void setInventorySlotContents(int slotId, ItemStack itemStack) { - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE) && !TreeManager.treeRoot.isMember(itemStack)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE)) && !TreeManager.treeRoot.isMember(itemStack)) { itemStack = GeneticsUtil.convertToGeneticEquivalent(itemStack); } diff --git a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java index 637488a85..aa7babb65 100644 --- a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java +++ b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java @@ -11,6 +11,13 @@ package forestry.core.inventory; import com.google.common.collect.ImmutableSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; + import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorSource; import forestry.api.core.IErrorState; @@ -18,15 +25,12 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.items.ItemRegistryApiculture; +import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; import forestry.core.utils.GeneticsUtil; -import forestry.plugins.ForestryPluginUids; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import forestry.modules.ForestryModuleUids; public class ItemInventoryAlyzer extends ItemInventory implements IErrorSource { public static final int SLOT_ENERGY = 0; @@ -46,8 +50,8 @@ public class ItemInventoryAlyzer extends ItemInventory implements IErrorSource { return false; } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - ItemRegistryApiculture beeItems = PluginApiculture.getItems(); + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { + ItemRegistryApiculture beeItems = ModuleApiculture.getItems(); Item item = itemstack.getItem(); return beeItems.honeyDrop == item || beeItems.honeydew == item; @@ -111,7 +115,7 @@ public class ItemInventoryAlyzer extends ItemInventory implements IErrorSource { // Analyze if necessary if (individual != null && !individual.isAnalyzed()) { - final boolean requiresEnergy = ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE); + final boolean requiresEnergy = ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE)); if (requiresEnergy) { // Requires energy if (!isAlyzingFuel(getStackInSlot(SLOT_ENERGY))) { diff --git a/src/main/java/forestry/core/items/ItemForestryTool.java b/src/main/java/forestry/core/items/ItemForestryTool.java index 0ed15a758..5fbdd8322 100755 --- a/src/main/java/forestry/core/items/ItemForestryTool.java +++ b/src/main/java/forestry/core/items/ItemForestryTool.java @@ -29,7 +29,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.utils.ItemStackUtil; public class ItemForestryTool extends ItemForestry { @@ -52,7 +52,7 @@ public class ItemForestryTool extends ItemForestry { @Override public boolean canHarvestBlock(IBlockState block) { - if (this == PluginCore.getItems().bronzePickaxe) { + if (this == ModuleCore.getItems().bronzePickaxe) { Material material = block.getMaterial(); return material == Material.ROCK || material == Material.IRON || material == Material.ANVIL; } @@ -66,7 +66,7 @@ public class ItemForestryTool extends ItemForestry { return efficiencyOnProperMaterial; } } - if (this == PluginCore.getItems().bronzePickaxe) { + if (this == ModuleCore.getItems().bronzePickaxe) { Material material = state.getMaterial(); return material != Material.IRON && material != Material.ANVIL && material != Material.ROCK ? super.getDestroySpeed(itemstack, state) : this.efficiencyOnProperMaterial; } @@ -75,7 +75,7 @@ public class ItemForestryTool extends ItemForestry { @Override public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - if (this == PluginCore.getItems().bronzeShovel) { + if (this == ModuleCore.getItems().bronzeShovel) { ItemStack heldItem = player.getHeldItem(hand); if (!player.canPlayerEdit(pos.offset(facing), facing, heldItem)) { return EnumActionResult.FAIL; diff --git a/src/main/java/forestry/core/items/ItemFruit.java b/src/main/java/forestry/core/items/ItemFruit.java index 1a61b433e..4c02157e0 100755 --- a/src/main/java/forestry/core/items/ItemFruit.java +++ b/src/main/java/forestry/core/items/ItemFruit.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.utils.OreDictUtil; public class ItemFruit extends ItemForestryFood { @@ -56,7 +56,7 @@ public class ItemFruit extends ItemForestryFood { } public ItemStack getStack(int qty) { - return new ItemStack(PluginCore.getItems().fruits, qty, ordinal()); + return new ItemStack(ModuleCore.getItems().fruits, qty, ordinal()); } public String getOreDict() { diff --git a/src/main/java/forestry/core/items/ItemRegistry.java b/src/main/java/forestry/core/items/ItemRegistry.java index 2e9903fa1..62b7bbe8c 100755 --- a/src/main/java/forestry/core/items/ItemRegistry.java +++ b/src/main/java/forestry/core/items/ItemRegistry.java @@ -15,17 +15,18 @@ import java.util.Locale; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.fml.common.registry.ForgeRegistries; + import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import forestry.core.utils.MigrationHelper; -import forestry.plugins.PluginManager; +import forestry.modules.ModuleManager; public abstract class ItemRegistry { protected static T registerItem(T item, String name) { - if (PluginManager.getStage() != PluginManager.Stage.REGISTER) { + if (ModuleManager.getStage() != ModuleManager.Stage.REGISTER) { throw new RuntimeException("Tried to register Item outside of REGISTER"); } diff --git a/src/main/java/forestry/core/network/PacketIdServer.java b/src/main/java/forestry/core/network/PacketIdServer.java index 6422e0e10..262934a8c 100644 --- a/src/main/java/forestry/core/network/PacketIdServer.java +++ b/src/main/java/forestry/core/network/PacketIdServer.java @@ -24,6 +24,10 @@ public enum PacketIdServer implements IPacketId { PIPETTE_CLICK, CHIPSET_CLICK, SOLDERING_IRON_CLICK, + + //Database + INSERT_ITEM, + EXTRACT_ITEM, // Greenhouse CAMOUFLAGE_SELECTION, diff --git a/src/main/java/forestry/core/tiles/TileAnalyzer.java b/src/main/java/forestry/core/tiles/TileAnalyzer.java index 8b970c57f..3ce9028fd 100644 --- a/src/main/java/forestry/core/tiles/TileAnalyzer.java +++ b/src/main/java/forestry/core/tiles/TileAnalyzer.java @@ -13,6 +13,23 @@ package forestry.core.tiles; import javax.annotation.Nullable; import java.io.IOException; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.TreeManager; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; @@ -32,20 +49,7 @@ import forestry.core.network.packets.PacketItemStackDisplay; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.InventoryUtil; import forestry.core.utils.NetworkUtil; -import forestry.plugins.ForestryPluginUids; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.modules.ForestryModuleUids; public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankTile, IItemStackDisplay { private static final int TIME_TO_ANALYZE = 125; @@ -213,7 +217,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui return; } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE) && !TreeManager.treeRoot.isMember(inputStack)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE)) && !TreeManager.treeRoot.isMember(inputStack)) { inputStack = GeneticsUtil.convertToGeneticEquivalent(inputStack); } diff --git a/src/main/java/forestry/core/tiles/TileBase.java b/src/main/java/forestry/core/tiles/TileBase.java index 793f12fa9..9915b70b9 100644 --- a/src/main/java/forestry/core/tiles/TileBase.java +++ b/src/main/java/forestry/core/tiles/TileBase.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.tiles; -import forestry.core.blocks.BlockBase; -import forestry.core.gui.GuiHandler; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -19,6 +17,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.core.blocks.BlockBase; +import forestry.core.gui.GuiHandler; + public abstract class TileBase extends TileForestry { public void openGui(EntityPlayer player, ItemStack heldItem) { diff --git a/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java b/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java index c5e49c3bf..83848b354 100755 --- a/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java +++ b/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java @@ -20,9 +20,9 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.ICrashCallable; import forestry.core.config.Constants; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.IForestryPlugin; -import forestry.plugins.PluginManager; +import forestry.modules.ForestryModule; +import forestry.modules.IForestryModule; +import forestry.modules.ModuleManager; /** * ICrashCallable for listing disabled modules for crash reports. @@ -31,15 +31,15 @@ public class ForestryModEnvWarningCallable implements ICrashCallable { private final String disabledModulesMessage; public static void register() { - Set configDisabledPlugins = PluginManager.configDisabledPlugins; - if (!configDisabledPlugins.isEmpty()) { - List disabledPluginNames = new ArrayList<>(); - for (IForestryPlugin plugin : configDisabledPlugins) { - ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); - disabledPluginNames.add(info.name()); + Set configDisabledModules = ModuleManager.configDisabledModules; + if (!configDisabledModules.isEmpty()) { + List disabledModuleNames = new ArrayList<>(); + for (IForestryModule module : configDisabledModules) { + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + disabledModuleNames.add(info.name()); } - String disabledModulesMessage = "Plugins have been disabled in the config: " + Joiner.on(", ").join(disabledPluginNames); + String disabledModulesMessage = "Modules have been disabled in the config: " + Joiner.on(", ").join(disabledModuleNames); ForestryModEnvWarningCallable callable = new ForestryModEnvWarningCallable(disabledModulesMessage); FMLCommonHandler.instance().registerCrashCallable(callable); } diff --git a/src/main/java/forestry/core/utils/GeneticsUtil.java b/src/main/java/forestry/core/utils/GeneticsUtil.java index 18e9bb132..3631c94d9 100644 --- a/src/main/java/forestry/core/utils/GeneticsUtil.java +++ b/src/main/java/forestry/core/utils/GeneticsUtil.java @@ -14,7 +14,16 @@ import javax.annotation.Nullable; import java.util.HashSet; import java.util.Set; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + import forestry.api.arboriculture.ArboricultureCapabilities; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.ITree; @@ -25,7 +34,6 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.ICheckPollinatable; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IIndividualTranslator; import forestry.api.genetics.IMutation; import forestry.api.genetics.IPollinatable; import forestry.api.genetics.ISpeciesRoot; @@ -34,14 +42,6 @@ import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; import forestry.core.genetics.ItemGE; import forestry.core.tiles.TileUtil; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class GeneticsUtil { @@ -150,18 +150,15 @@ public class GeneticsUtil { } IBlockState blockState = world.getBlockState(pos); - Block block = blockState.getBlock(); - - if(TreeManager.treeRoot == null){ - return null; - } - - IIndividualTranslator leafTranslator = TreeManager.treeRoot.getTranslator(block); - if (leafTranslator == null) { - return null; + + for(ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()){ + IIndividual individual = root.translateMember(blockState); + if(individual != null){ + return individual; + } } - return leafTranslator.getIndividualFromObject(blockState); + return null; } @Nullable @@ -170,22 +167,21 @@ public class GeneticsUtil { if (item instanceof ItemGE) { return ((ItemGE) item).getIndividual(itemStack); } - - if(TreeManager.treeRoot == null){ - return null; + + for(ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()){ + IIndividual individual = root.translateMember(itemStack); + if(individual != null){ + return individual; + } } - IIndividualTranslator saplingTranslator = TreeManager.treeRoot.getTranslator(item); - if (saplingTranslator == null) { - return null; - } - return saplingTranslator.getIndividualFromObject(itemStack); + return null; } public static ItemStack convertToGeneticEquivalent(ItemStack foreign) { if (AlleleManager.alleleRegistry.getSpeciesRoot(foreign) == null) { IIndividual individual = getGeneticEquivalent(foreign); - if (individual instanceof ITree) { + if (individual != null) { ItemStack equivalent = TreeManager.treeRoot.getMemberStack(individual, EnumGermlingType.SAPLING); equivalent.setCount(foreign.getCount()); return equivalent; diff --git a/src/main/java/forestry/core/utils/InventoryUtil.java b/src/main/java/forestry/core/utils/InventoryUtil.java index 5fd5b07be..14fb89b5a 100644 --- a/src/main/java/forestry/core/utils/InventoryUtil.java +++ b/src/main/java/forestry/core/utils/InventoryUtil.java @@ -20,6 +20,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -30,10 +31,11 @@ import net.minecraftforge.fml.common.Optional; import forestry.api.core.ForestryAPI; import forestry.core.circuits.ISocketable; +import forestry.core.config.Constants; import forestry.core.inventory.ItemHandlerInventoryManipulator; import forestry.core.inventory.StandardStackFilters; import forestry.core.tiles.AdjacentTileCache; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModuleUids; public abstract class InventoryUtil { /** @@ -77,7 +79,7 @@ public abstract class InventoryUtil { } public static boolean moveOneItemToPipe(IItemHandler source, AdjacentTileCache tileCache, EnumFacing[] directions) { - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.BUILDCRAFT_TRANSPORT)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.BUILDCRAFT_TRANSPORT))) { return internal_moveOneItemToPipe(source, tileCache, directions); } diff --git a/src/main/java/forestry/core/worldgen/WorldGenerator.java b/src/main/java/forestry/core/worldgen/WorldGenerator.java index e859c1287..b251a078b 100755 --- a/src/main/java/forestry/core/worldgen/WorldGenerator.java +++ b/src/main/java/forestry/core/worldgen/WorldGenerator.java @@ -27,11 +27,11 @@ import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.fml.common.IWorldGenerator; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.blocks.BlockResourceOre; import forestry.core.blocks.EnumResourceType; import forestry.core.config.Config; -import forestry.plugins.PluginManager; +import forestry.modules.ModuleManager; public class WorldGenerator implements IWorldGenerator { @Nullable @@ -53,24 +53,24 @@ public class WorldGenerator implements IWorldGenerator { @SubscribeEvent public void populateChunk(PopulateChunkEvent.Post event) { // / PLUGIN WORLD GENERATION - PluginManager.populateChunk(event.getGen(), event.getWorld(), event.getRand(), event.getChunkX(), event.getChunkZ(), event.isHasVillageGenerated()); + ModuleManager.populateChunk(event.getGen(), event.getWorld(), event.getRand(), event.getChunkX(), event.getChunkZ(), event.isHasVillageGenerated()); } @SubscribeEvent public void decorateBiome(DecorateBiomeEvent.Post event) { - PluginManager.decorateBiome(event.getWorld(), event.getRand(), event.getPos()); + ModuleManager.decorateBiome(event.getWorld(), event.getRand(), event.getPos()); } public void retroGen(Random random, int chunkX, int chunkZ, World world) { generateWorld(random, chunkX, chunkZ, world); - PluginManager.populateChunkRetroGen(world, random, chunkX, chunkZ); + ModuleManager.populateChunkRetroGen(world, random, chunkX, chunkZ); world.getChunkFromChunkCoords(chunkX, chunkZ).markDirty(); } private void generateWorld(Random random, int chunkX, int chunkZ, World world) { if (apatiteGenerator == null || copperGenerator == null || tinGenerator == null) { - BlockResourceOre resourcesBlock = PluginCore.getBlocks().resources; + BlockResourceOre resourcesBlock = ModuleCore.getBlocks().resources; IBlockState apatiteBlockState = resourcesBlock.getStateFromMeta(EnumResourceType.APATITE.getMeta()); IBlockState copperBlockState = resourcesBlock.getStateFromMeta(EnumResourceType.COPPER.getMeta()); diff --git a/src/main/java/forestry/database/DatabaseFilter.java b/src/main/java/forestry/database/DatabaseFilter.java new file mode 100644 index 000000000..f724a2ad7 --- /dev/null +++ b/src/main/java/forestry/database/DatabaseFilter.java @@ -0,0 +1,14 @@ +package forestry.database; + +import java.util.function.Predicate; +import java.util.regex.Pattern; + +import net.minecraft.item.ItemStack; + +public abstract class DatabaseFilter implements Predicate{ + protected final Pattern pattern; + + protected DatabaseFilter(Pattern pattern) { + this.pattern = pattern; + } +} diff --git a/src/main/java/forestry/database/DatabaseFilterName.java b/src/main/java/forestry/database/DatabaseFilterName.java new file mode 100644 index 000000000..c565aedcf --- /dev/null +++ b/src/main/java/forestry/database/DatabaseFilterName.java @@ -0,0 +1,17 @@ +package forestry.database; + +import java.util.regex.Pattern; + +import net.minecraft.item.ItemStack; + +public class DatabaseFilterName extends DatabaseFilter { + public DatabaseFilterName(Pattern pattern) { + super(pattern); + } + + @Override + public boolean test(ItemStack itemStack) { + final String name = DatabaseHelper.getItemName(itemStack); + return pattern.matcher(name.toLowerCase()).find() || itemStack.isEmpty(); + } +} diff --git a/src/main/java/forestry/database/DatabaseFilterToolTip.java b/src/main/java/forestry/database/DatabaseFilterToolTip.java new file mode 100644 index 000000000..ee2e0600d --- /dev/null +++ b/src/main/java/forestry/database/DatabaseFilterToolTip.java @@ -0,0 +1,24 @@ +package forestry.database; + +import java.util.List; +import java.util.regex.Pattern; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; + +public class DatabaseFilterToolTip extends DatabaseFilter { + public DatabaseFilterToolTip(Pattern pattern) { + super(pattern); + } + + @Override + public boolean test(ItemStack itemStack) { + List lines = itemStack.getTooltip(Minecraft.getMinecraft().player, ITooltipFlag.TooltipFlags.NORMAL); + if(lines.size() <= 1){ + return false; + } + lines.remove(0); // Remove the first line as that states the item name + return lines.stream().anyMatch((s)->pattern.matcher(s).find()); + } +} diff --git a/src/main/java/forestry/database/DatabaseHelper.java b/src/main/java/forestry/database/DatabaseHelper.java new file mode 100644 index 000000000..1daef2b36 --- /dev/null +++ b/src/main/java/forestry/database/DatabaseHelper.java @@ -0,0 +1,97 @@ +package forestry.database; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; +import java.util.function.Predicate; +import java.util.regex.Pattern; + +import net.minecraft.item.ItemStack; + +public class DatabaseHelper { + public static boolean ascending; + + public static final Comparator SORT_BY_NAME = (DatabaseItem firstStack, DatabaseItem secondStack) -> { + if(firstStack.itemStack.isEmpty() && !secondStack.itemStack.isEmpty()){ + return 1; + }else if(!firstStack.itemStack.isEmpty() && secondStack.itemStack.isEmpty()){ + return -1; + } + if(ascending) { + return getItemName(firstStack.itemStack).compareToIgnoreCase(getItemName(secondStack.itemStack)); + } + return getItemName(secondStack.itemStack).compareToIgnoreCase(getItemName(firstStack.itemStack)); + }; + + public static String getItemName(ItemStack itemStack){ + try { + String name = itemStack.getDisplayName(); + if (name == null || name.isEmpty()) { + name = itemStack.getItem().getUnlocalizedName(itemStack); + } + return name == null ? "Null" : name; + }catch( final Exception errA ) { + try { + String name = itemStack.getUnlocalizedName(); + return name == null ? "Null" : name; + } catch( final Exception errB ) { + return "Exception"; + } + } + } + + public static void update(String searchText, List items, ArrayList sorted){ + sorted.clear(); + + sorted.ensureCapacity(items.size()); + + Pattern pattern; + try { + pattern = Pattern.compile(searchText.toLowerCase(), Pattern.CASE_INSENSITIVE); + } catch(Throwable ignore) { + try { + pattern = Pattern.compile(Pattern.quote(searchText.toLowerCase()), Pattern.CASE_INSENSITIVE); + } catch(Throwable e) { + return; + } + } + + List> filters = getFilters(pattern, searchText); + //boolean hasAddedItem; + for(DatabaseItem databaseItem : items) { + ItemStack item = databaseItem.itemStack; + final String name = DatabaseHelper.getItemName(item); + for(Predicate filter : filters){ + if(filter.test(item)){ + sorted.add(databaseItem); + break; + } + } + + /*if(pattern.matcher(name.toLowerCase()).find() || item.isEmpty()) { + sorted.add(databaseItem); + continue; + } + + List lines = item.getTooltip(Minecraft.getMinecraft().player, ITooltipFlag.TooltipFlags.NORMAL); + for(String tooltip : lines) { + if(pattern.matcher(tooltip).find()) { + sorted.add(databaseItem); + break; + } + }*/ + } + + Collections.sort(sorted, SORT_BY_NAME); + } + + //TODO: Add more filter options + public static List> getFilters(Pattern pattern, String searchText){ + List> filters = new LinkedList<>(); + filters.add(new DatabaseFilterName(pattern)); + filters.add(new DatabaseFilterToolTip(pattern)); + return filters; + } +} diff --git a/src/main/java/forestry/database/DatabaseItem.java b/src/main/java/forestry/database/DatabaseItem.java new file mode 100644 index 000000000..50ce804ae --- /dev/null +++ b/src/main/java/forestry/database/DatabaseItem.java @@ -0,0 +1,21 @@ +package forestry.database; + +import net.minecraft.item.ItemStack; + +public class DatabaseItem { + public final ItemStack itemStack; + public final int invIndex; + + public DatabaseItem(ItemStack itemStack, int invIndex) { + this.itemStack = itemStack; + this.invIndex = invIndex; + } + + @Override + public boolean equals(Object obj) { + if(!(obj instanceof DatabaseItem)){ + return false; + } + return ((DatabaseItem) obj).invIndex == invIndex && ((DatabaseItem) obj).itemStack.isEmpty() == itemStack.isEmpty(); + } +} diff --git a/src/main/java/forestry/database/DatabaseManager.java b/src/main/java/forestry/database/DatabaseManager.java new file mode 100644 index 000000000..2f4299378 --- /dev/null +++ b/src/main/java/forestry/database/DatabaseManager.java @@ -0,0 +1,143 @@ +package forestry.database; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + +import forestry.database.gui.GuiDatabase; +import forestry.database.tiles.TileDatabase; + +public class DatabaseManager { + + private final ArrayList sorted = new ArrayList<>(); + private final TileDatabase tile; + public final GuiDatabase gui; + private boolean markedForSorting; + /** + * the index of the selected item in {@link #sorted} + */ + private int selectedSlot; + @Nullable + private DatabaseItem selected; + + public DatabaseManager(TileDatabase tile, GuiDatabase gui) { + this.tile = tile; + this.gui = gui; + } + + public boolean canAdd(){ + return selectedSlot + 1 < getSize(); + } + + public boolean canSubtract(){ + int selectedSlot = this.selectedSlot -1; + return selectedSlot < getSize() && selectedSlot >= 0; + } + + /** + * @return the count of all valid item in {@link #sorted} + */ + public int getSize(){ + return sorted.size() - 1;//subtract one because the last entry is the empty item + } + + public int getRealSize(){ + return sorted.size(); + } + + public void setSelectedSlot(int selectedSlot) { + int oldSelected = this.selectedSlot; + this.selectedSlot = selectedSlot; + if(selectedSlot < 0){ + selected = null; + }else { + this.selected = sorted.get(selectedSlot); + } + gui.onUpdateSelectedSlot(oldSelected != selectedSlot && selected != null); + } + + public int getSelectedSlot() { + return selectedSlot; + } + + @Nullable + public DatabaseItem getSelected() { + return selected; + } + + public ItemStack getSelectedItemStack() { + if(selected == null){ + return ItemStack.EMPTY; + } + return selected.itemStack; + } + + /** + * Check if the selected slot is contained in {@link #sorted} if not set {@link #selectedSlot} to the index of the first valid item (0). + */ + public void updateSelected(){ + int index = sorted.indexOf(selected); + if(index >= 0) { + setSelectedSlot(sorted.indexOf(selected)); + return; + } + if(sorted.isEmpty()){ + setSelectedSlot(-1); + return; + } + int size = getSize(); + if(size <= 0){ + setSelectedSlot(-1); + return; + } + if(size > selectedSlot && index != -1){ + return; + } + setSelectedSlot(0); + } + + public void markForSorting(){ + markedForSorting = true; + } + + public void update(String searchText){ + if(markedForSorting){ + markedForSorting = false; + sortItems(searchText); + } + } + + public void sortItems(String searchText){ + sorted.clear(); + List items = new ArrayList<>(); + boolean firstEmpty = false; + for(int invIndex = 0;invIndex < tile.getSizeInventory();invIndex++){ + ItemStack stack = tile.getStackInSlot(invIndex).copy(); + if(!stack.isEmpty()) { + items.add(new DatabaseItem(stack, invIndex)); + continue; + } + if(!firstEmpty){ + firstEmpty = true; + items.add(new DatabaseItem(stack, invIndex)); + } + } + DatabaseHelper.update(searchText, items, sorted); + updateSelected(); + gui.onSortItems(sorted); + } + + @Nullable + public DatabaseItem getItem(int index){ + if(sorted.isEmpty() || sorted.size() <= index || index < 0){ + return null; + } + return sorted.get(index); + } + + public ArrayList getSorted() { + return sorted; + } +} diff --git a/src/main/java/forestry/database/DatabaseScreenLogic.java b/src/main/java/forestry/database/DatabaseScreenLogic.java new file mode 100644 index 000000000..494896d8e --- /dev/null +++ b/src/main/java/forestry/database/DatabaseScreenLogic.java @@ -0,0 +1,116 @@ +package forestry.database; + +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IDatabaseTab; +import forestry.api.genetics.ISpeciesPlugin; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; + + +public class DatabaseScreenLogic { + @Nullable + public ISpeciesRoot speciesRoot; + @Nullable + public ISpeciesPlugin databasePlugin; + @Nullable + public IIndividual individual; + public ItemStack itemStack = ItemStack.EMPTY; + @Nullable + public IDatabaseTab selectedTab; + public IDatabaseTab[] tabs = new IDatabaseTab[4]; + + public ScreenState onTabChange(IDatabaseTab selectedTab){ + //Check if a individual is selected and analyzed + if(individual == null){ + return ScreenState.NO_INDIVIDUAL; + }else if(!individual.isAnalyzed()){ + return ScreenState.NOT_ANALYZED; + } + + if(this.selectedTab == selectedTab){ + return ScreenState.SUCCESS; + } + + this.selectedTab = selectedTab; + return ScreenState.SUCCESS; + } + + public ScreenState onItemChange(ItemStack itemStack){ + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(itemStack); + + // No individual, abort + if (speciesRoot == null) { + return ScreenState.NO_INDIVIDUAL; + } + IIndividual individual = speciesRoot.getMember(itemStack); + + //Check if a individual is selected and analyzed + if(individual == null){ + this.individual = null; + this.itemStack = ItemStack.EMPTY; + return ScreenState.NO_INDIVIDUAL; + }else if(!individual.isAnalyzed()){ + this.individual = null; + this.itemStack = ItemStack.EMPTY; + return ScreenState.NOT_ANALYZED; + } + this.individual = individual; + this.itemStack = itemStack; + if(speciesRoot != this.speciesRoot){ + IDatabaseTab[] tabs = getTabs(speciesRoot); + if(tabs == null){ + this.tabs = new IDatabaseTab[4]; + return ScreenState.NO_PLUGIN; + } + this.tabs = tabs; + //Select the first tab + onTabChange(tabs[0]); + }else{ + //Update the gui + onTabChange(selectedTab); + } + this.speciesRoot = speciesRoot; + return ScreenState.SUCCESS; + } + + private IDatabaseTab[] getTabs(ISpeciesRoot speciesRoot){ + ISpeciesPlugin databasePlugin = speciesRoot.getSpeciesPlugin(); + if(databasePlugin == null){ + //no plugin ofr this species + return null; + } + this.databasePlugin = databasePlugin; + IDatabaseTab[] tabs = new IDatabaseTab[4]; + IDatabaseTab speciesTab = databasePlugin.getSpeciesTab(true); + if(speciesTab == null){ + //the plugin does not support the database + return null; + } + IDatabaseTab productsTab = databasePlugin.getProductsTab(); + IDatabaseTab mutationTab = databasePlugin.getMutationTab(); + if(productsTab == null){ + productsTab = DatabaseTab.PRODUCTS; + } + if(mutationTab == null){ + mutationTab = DatabaseTab.MUTATIONS; + } + tabs[0] = speciesTab; + tabs[1] = databasePlugin.getSpeciesTab(false); + tabs[2] = productsTab; + tabs[3] = mutationTab; + return tabs; + } + + public enum ScreenState{ + NO_INDIVIDUAL, + //The individual is not analyzed + NOT_ANALYZED, + //The ISpeciesRoot has no IGeneticDevicePlugin for this individual + NO_PLUGIN, + SUCCESS; + } +} diff --git a/src/main/java/forestry/database/DatabaseTab.java b/src/main/java/forestry/database/DatabaseTab.java new file mode 100644 index 000000000..e77c7f5eb --- /dev/null +++ b/src/main/java/forestry/database/DatabaseTab.java @@ -0,0 +1,126 @@ +package forestry.database; + +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; + +import forestry.api.apiculture.IBee; +import forestry.api.arboriculture.ITree; +import forestry.api.core.GuiElementAlignment; +import forestry.api.core.IGuiElementHelper; +import forestry.api.core.IGuiElementLayoutHelper; +import forestry.api.genetics.EnumDatabaseTab; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IDatabaseTab; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.gui.elements.GuiElementItemStack; +import forestry.core.utils.Translator; + +public enum DatabaseTab implements IDatabaseTab { + PRODUCTS { + @Override + public void createElements(IGuiElementHelper layoutHelper, IIndividual individual, ItemStack itemStack) { + IGuiElementLayoutHelper groupHelper = layoutHelper.layoutHelper((x, y) -> layoutHelper.factory().createHorizontal(x + 4, y, 18).setDistance(2), 90, 0); + Collection products = getProducts(individual); + if(!products.isEmpty()) { + layoutHelper.addText(Translator.translateToLocal("for.gui.beealyzer.produce"), GuiElementAlignment.CENTER); + products.forEach(product -> groupHelper.add(new GuiElementItemStack(0, 0, product))); + groupHelper.finish(); + } + + Collection specialties = getSpecialties(individual); + if(specialties.isEmpty()){ + return; + } + + layoutHelper.addText(Translator.translateToLocal("for.gui.beealyzer.specialty"), GuiElementAlignment.CENTER); + specialties.forEach(specialty -> groupHelper.add(new GuiElementItemStack(0, 0, specialty))); + groupHelper.finish(); + } + + public Collection getSpecialties(IIndividual individual){ + if(individual instanceof IBee){ + IBee bee = (IBee) individual; + return bee.getSpecialtyList(); + }else if(individual instanceof ITree){ + ITree tree = (ITree) individual; + return tree.getSpecialties().keySet(); + } + return Collections.emptyList(); + } + + public Collection getProducts(IIndividual individual){ + if(individual instanceof IBee){ + IBee bee = (IBee) individual; + return bee.getProduceList(); + }else if(individual instanceof ITree){ + ITree tree = (ITree) individual; + return tree.getProducts().keySet(); + } + return Collections.emptyList(); + } + + @Override + public EnumDatabaseTab getTab() { + return EnumDatabaseTab.PRODUCTS; + } + + }, + MUTATIONS { + @Override + public void createElements(IGuiElementHelper layoutHelper, IIndividual individual, ItemStack itemStack) { + IGenome genome = individual.getGenome(); + ISpeciesRoot speciesRoot = genome.getSpeciesRoot(); + IAlleleSpecies species = genome.getPrimary(); + + EntityPlayer player = Minecraft.getMinecraft().player; + IBreedingTracker breedingTracker = speciesRoot.getBreedingTracker(player.world, player.getGameProfile()); + + IGuiElementLayoutHelper groupHelper = layoutHelper.layoutHelper((x, y) -> layoutHelper.factory().createHorizontal(x + 1, y, 16), 100, 0); + Collection mutations = getValidMutations(speciesRoot.getCombinations(species)); + if(!mutations.isEmpty()) { + layoutHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.database.mutations.further"), GuiElementAlignment.CENTER); + mutations.forEach(mutation -> groupHelper.add(layoutHelper.factory().createMutation(0, 0, 50, 16, mutation, species, breedingTracker))); + groupHelper.finish(); + } + mutations = getValidMutations(speciesRoot.getResultantMutations(species)); + if(mutations.isEmpty()){ + return; + } + layoutHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.database.mutations.resultant"), GuiElementAlignment.CENTER); + mutations.forEach(mutation -> groupHelper.add(layoutHelper.factory().createMutationResultant(0, 0, 50, 16, mutation, breedingTracker))); + groupHelper.finish(); + } + + public Collection getValidMutations(List mutations){ + Iterator iterator = mutations.iterator(); + while(iterator.hasNext()){ + IMutation mutation = iterator.next(); + if(mutation.isSecret()){ + iterator.remove(); + } + } + return mutations; + } + + @Override + public EnumDatabaseTab getTab() { + return EnumDatabaseTab.MUTATIONS; + } + }; + + public String getTooltip(IIndividual individual){ + return I18n.translateToLocal("for.gui.database.tab." + getTab().toString().toLowerCase() + ".name"); + } +} diff --git a/src/main/java/forestry/database/ModuleDatabase.java b/src/main/java/forestry/database/ModuleDatabase.java new file mode 100644 index 000000000..0f22b4960 --- /dev/null +++ b/src/main/java/forestry/database/ModuleDatabase.java @@ -0,0 +1,58 @@ +package forestry.database; + +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + +import forestry.core.ModuleCore; +import forestry.core.config.Constants; +import forestry.core.items.ItemRegistryCore; +import forestry.core.network.IPacketRegistry; +import forestry.core.recipes.RecipeUtil; +import forestry.database.blocks.BlockRegistryDatabase; +import forestry.database.network.PacketRegistryDatabase; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; + +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.DATABASE, name = "Database", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.module.database.description") +public class ModuleDatabase extends BlankForestryModule { + @Nullable + private static BlockRegistryDatabase blocks; + + public static BlockRegistryDatabase getBlocks() { + Preconditions.checkState(blocks != null); + return blocks; + } + + @Override + public void registerItemsAndBlocks() { + blocks = new BlockRegistryDatabase(); + } + + @Override + public void doInit() { + BlockRegistryDatabase blocks = getBlocks(); + + blocks.database.init(); + } + + @Override + public void registerRecipes() { + ItemRegistryCore coreItems = ModuleCore.getItems(); + RecipeUtil.addRecipe("database", blocks.database, + "I#I", + "CYC", + "WCW", + '#', "blockGlass", + 'I', "ingotBronze", + 'W', "plankWood", + 'C', "chestWood", + 'Y', coreItems.sturdyCasing); + } + + @Override + public IPacketRegistry getPacketRegistry() { + return new PacketRegistryDatabase(); + } +} diff --git a/src/main/java/forestry/database/blocks/BlockDatabase.java b/src/main/java/forestry/database/blocks/BlockDatabase.java new file mode 100644 index 000000000..233b42360 --- /dev/null +++ b/src/main/java/forestry/database/blocks/BlockDatabase.java @@ -0,0 +1,12 @@ +package forestry.database.blocks; + +import forestry.core.blocks.BlockBase; + +public class BlockDatabase extends BlockBase { + + public BlockDatabase(BlockTypeDatabase blockType) { + super(blockType); + setHarvestLevel("pickaxe", 0); + } + +} diff --git a/src/main/java/forestry/database/blocks/BlockRegistryDatabase.java b/src/main/java/forestry/database/blocks/BlockRegistryDatabase.java new file mode 100644 index 000000000..0bd5a64b2 --- /dev/null +++ b/src/main/java/forestry/database/blocks/BlockRegistryDatabase.java @@ -0,0 +1,14 @@ +package forestry.database.blocks; + +import forestry.core.blocks.BlockRegistry; +import forestry.core.items.ItemBlockForestry; + +public class BlockRegistryDatabase extends BlockRegistry { + + public final BlockDatabase database; + + public BlockRegistryDatabase() { + database = new BlockDatabase(BlockTypeDatabase.DATABASE); + registerBlock(database, new ItemBlockForestry<>(database), "database"); + } +} diff --git a/src/main/java/forestry/database/blocks/BlockTypeDatabase.java b/src/main/java/forestry/database/blocks/BlockTypeDatabase.java new file mode 100644 index 000000000..04d8ab8f7 --- /dev/null +++ b/src/main/java/forestry/database/blocks/BlockTypeDatabase.java @@ -0,0 +1,28 @@ +package forestry.database.blocks; + +import forestry.core.blocks.IBlockTypeCustom; +import forestry.core.blocks.IMachineProperties; +import forestry.core.blocks.MachineProperties; +import forestry.database.tiles.TileDatabase; +import forestry.core.tiles.TileForestry; + +public enum BlockTypeDatabase implements IBlockTypeCustom { + DATABASE(TileDatabase.class, "database"); + public static final BlockTypeDatabase[] VALUES = values(); + + private final IMachineProperties machineProperties; + + BlockTypeDatabase(Class teClass, String name) { + this.machineProperties = new MachineProperties<>(teClass, name); + } + + @Override + public IMachineProperties getMachineProperties() { + return machineProperties; + } + + @Override + public String getName() { + return getMachineProperties().getName(); + } +} diff --git a/src/main/java/forestry/database/blocks/package-info.java b/src/main/java/forestry/database/blocks/package-info.java new file mode 100644 index 000000000..5e6466209 --- /dev/null +++ b/src/main/java/forestry/database/blocks/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.database.blocks; + +import javax.annotation.ParametersAreNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/database/gui/ContainerDatabase.java b/src/main/java/forestry/database/gui/ContainerDatabase.java new file mode 100644 index 000000000..de8b49004 --- /dev/null +++ b/src/main/java/forestry/database/gui/ContainerDatabase.java @@ -0,0 +1,52 @@ +package forestry.database.gui; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IContainerListener; +import net.minecraft.inventory.Slot; + +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.wrapper.InvWrapper; + +import forestry.core.gui.ContainerForestry; +import forestry.core.gui.ContainerTile; +import forestry.core.gui.IGuiSelectable; +import forestry.core.gui.slots.SlotFilteredInventory; +import forestry.database.tiles.TileDatabase; + +public class ContainerDatabase extends ContainerTile implements IGuiSelectable { + + public static final int SELECT_ID = 0; + + public ContainerDatabase(TileDatabase tileForestry, InventoryPlayer playerInventory) { + super(tileForestry, playerInventory, 18, 120); + + addInventory(this, tileForestry); + } + + public static void addInventory(ContainerForestry container, TileDatabase inventory) { + //Only to sync the items with the client + for (int i = 0; i < inventory.getSizeInventory(); i++) { + container.addSlotToContainer(new SlotFilteredInventory(inventory, i, -10000, -10000)); + } + + container.addSlotToContainer(new Slot(inventory.analyzerInventory, 0, 184, 120)); + } + + @Override + public void handleSelectionRequest(EntityPlayerMP player, int primary, int secondary) { + if(primary == SELECT_ID){ + tile.analyzeSpecimen(secondary); + } + } + + public void sendContainerToListeners(){ + for(IContainerListener listener : listeners){ + listener.sendAllContents(this, getInventory()); + } + } + + public IItemHandler getItemHandler(){ + return new InvWrapper(tile.getInternalInventory()); + } +} diff --git a/src/main/java/forestry/database/gui/GuiDatabase.java b/src/main/java/forestry/database/gui/GuiDatabase.java new file mode 100644 index 000000000..f17d3b56f --- /dev/null +++ b/src/main/java/forestry/database/gui/GuiDatabase.java @@ -0,0 +1,288 @@ +package forestry.database.gui; + +import javax.annotation.Nullable; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.input.Keyboard; + +import forestry.core.config.Constants; +import forestry.core.gui.Drawable; +import forestry.core.gui.GuiForestry; +import forestry.core.gui.slots.SlotFilteredInventory; +import forestry.core.gui.widgets.IScrollable; +import forestry.core.gui.widgets.WidgetScrollBar; +import forestry.core.inventory.watchers.ISlotChangeWatcher; +import forestry.core.network.packets.PacketGuiSelectRequest; +import forestry.core.render.ColourProperties; +import forestry.core.utils.NetworkUtil; +import forestry.core.utils.Translator; +import forestry.database.DatabaseHelper; +import forestry.database.DatabaseItem; +import forestry.database.DatabaseManager; +import forestry.database.gui.buttons.DatabaseButton; +import forestry.database.gui.buttons.GuiDatabaseButton; +import forestry.database.gui.widgets.WidgetDatabaseScreen; +import forestry.database.gui.widgets.WidgetDatabaseSelectedItem; +import forestry.database.gui.widgets.WidgetDatabaseSlot; +import forestry.database.gui.widgets.WidgetDatabaseTabs; +import forestry.database.tiles.TileDatabase; + +public class GuiDatabase extends GuiForestry implements ISlotChangeWatcher, IScrollable { + + private static final int SLOTS = 24; + + public final TileDatabase database; + private final ArrayList slots; + private final DatabaseManager manager; + + private GuiTextField searchField; + private GuiDatabaseButton lockButton; + private GuiDatabaseButton upButton; + private GuiDatabaseButton downButton; + private WidgetDatabaseScreen databaseScreen; + private WidgetScrollBar scrollBar; + + public GuiDatabase(TileDatabase database, EntityPlayer player) { + super(Constants.TEXTURE_PATH_GUI + "/database_inventory.png", new ContainerDatabase(database, player.inventory)); + this.database = database; + + slots = new ArrayList<>(); + xSize = 218; + ySize = 202; + manager = new DatabaseManager(database, this); + + for(Slot slot : container.inventorySlots){ + if(slot instanceof SlotFilteredInventory){ + SlotFilteredInventory slotDatabase = (SlotFilteredInventory) slot; + slotDatabase.setChangeWatcher(this); + } + } + for(int i = 0;i < SLOTS;i++){ + WidgetDatabaseSlot slot = new WidgetDatabaseSlot(widgetManager); + slots.add(slot); + widgetManager.add(slot); + } + int screenX = - 140; + WidgetScrollBar scrollBar = new WidgetScrollBar(widgetManager, screenX + 106, 10, new Drawable(WidgetDatabaseScreen.TEXTURE, 202, 0, 3, 156), false, new Drawable(WidgetDatabaseScreen.TEXTURE, 205, 0, 3, 5)); + widgetManager.add(databaseScreen = new WidgetDatabaseScreen(widgetManager, screenX, 0, scrollBar)); + widgetManager.add(scrollBar); + widgetManager.add(new WidgetDatabaseTabs(widgetManager, screenX, 177, databaseScreen)); + widgetManager.add(this.scrollBar = new WidgetScrollBar(widgetManager, 196, 19, 12, 90 , new Drawable(new ResourceLocation(Constants.TEXTURE_PATH_GUI + "/container/creative_inventory/tabs.png"), 232, 0, 12, 15))); + this.scrollBar.setParameters(this, 0, database.getSizeInventory() / 4 - 6, 1); + widgetManager.add(new WidgetDatabaseSelectedItem(widgetManager, 184, 158, manager)); + } + + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + String searchText = searchField != null ? searchField.getText() : ""; + manager.update(searchText); + super.drawScreen(mouseX, mouseY, partialTicks); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); + + String name = Translator.translateToLocal(database.getUnlocalizedTitle()); + textLayout.line = 6; + textLayout.drawLine(name, 8, ColourProperties.INSTANCE.get("gui.title")); + + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.disableLighting(); + this.searchField.drawTextBox(); + } + + @Override + protected void drawBackground() { + bindTexture(textureFile); + + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + } + + @Override + protected void keyTyped(char typedChar, int keyCode) throws IOException { + if (this.searchField.textboxKeyTyped(typedChar, keyCode)) { + scrollBar.setValue(0); + manager.markForSorting(); + } else if((keyCode == Keyboard.KEY_DOWN || keyCode == Keyboard.KEY_RIGHT) && downButton.enabled) { + downButton.onPressed(); + } else if((keyCode == Keyboard.KEY_UP || keyCode == Keyboard.KEY_LEFT) && upButton.enabled) { + upButton.onPressed(); + } else { + super.keyTyped(typedChar, keyCode); + } + } + + @Override + protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { + Slot slot = getSlotAtPosition(mouseX, mouseY); + if(slot != null && slot.getSlotIndex() == -1){ + return; + } + super.mouseClicked(mouseX, mouseY, mouseButton); + searchField.mouseClicked(mouseX, mouseY, mouseButton); + } + + @Nullable + public DatabaseItem getItem(int index){ + return manager.getItem(index); + } + + @Nullable + public DatabaseItem getSelectedItem(){ + return manager.getSelected(); + } + + public DatabaseManager getManager() { + return manager; + } + + public void onSortItems(List sorted) { + updateViewedItems(sorted); + } + + public void onChangeLockState(boolean locked) { + lockButton.setValue(locked); + } + + @Override + public void initGui() { + super.initGui(); + + this.guiLeft = 140 + (this.width - this.xSize - 125) / 2; + + this.searchField = new GuiTextField(0, this.fontRenderer, this.guiLeft + 101, this.guiTop + 6, 80, this.fontRenderer.FONT_HEIGHT); + this.searchField.setMaxStringLength(50); + this.searchField.setEnableBackgroundDrawing(false); + this.searchField.setTextColor(16777215); + + //Left buttons + this.buttonList.add(new GuiDatabaseButton(0, guiLeft - 18, guiTop, DatabaseHelper.ascending, manager, DatabaseButton.SORT_DIRECTION_BUTTON)); + //Selection buttons + this.buttonList.add(upButton = new GuiDatabaseButton(1, guiLeft + 184, guiTop + 144, "", manager, DatabaseButton.SELECTED_UP)); + this.buttonList.add(downButton = new GuiDatabaseButton(2, guiLeft + 184, guiTop + 178, "", manager, DatabaseButton.SELECTED_DOWN)); + + updateViewedItems(); + } + + public void onUpdateSelectedSlot(boolean changed){ + upButton.enabled = manager.canSubtract(); + downButton.enabled = manager.canAdd(); + if(changed){ + int index = getSelectedItem().invIndex; + database.selectedSlot = manager.getSelectedSlot(); + NetworkUtil.sendToServer(new PacketGuiSelectRequest(ContainerDatabase.SELECT_ID, index)); + //databaseScreen.onChangeTabOrIndividual(); + databaseScreen.onItemChange(manager.getSelectedItemStack()); + } + } + + @Override + protected void actionPerformed(GuiButton button) throws IOException { + if(button instanceof GuiDatabaseButton){ + GuiDatabaseButton databaseButton = (GuiDatabaseButton) button; + databaseButton.onPressed(); + } + } + + @Override + protected void addLedgers() { + } + + @Override + public void onScroll(int value) { + updateViewedItems(); + } + + @Override + public boolean isFocused(int mouseX, int mouseY) { + return isPointInRegion(0, 0, xSize, ySize, mouseX + guiLeft, mouseY + guiTop); + } + + @Override + protected boolean hasClickedOutside(int mouseX, int mouseY, int guiLeft, int guiTop) { + boolean isInsideScreen = databaseScreen.isMouseOver(mouseX - guiLeft, mouseY - guiTop); + return super.hasClickedOutside(mouseX, mouseY, guiLeft, guiTop) && !isInsideScreen; + } + + @Override + public void onSlotChanged(IInventory inventory, int slot) { + if(manager.getSelected() != null && slot == manager.getSelected().invIndex){ + databaseScreen.onItemChange(manager.getSelectedItemStack()); + } + manager.markForSorting(); + } + + public void updateViewedItems(){ + updateViewedItems(manager.getSorted()); + } + + public void updateViewedItems(List sorted) { + int currentRow = scrollBar.getValue(); + if (currentRow < 0) { + currentRow = 0; + } + //The inventory index of the first slot. + int slotStart = currentRow * 4; + //The inventory index of the last slot. + int slotEnd = (currentRow + 6) * 4; + if(slotEnd > database.getSizeInventory()){ + slotEnd = database.getSizeInventory(); + } + //The row of the first slot + byte startRow = (byte)(currentRow % 2); + //The index of the empty slot in the list. + int emptySlot = sorted.size() - 1; + for(int invIndex = 0;invIndex < database.getSizeInventory();invIndex++){ + if(invIndex >= slotStart && invIndex < slotEnd) { + int x = invIndex % 4; + int y = invIndex / 4 - currentRow; + int yOffset; + int xOffset; + if(startRow == 0) { + yOffset = 25; + xOffset = 17; + if (y % 2 == 1) { + xOffset = 38; + yOffset = 38; + y--; + } + } else { + yOffset = 25; + xOffset = 38; + if (y % 2 == 1) { + yOffset = 38; + xOffset = 17; + y--; + } + } + int xPos = xOffset + x * 42; + int yPos = yOffset + y / 2 * 25; + //If the index is above the count of the valid items in the list, set the index to the same value like the index of the empty slot. + int index = invIndex; + if(sorted.size() <= index || sorted.isEmpty()){ + index = emptySlot; + } + WidgetDatabaseSlot slot = slots.get(invIndex - slotStart); + slot.update(xPos, yPos, index, index != emptySlot); + } + } + //Create screen elements + if(!sorted.isEmpty() && databaseScreen.size() == 0) { + databaseScreen.onItemChange(manager.getSelectedItemStack()); + if(database.selectedSlot != -1) { + manager.setSelectedSlot(database.selectedSlot); + } + } + } +} diff --git a/src/main/java/forestry/database/gui/buttons/DatabaseButton.java b/src/main/java/forestry/database/gui/buttons/DatabaseButton.java new file mode 100644 index 000000000..51912c7c4 --- /dev/null +++ b/src/main/java/forestry/database/gui/buttons/DatabaseButton.java @@ -0,0 +1,63 @@ +package forestry.database.gui.buttons; + +import java.util.Collections; +import java.util.List; + +import forestry.core.gui.buttons.IButtonTextureSet; +import forestry.core.gui.buttons.StandardButtonTextureSets; +import forestry.database.DatabaseHelper; + +public enum DatabaseButton { + SORT_DIRECTION_BUTTON{ + + @Override + public void onValueChange(GuiDatabaseButton button) { + boolean ascending = (boolean) button.getValue(); + button.setTexture(ascending ? StandardButtonTextureSets.ARROW_UP_BUTTON : StandardButtonTextureSets.ARROW_DOWN_BUTTON); + } + + @Override + public void onPressed(GuiDatabaseButton button) { + //Client side only button + button.setValue(DatabaseHelper.ascending =!DatabaseHelper.ascending); + button.manager.markForSorting(); + } + }, + SELECTED_UP{ + + @Override + public void onPressed(GuiDatabaseButton button) { + button.manager.setSelectedSlot(button.manager.getSelectedSlot() - 1); + } + + @Override + public IButtonTextureSet getDefaultTexture() { + return StandardButtonTextureSets.UP_BUTTON; + } + }, + SELECTED_DOWN{ + @Override + public void onPressed(GuiDatabaseButton button) { + button.manager.setSelectedSlot(button.manager.getSelectedSlot() + 1); + } + + @Override + public IButtonTextureSet getDefaultTexture() { + return StandardButtonTextureSets.DOWN_BUTTON; + } + }; + + public List getTooltip(GuiDatabaseButton button){ + return Collections.emptyList(); + } + + public IButtonTextureSet getDefaultTexture(){ + return StandardButtonTextureSets.SMALL_BLANK_BUTTON; + } + + public void onValueChange(GuiDatabaseButton button){ + + } + + public abstract void onPressed(GuiDatabaseButton button); +} diff --git a/src/main/java/forestry/database/gui/buttons/GuiDatabaseButton.java b/src/main/java/forestry/database/gui/buttons/GuiDatabaseButton.java new file mode 100644 index 000000000..6b1dc93ee --- /dev/null +++ b/src/main/java/forestry/database/gui/buttons/GuiDatabaseButton.java @@ -0,0 +1,34 @@ +package forestry.database.gui.buttons; + +import forestry.core.gui.buttons.GuiBetterButton; +import forestry.database.DatabaseManager; + +public class GuiDatabaseButton extends GuiBetterButton { + + public final DatabaseButton type; + public final DatabaseManager manager; + public V value; + + public GuiDatabaseButton(int id, int x, int y, V value, DatabaseManager manager, DatabaseButton type) { + super(id, x, y, type.getDefaultTexture()); + this.type = type; + this.manager = manager; + setValue(value); + } + + public void setValue(V value) { + this.value = value; + if(value instanceof String){ + setLabel((String) value); + } + type.onValueChange(this); + } + + public void onPressed(){ + type.onPressed(this); + } + + public V getValue() { + return value; + } +} diff --git a/src/main/java/forestry/database/gui/buttons/package-info.java b/src/main/java/forestry/database/gui/buttons/package-info.java new file mode 100644 index 000000000..f297e1cdb --- /dev/null +++ b/src/main/java/forestry/database/gui/buttons/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.database.gui.buttons; + +import javax.annotation.ParametersAreNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/plugins/compat/package-info.java b/src/main/java/forestry/database/gui/package-info.java similarity index 87% rename from src/main/java/forestry/plugins/compat/package-info.java rename to src/main/java/forestry/database/gui/package-info.java index d0626a303..a7a0dc28d 100644 --- a/src/main/java/forestry/plugins/compat/package-info.java +++ b/src/main/java/forestry/database/gui/package-info.java @@ -1,9 +1,10 @@ @ParametersAreNonnullByDefault @FieldsAreNonnullByDefault @MethodsReturnNonnullByDefault -package forestry.plugins.compat; +package forestry.database.gui; import javax.annotation.ParametersAreNonnullByDefault; import forestry.core.utils.FieldsAreNonnullByDefault; + import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/database/gui/widgets/WidgetDatabaseScreen.java b/src/main/java/forestry/database/gui/widgets/WidgetDatabaseScreen.java new file mode 100644 index 000000000..a5d19ce88 --- /dev/null +++ b/src/main/java/forestry/database/gui/widgets/WidgetDatabaseScreen.java @@ -0,0 +1,132 @@ +package forestry.database.gui.widgets; + +import java.util.List; +import java.util.Locale; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import forestry.api.genetics.EnumDatabaseTab; +import forestry.api.genetics.IDatabaseTab; +import forestry.core.config.Constants; +import forestry.core.gui.elements.GuiElementHelper; +import forestry.core.gui.elements.GuiElementScrollable; +import forestry.core.gui.widgets.WidgetElementProvider; +import forestry.core.gui.widgets.WidgetManager; +import forestry.core.gui.widgets.WidgetScrollBar; +import forestry.core.utils.SoundUtil; +import forestry.core.utils.Translator; +import forestry.database.DatabaseScreenLogic; + +public class WidgetDatabaseScreen extends WidgetElementProvider { + public static final ResourceLocation TEXTURE = new ResourceLocation(Constants.MOD_ID, Constants.TEXTURE_PATH_GUI + "/database_mutation_screen.png"); + + private WidgetDatabaseTabs tabs; + public WidgetScrollBar scrollBar; + public GuiElementHelper layoutHelper; + public DatabaseScreenLogic logic; + public DatabaseScreenLogic.ScreenState state; + + public WidgetDatabaseScreen(WidgetManager manager, int xPos, int yPos, WidgetScrollBar scrollBar) { + super(manager, xPos, yPos, 118, 177, new GuiElementScrollable(0, 0, 102, 157)); + this.scrollable.setXOffset(8); + this.scrollable.setYOffset(12); + this.scrollBar = scrollBar; + this.logic = new DatabaseScreenLogic(); + this.state = DatabaseScreenLogic.ScreenState.NO_INDIVIDUAL; + } + + public void setTabs(WidgetDatabaseTabs tabs){ + this.tabs = tabs; + } + + public int onTabChange(EnumDatabaseTab tab){ + state = logic.onTabChange(logic.tabs[tab.ordinal()]); + update(); + if(state == DatabaseScreenLogic.ScreenState.SUCCESS){ + SoundUtil.playButtonClick(); + return logic.selectedTab.getTab().ordinal(); + } + return -1; + } + + public void onItemChange(ItemStack itemStack){ + state = logic.onItemChange(itemStack); + update(); + if(state == DatabaseScreenLogic.ScreenState.SUCCESS){ + tabs.selectedTab = logic.selectedTab.getTab().ordinal(); + }else { + tabs.selectedTab = -1; + } + } + + public ItemStack getItemStack(EnumDatabaseTab tab){ + if(state == DatabaseScreenLogic.ScreenState.SUCCESS){ + return logic.databasePlugin.getTabDatabaseIconItem(tab); + } + return new ItemStack(Items.PAPER); + } + + public String getTooltip(EnumDatabaseTab tab){ + if(state == DatabaseScreenLogic.ScreenState.SUCCESS){ + String tooltip = logic.tabs[tab.ordinal()].getTooltip(logic.individual); + if(tooltip != null) { + return tooltip; + } + } + return Translator.translateToLocal("for.gui.database.tab." + tab.toString().toLowerCase(Locale.ENGLISH) + ".name"); + } + + private void update(){ + //reset list and layout helper + scrollable.clear(); + scrollBar.setVisible(false); + scrollable.updateVisibleElements(0); + layoutHelper = new GuiElementHelper(scrollable); + if(state == DatabaseScreenLogic.ScreenState.SUCCESS){ + IDatabaseTab selectedTab = logic.selectedTab; + selectedTab.createElements(layoutHelper, logic.individual, logic.itemStack); + int invisibleElements = scrollable.getInvisibleElementCount(); + if (invisibleElements > 0) { + scrollBar.setParameters(this, 0, invisibleElements, 1); + scrollBar.setVisible(true); + //scrollBar.setValue(0); + }else{ + scrollBar.setValue(0); + } + scrollable.updateVisibleElements(scrollBar.getValue()); + }else{ + GuiElementHelper layoutHelper = new GuiElementHelper(scrollable); + FontRenderer fontRenderer = manager.gui.getFontRenderer(); + String key ="for.gui.portablealyzer.help"; + if(state == DatabaseScreenLogic.ScreenState.NO_PLUGIN){ + key = "for.gui.database.support"; + } + List lines = fontRenderer.listFormattedStringToWidth(Translator.translateToLocal(key), width - 10); + for(String text : lines) { + layoutHelper.addText(2, text, -1); + } + scrollable.updateVisibleElements(0); + } + } + + @Override + public void draw(int startX, int startY) { + tabs.drawTabs(startX, startY); + TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); + textureManager.bindTexture(TEXTURE); + manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos, 0, 0, width, height); + + //Draw the selected tab after the background so it is drawn over it + tabs.drawSelectedTab(startX, startY); + super.draw(startX, startY); + } + + public int size(){ + return scrollable.getSize(); + } +} diff --git a/src/main/java/forestry/database/gui/widgets/WidgetDatabaseSelectedItem.java b/src/main/java/forestry/database/gui/widgets/WidgetDatabaseSelectedItem.java new file mode 100644 index 000000000..b03ab4445 --- /dev/null +++ b/src/main/java/forestry/database/gui/widgets/WidgetDatabaseSelectedItem.java @@ -0,0 +1,21 @@ +package forestry.database.gui.widgets; + +import net.minecraft.item.ItemStack; + +import forestry.core.gui.widgets.ItemStackWidgetBase; +import forestry.core.gui.widgets.WidgetManager; +import forestry.database.DatabaseManager; + +public class WidgetDatabaseSelectedItem extends ItemStackWidgetBase { + private final DatabaseManager manager; + + public WidgetDatabaseSelectedItem(WidgetManager widgetManager, int xPos, int yPos, DatabaseManager manager) { + super(widgetManager, xPos, yPos); + this.manager = manager; + } + + @Override + protected ItemStack getItemStack() { + return manager.getSelectedItemStack(); + } +} diff --git a/src/main/java/forestry/database/gui/widgets/WidgetDatabaseSlot.java b/src/main/java/forestry/database/gui/widgets/WidgetDatabaseSlot.java new file mode 100644 index 000000000..629a43e68 --- /dev/null +++ b/src/main/java/forestry/database/gui/widgets/WidgetDatabaseSlot.java @@ -0,0 +1,177 @@ +package forestry.database.gui.widgets; + +import javax.annotation.Nullable; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import forestry.core.config.Constants; +import forestry.core.gui.Drawable; +import forestry.core.gui.GuiUtil; +import forestry.core.gui.tooltips.ToolTip; +import forestry.core.gui.widgets.Widget; +import forestry.core.gui.widgets.WidgetManager; +import forestry.core.utils.NetworkUtil; +import forestry.database.DatabaseItem; +import forestry.database.gui.GuiDatabase; +import forestry.database.network.packets.PacketExtractItem; +import forestry.database.network.packets.PacketInsertItem; + +public class WidgetDatabaseSlot extends Widget { + public static final ResourceLocation TEXTURE_LOCATION = new ResourceLocation(Constants.MOD_ID, Constants.TEXTURE_PATH_GUI + "/database_inventory.png"); + + public static final Drawable SLOT = new Drawable(TEXTURE_LOCATION, 218, 0, 22, 22); + public static final Drawable SLOT_SELECTED = new Drawable(TEXTURE_LOCATION, 218, 22, 22, 22); + + private int xPos; + private int yPos; + private boolean isEmpty; + private int databaseIndex; + private boolean ignoreMouseUp = false; + private boolean mouseOver; + + public WidgetDatabaseSlot(WidgetManager manager) { + super(manager, 0, 0); + this.databaseIndex = -1; + this.isEmpty = false; + } + + public void update(int xPos, int yPos, int databaseIndex, boolean isEmpty){ + this.xPos = xPos; + this.yPos = yPos; + this.databaseIndex = databaseIndex; + this.isEmpty = isEmpty; + } + + public int getDatabaseIndex() { + return databaseIndex; + } + + @Override + public boolean isMouseOver(int mouseX, int mouseY) { + return mouseX >= xPos && mouseX <= xPos + this.width && mouseY >= yPos && mouseY <= yPos + this.height; + } + + @Override + public void draw(int startX, int startY) { + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + manager.minecraft.renderEngine.bindTexture(TEXTURE_LOCATION); + Drawable texture = SLOT; + if(isSelected()){ + texture = SLOT_SELECTED; + } + texture.draw(startX + xPos - 3, startY + yPos - 3); + ItemStack itemStack = getItemStack(); + if(!itemStack.isEmpty()){ + Minecraft minecraft = Minecraft.getMinecraft(); + TextureManager textureManager = minecraft.getTextureManager(); + textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + RenderHelper.enableGUIStandardItemLighting(); + GuiUtil.drawItemStack(manager.gui, itemStack, startX + xPos, startY + yPos); + RenderHelper.disableStandardItemLighting(); + } + if(mouseOver){ + drawMouseOver(); + } + } + + private void drawMouseOver(){ + GlStateManager.disableDepth(); + GlStateManager.colorMask(true, true, true, false); + manager.gui.drawGradientRect(xPos, yPos, xPos + width, yPos + height, -2130706433, -2130706433); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableDepth(); + } + + @Override + public void update(int mouseX, int mouseY) { + mouseOver = isMouseOver(mouseX, mouseY); + } + + @Override + public void handleMouseClick(int mouseX, int mouseY, int mouseButton) { + if(mouseButton != 0 && mouseButton != 1 && mouseButton != 2 || !manager.minecraft.player.inventory.getItemStack().isEmpty()){ + return; + } + GuiDatabase gui = (GuiDatabase) manager.gui; + DatabaseItem item = gui.getItem(databaseIndex); + if(item == null){ + return; + } + + if(GuiScreen.isCtrlKeyDown() && mouseButton == 0){ + gui.getManager().setSelectedSlot(databaseIndex); + return; + } + + ignoreMouseUp = true; + byte flags = 0; + if(GuiScreen.isShiftKeyDown()){ + flags |= PacketExtractItem.SHIFT; + } + if(mouseButton == 1){ + flags |= PacketExtractItem.HALF; + }else if(mouseButton == 2){ + flags |= PacketExtractItem.CLONE; + } + NetworkUtil.sendToServer(new PacketExtractItem(item.invIndex, flags)); + } + + @Override + public boolean handleMouseRelease(int mouseX, int mouseY, int eventType) { + if(!isMouseOver(mouseX, mouseY) + || ignoreMouseUp + || eventType != 0 && eventType != 1 + || manager.minecraft.player.inventory.getItemStack().isEmpty()){ + ignoreMouseUp = false; + return false; + } + GuiDatabase gui = (GuiDatabase) manager.gui; + DatabaseItem item = gui.getItem(databaseIndex); + if(item == null){ + return false; + } + + NetworkUtil.sendToServer(new PacketInsertItem(eventType == 1)); + return true; + } + + @Nullable + @Override + public ToolTip getToolTip(int mouseX, int mouseY) { + Minecraft minecraft = Minecraft.getMinecraft(); + EntityPlayer player = minecraft.player; + ItemStack itemStack = getItemStack(); + ToolTip tip = new ToolTip(); + if (!itemStack.isEmpty()) { + tip.add(itemStack.getTooltip(player, minecraft.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL)); + } + return tip; + } + + public boolean isSelected(){ + if(!isEmpty){ + return false; + } + return ((GuiDatabase)manager.gui).getItem(databaseIndex) == ((GuiDatabase)manager.gui).getSelectedItem(); + } + + public ItemStack getItemStack(){ + if(!isEmpty){ + return ItemStack.EMPTY; + } + DatabaseItem item = ((GuiDatabase)manager.gui).getItem(databaseIndex); + if(item == null){ + return ItemStack.EMPTY; + } + return item.itemStack; + } +} diff --git a/src/main/java/forestry/database/gui/widgets/WidgetDatabaseTabs.java b/src/main/java/forestry/database/gui/widgets/WidgetDatabaseTabs.java new file mode 100644 index 000000000..fd0aa04c6 --- /dev/null +++ b/src/main/java/forestry/database/gui/widgets/WidgetDatabaseTabs.java @@ -0,0 +1,132 @@ +package forestry.database.gui.widgets; + +import javax.annotation.Nullable; + +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.util.ResourceLocation; + +import forestry.api.genetics.EnumDatabaseTab; +import forestry.core.gui.Drawable; +import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiUtil; +import forestry.core.gui.tooltips.ToolTip; +import forestry.core.gui.widgets.Widget; +import forestry.core.gui.widgets.WidgetManager; + +public class WidgetDatabaseTabs extends Widget { + private static final ResourceLocation CREATIVE_TEXTURE = new ResourceLocation("textures/gui/container/creative_inventory/tabs.png"); + private static final EnumDatabaseTab[] TABS = EnumDatabaseTab.values(); + + private static final Drawable GUI_TAB = new Drawable(CREATIVE_TEXTURE, 0, 64, 28, 28); + private static final Drawable GUI_TAB_ACTIVE_LEFT = new Drawable(CREATIVE_TEXTURE, 0, 96, 28, 32); + private static final Drawable GUI_TAB_ACTIVE_CENTER = new Drawable(CREATIVE_TEXTURE, 28, 96, 28, 32); + private static final Drawable GUI_TAB_ACTIVE_RIGHT = new Drawable(CREATIVE_TEXTURE, 140, 96, 28, 32); + + private final WidgetDatabaseScreen parent; + //The space between the tabs + public int spacing = 2; + //The selected tab + public int selectedTab; + + public WidgetDatabaseTabs(WidgetManager manager, int xPos, int yPos, WidgetDatabaseScreen parent) { + super(manager, xPos, yPos); + this.width = 28; + this.height = 28; + this.parent = parent; + this.parent.setTabs(this); + this.selectedTab = 0; + } + + @Override + public void draw(int startX, int startY) { + //Drawn in the screen widget + } + + public void drawTabs(int startX, int startY) { + for(int tabIndex = 0;tabIndex < TABS.length;tabIndex++) { + if(tabIndex == selectedTab){ + continue; + } + EnumDatabaseTab tab = TABS[tabIndex]; + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + Drawable tabTexture = GUI_TAB; + int xPos = this.xPos + tabIndex * (GUI_TAB.width + spacing); + tabTexture.draw(xPos, yPos - 4); + GuiUtil.drawItemStack(manager.gui, parent.getItemStack(tab), startX + xPos + 6, startY + yPos + 2); + } + } + + public void drawSelectedTab(int startX, int startY){ + //Check if a tab is selected + if(selectedTab < 0){ + return; + } + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + EnumDatabaseTab tab = TABS[selectedTab]; + int textureIndex = selectedTab == 0 ? 0 : selectedTab == TABS.length - 1 ? 2 : 1; + Drawable tabTexture; + if (textureIndex == 0) { + tabTexture = GUI_TAB_ACTIVE_LEFT; + } else if (textureIndex == 2) { + tabTexture = GUI_TAB_ACTIVE_RIGHT; + } else { + tabTexture = GUI_TAB_ACTIVE_CENTER; + } + int xPos = this.xPos + selectedTab * (GUI_TAB.width + spacing); + tabTexture.draw(xPos, yPos - 4); + GuiUtil.drawItemStack(manager.gui, parent.getItemStack(tab), startX + xPos + 6, startY + yPos + 2); + } + + @Override + public void handleMouseClick(int mouseX, int mouseY, int mouseButton) { + GuiForestry gui = manager.gui; + //set the mouse position relative to the gui + mouseX-=gui.getGuiLeft(); + mouseY-=gui.getGuiTop(); + int mouseOverTab = getMouseOverTab(mouseX, mouseY); + if(mouseOverTab < 0){ + return; + } + if(selectedTab != mouseOverTab) { + selectedTab = parent.onTabChange(TABS[mouseOverTab]); + } + } + + @Override + public boolean isMouseOver(int mouseX, int mouseY) { + int mouseOverTab = getMouseOverTab(mouseX, mouseY); + return mouseOverTab >= 0; + } + + @Nullable + public int getMouseOverTab(int mouseX, int mouseY){ + //set the mouse position relative to the widget + mouseX-=xPos; + mouseY-=yPos; + if(mouseY < 0 || mouseY > height){ + return -1; + } + int x = 0; + for(int tabIndex = 0;tabIndex < TABS.length;tabIndex++){ + if(mouseX < x || mouseX > x + GUI_TAB.width){ + x+= spacing + GUI_TAB.width; + continue; + } + return tabIndex; + } + return -1; + } + + @Nullable + @Override + public ToolTip getToolTip(int mouseX, int mouseY) { + int mouseOverTab = getMouseOverTab(mouseX, mouseY); + if(mouseOverTab < 0){ + return null; + } + EnumDatabaseTab tab = TABS[mouseOverTab]; + ToolTip toolTip = new ToolTip(); + toolTip.add(parent.getTooltip(tab)); + return toolTip; + } +} diff --git a/src/main/java/forestry/database/gui/widgets/package-info.java b/src/main/java/forestry/database/gui/widgets/package-info.java new file mode 100644 index 000000000..aece76785 --- /dev/null +++ b/src/main/java/forestry/database/gui/widgets/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.database.gui.widgets; + +import javax.annotation.ParametersAreNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/database/inventory/InventoryDatabase.java b/src/main/java/forestry/database/inventory/InventoryDatabase.java new file mode 100644 index 000000000..42538a699 --- /dev/null +++ b/src/main/java/forestry/database/inventory/InventoryDatabase.java @@ -0,0 +1,31 @@ +package forestry.database.inventory; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.inventory.InventoryAdapterTile; +import forestry.database.tiles.TileDatabase; +import forestry.core.utils.GeneticsUtil; + +public class InventoryDatabase extends InventoryAdapterTile { + public InventoryDatabase(TileDatabase tile) { + super(tile, 136, "Items"); + } + + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + itemStack = GeneticsUtil.convertToGeneticEquivalent(itemStack); + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(itemStack); + if (speciesRoot == null) { + return false; + } + return true; + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack stack, EnumFacing side) { + return super.canExtractItem(slotIndex, stack, side); + } +} diff --git a/src/main/java/forestry/database/inventory/InventoryDatabaseAnalyzer.java b/src/main/java/forestry/database/inventory/InventoryDatabaseAnalyzer.java new file mode 100644 index 000000000..696dfc28f --- /dev/null +++ b/src/main/java/forestry/database/inventory/InventoryDatabaseAnalyzer.java @@ -0,0 +1,51 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.database.inventory; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import forestry.api.core.ForestryAPI; +import forestry.apiculture.ModuleApiculture; +import forestry.apiculture.items.ItemRegistryApiculture; +import forestry.core.config.Constants; +import forestry.core.inventory.InventoryAdapterTile; +import forestry.database.tiles.TileDatabase; +import forestry.modules.ForestryModuleUids; + +public class InventoryDatabaseAnalyzer extends InventoryAdapterTile { + public static final int SLOT_ENERGY = 0; + + public InventoryDatabaseAnalyzer(TileDatabase database) { + super(database, 1, "AnalyzerItems"); + } + + public static boolean isAlyzingFuel(ItemStack itemstack) { + if (itemstack.isEmpty()) { + return false; + } + + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { + ItemRegistryApiculture beeItems = ModuleApiculture.getItems(); + + Item item = itemstack.getItem(); + return beeItems.honeyDrop == item || beeItems.honeydew == item; + } + + return false; + } + + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return isAlyzingFuel(itemStack); + } +} diff --git a/src/main/java/forestry/database/network/PacketRegistryDatabase.java b/src/main/java/forestry/database/network/PacketRegistryDatabase.java new file mode 100644 index 000000000..4ff47fd9a --- /dev/null +++ b/src/main/java/forestry/database/network/PacketRegistryDatabase.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.database.network; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.core.network.IPacketRegistry; +import forestry.core.network.PacketIdServer; +import forestry.database.network.packets.PacketExtractItem; +import forestry.database.network.packets.PacketInsertItem; + +public class PacketRegistryDatabase implements IPacketRegistry { + @Override + public void registerPacketsServer() { + PacketIdServer.INSERT_ITEM.setPacketHandler(new PacketInsertItem.Handler()); + PacketIdServer.EXTRACT_ITEM.setPacketHandler(new PacketExtractItem.Handler()); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerPacketsClient() { + } +} diff --git a/src/main/java/forestry/database/network/package-info.java b/src/main/java/forestry/database/network/package-info.java new file mode 100644 index 000000000..e43a69b98 --- /dev/null +++ b/src/main/java/forestry/database/network/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.database.network; + +import javax.annotation.ParametersAreNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/database/network/packets/PacketExtractItem.java b/src/main/java/forestry/database/network/packets/PacketExtractItem.java new file mode 100644 index 000000000..16359e681 --- /dev/null +++ b/src/main/java/forestry/database/network/packets/PacketExtractItem.java @@ -0,0 +1,123 @@ +package forestry.database.network.packets; + +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; + +import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketHandlerServer; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.PacketBufferForestry; +import forestry.core.network.PacketIdServer; +import forestry.database.gui.ContainerDatabase; + +public class PacketExtractItem extends ForestryPacket implements IForestryPacketServer { + public static final int HALF = 1; + public static final int SHIFT = 2; + public static final int CLONE = 4; + + private final int invIndex; + private final byte flags; + + public PacketExtractItem(int invIndex, byte flags) { + this.invIndex = invIndex; + this.flags = flags; + } + + @Override + protected void writeData(PacketBufferForestry data) throws IOException { + data.writeInt(invIndex); + data.writeByte(flags); + } + + @Override + public PacketIdServer getPacketId() { + return PacketIdServer.EXTRACT_ITEM; + } + + public static class Handler implements IForestryPacketHandlerServer { + @Override + public void onPacketData(PacketBufferForestry data, EntityPlayerMP player) throws IOException { + int invIndex = data.readInt(); + byte flags = data.readByte(); + + if (!player.inventory.getItemStack().isEmpty()) { + return; + } + + Container container = player.openContainer; + if(!(container instanceof ContainerDatabase)){ + return; + } + + IItemHandler itemHandler = ((ContainerDatabase) container).getItemHandler(); + if(itemHandler == null){ + return; + } + + //Get the item on that position + ItemStack itemStack = itemHandler.extractItem(invIndex, 64, true); + //Test if we there is an item on this position + if(itemStack.isEmpty()){ + return; + } + //Get the max count of this stack + int maxItemCount = itemStack.getItem().getItemStackLimit(itemStack.copy()); + //Get the count of the stack + int itemCount = itemStack.getCount(); + + if((flags & CLONE) == CLONE){ + //Clone the item with the maximal count + ItemStack extracted = itemStack.copy(); + extracted.setCount(maxItemCount); + player.inventory.setItemStack(extracted); + + if(container instanceof ContainerDatabase){ + ((ContainerDatabase) container).sendContainerToListeners(); + } + return; + } + + int count = 64; + if ((flags & HALF) == HALF && itemCount > 1) { + count = itemCount / 2; + } + + count = Math.min(count, maxItemCount); + + //Simulate an item extraction + ItemStack extracted = itemHandler.extractItem(invIndex, count, true); + if(!extracted.isEmpty()) { + if ((flags & SHIFT) == SHIFT) { + IItemHandler playerInv = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + //Test if the player has enough space + ItemStack remaining = ItemHandlerHelper.insertItem(playerInv, extracted, true); + if (remaining.isEmpty()) { + //Extract the item + extracted = itemHandler.extractItem(invIndex, count, false); + + //Give the item to the player into the first valid slot + ItemHandlerHelper.insertItem(playerInv, extracted, false); + } + }else{ + //Extract the item + extracted = itemHandler.extractItem(invIndex, count, false); + + player.inventory.setItemStack(extracted); + + player.updateHeldItem(); + } + + if(container instanceof ContainerDatabase){ + ((ContainerDatabase) container).sendContainerToListeners(); + } + } + } + } +} diff --git a/src/main/java/forestry/database/network/packets/PacketInsertItem.java b/src/main/java/forestry/database/network/packets/PacketInsertItem.java new file mode 100644 index 000000000..b62a71010 --- /dev/null +++ b/src/main/java/forestry/database/network/packets/PacketInsertItem.java @@ -0,0 +1,70 @@ +package forestry.database.network.packets; + +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; + +import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketHandlerServer; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.PacketBufferForestry; +import forestry.core.network.PacketIdServer; +import forestry.database.gui.ContainerDatabase; + +public class PacketInsertItem extends ForestryPacket implements IForestryPacketServer { + private final boolean single; + + public PacketInsertItem(boolean single) { + this.single = single; + } + + @Override + protected void writeData(PacketBufferForestry data) throws IOException { + data.writeBoolean(single); + } + + @Override + public PacketIdServer getPacketId() { + return PacketIdServer.INSERT_ITEM; + } + + public static class Handler implements IForestryPacketHandlerServer{ + @Override + public void onPacketData(PacketBufferForestry data, EntityPlayerMP player) throws IOException { + boolean single = data.readBoolean(); + Container container = player.openContainer; + if(!(container instanceof ContainerDatabase)){ + return; + } + + IItemHandler itemHandler = ((ContainerDatabase) container).getItemHandler(); + if(itemHandler == null){ + return; + } + ItemStack playerStack = player.inventory.getItemStack(); + ItemStack itemStack = playerStack.copy(); + + if (single){ + itemStack.setCount(1); + } + ItemStack remaining = ItemHandlerHelper.insertItemStacked(itemHandler, itemStack, false); + if(single && remaining.isEmpty()) { + playerStack.shrink(1); + if(playerStack.isEmpty()){ + player.inventory.setItemStack(ItemStack.EMPTY); + } + }else{ + player.inventory.setItemStack(remaining); + } + + if(container instanceof ContainerDatabase){ + ((ContainerDatabase) container).sendContainerToListeners(); + } + } + } +} diff --git a/src/main/java/forestry/database/network/packets/package-info.java b/src/main/java/forestry/database/network/packets/package-info.java new file mode 100644 index 000000000..bc7cf6901 --- /dev/null +++ b/src/main/java/forestry/database/network/packets/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.database.network.packets; + +import javax.annotation.ParametersAreNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/database/package-info.java b/src/main/java/forestry/database/package-info.java new file mode 100644 index 000000000..a1021dfbd --- /dev/null +++ b/src/main/java/forestry/database/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.database; + +import javax.annotation.ParametersAreNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/database/tiles/TileDatabase.java b/src/main/java/forestry/database/tiles/TileDatabase.java new file mode 100644 index 000000000..852a16172 --- /dev/null +++ b/src/main/java/forestry/database/tiles/TileDatabase.java @@ -0,0 +1,146 @@ +package forestry.database.tiles; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.ForestryAPI; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.config.Constants; +import forestry.core.owner.IOwnedTile; +import forestry.core.owner.IOwnerHandler; +import forestry.core.owner.OwnerHandler; +import forestry.core.tiles.TileBase; +import forestry.core.utils.GeneticsUtil; +import forestry.database.gui.ContainerDatabase; +import forestry.database.gui.GuiDatabase; +import forestry.database.inventory.InventoryDatabase; +import forestry.database.inventory.InventoryDatabaseAnalyzer; +import forestry.modules.ForestryModuleUids; + +public class TileDatabase extends TileBase implements IOwnedTile { + + //The last the selected slot on the client side. + @SideOnly(Side.CLIENT) + public int selectedSlot; + + private final OwnerHandler ownerHandler = new OwnerHandler(); + public InventoryDatabaseAnalyzer analyzerInventory; + + public TileDatabase() { + setInternalInventory(new InventoryDatabase(this)); + analyzerInventory = new InventoryDatabaseAnalyzer(this); + if(FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT){ + selectedSlot = -1; + } + } + + @SideOnly(Side.CLIENT) + @Override + public GuiContainer getGui(EntityPlayer player, int data) { + return new GuiDatabase(this, player); + } + + @Override + public Container getContainer(EntityPlayer player, int data) { + return new ContainerDatabase(this, player.inventory); + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); + ownerHandler.writeToNBT(nbttagcompound); + analyzerInventory.writeToNBT(nbttagcompound); + return nbttagcompound; + } + + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + ownerHandler.readFromNBT(nbttagcompound); + analyzerInventory.readFromNBT(nbttagcompound); + } + + @Override + public NBTTagCompound getUpdateTag() { + NBTTagCompound updateTag = super.getUpdateTag(); + ownerHandler.writeToNBT(updateTag); + return updateTag; + } + + @Override + @SideOnly(Side.CLIENT) + public void handleUpdateTag(NBTTagCompound tag) { + super.handleUpdateTag(tag); + ownerHandler.readFromNBT(tag); + } + + @Override + public IOwnerHandler getOwnerHandler() { + return ownerHandler; + } + + //Called by the container on the server side + public ItemStack analyzeSpecimen(int selectedDatabaseSlot) { + if(selectedDatabaseSlot < 0){ + return ItemStack.EMPTY; + } + ItemStack specimen = getStackInSlot(selectedDatabaseSlot); + if (specimen.isEmpty()) { + return ItemStack.EMPTY; + } + + ItemStack convertedSpecimen = GeneticsUtil.convertToGeneticEquivalent(specimen); + if (!ItemStack.areItemStacksEqual(specimen, convertedSpecimen)) { + setInventorySlotContents(selectedDatabaseSlot, convertedSpecimen); + specimen = convertedSpecimen; + } + + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(specimen); + + // No individual, abort + if (speciesRoot == null) { + return specimen; + } + + IIndividual individual = speciesRoot.getMember(specimen); + + // Analyze if necessary + if (individual != null && !individual.isAnalyzed()) { + final boolean requiresEnergy = ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE)); + if (requiresEnergy) { + // Requires energy + if (!analyzerInventory.isAlyzingFuel(analyzerInventory.getStackInSlot(InventoryDatabaseAnalyzer.SLOT_ENERGY))) { + return specimen; + } + } + + if (individual.analyze()) { + IBreedingTracker breedingTracker = speciesRoot.getBreedingTracker(world, ownerHandler.getOwner()); + breedingTracker.registerSpecies(individual.getGenome().getPrimary()); + breedingTracker.registerSpecies(individual.getGenome().getSecondary()); + + NBTTagCompound nbttagcompound = new NBTTagCompound(); + individual.writeToNBT(nbttagcompound); + specimen.setTagCompound(nbttagcompound); + + if (requiresEnergy) { + // Decrease energy + analyzerInventory.decrStackSize(InventoryDatabaseAnalyzer.SLOT_ENERGY, 1); + } + } + setInventorySlotContents(selectedDatabaseSlot, specimen); + } + return specimen; + } +} diff --git a/src/main/java/forestry/database/tiles/package-info.java b/src/main/java/forestry/database/tiles/package-info.java new file mode 100644 index 000000000..8a9648dab --- /dev/null +++ b/src/main/java/forestry/database/tiles/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.database.tiles; + +import javax.annotation.ParametersAreNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/energy/PluginEnergy.java b/src/main/java/forestry/energy/ModuleEnergy.java similarity index 86% rename from src/main/java/forestry/energy/PluginEnergy.java rename to src/main/java/forestry/energy/ModuleEnergy.java index b3f1ecd0e..c12c021e5 100644 --- a/src/main/java/forestry/energy/PluginEnergy.java +++ b/src/main/java/forestry/energy/ModuleEnergy.java @@ -10,24 +10,27 @@ ******************************************************************************/ package forestry.energy; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; -import com.google.common.base.Preconditions; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.common.SidedProxy; + import forestry.api.core.ForestryAPI; import forestry.core.config.Constants; import forestry.core.recipes.RecipeUtil; import forestry.energy.blocks.BlockRegistryEnergy; import forestry.energy.proxy.ProxyEnergy; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.SidedProxy; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.ENERGY, name = "Energy", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.energy.description") -public class PluginEnergy extends BlankForestryPlugin { +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.ENERGY, name = "Energy", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.energy.description") +public class ModuleEnergy extends BlankForestryModule { @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "forestry.energy.proxy.ProxyEnergyClient", serverSide = "forestry.energy.proxy.ProxyEnergy") @@ -54,7 +57,6 @@ public class PluginEnergy extends BlankForestryPlugin { @Override public void registerRecipes() { - super.registerRecipes(); Preconditions.checkState(blocks != null); RecipeUtil.addRecipe("peat_engine", new ItemStack(blocks.peatEngine), diff --git a/src/main/java/forestry/energy/blocks/BlockTypeEngine.java b/src/main/java/forestry/energy/blocks/BlockTypeEngine.java index c7b2146e0..e8919218f 100644 --- a/src/main/java/forestry/energy/blocks/BlockTypeEngine.java +++ b/src/main/java/forestry/energy/blocks/BlockTypeEngine.java @@ -17,7 +17,7 @@ import forestry.core.config.Constants; import forestry.core.proxy.Proxies; import forestry.core.tiles.TileBase; import forestry.core.tiles.TileEngine; -import forestry.energy.PluginEnergy; +import forestry.energy.ModuleEnergy; import forestry.energy.tiles.TileEngineBiogas; import forestry.energy.tiles.TileEngineClockwork; import forestry.energy.tiles.TileEngineElectric; @@ -41,7 +41,7 @@ public enum BlockTypeEngine implements IBlockTypeTesr { protected static IMachinePropertiesTesr createEngineProperties(Class teClass, String name, String textureName) { MachinePropertiesTesr machinePropertiesEngine = new MachinePropertiesTesr<>(teClass, name, Constants.MOD_ID + ":blocks" + textureName + ".0"); - PluginEnergy.proxy.setRenderDefaultEngine(machinePropertiesEngine, Constants.TEXTURE_PATH_BLOCKS + textureName + "_"); + ModuleEnergy.proxy.setRenderDefaultEngine(machinePropertiesEngine, Constants.TEXTURE_PATH_BLOCKS + textureName + "_"); return machinePropertiesEngine; } diff --git a/src/main/java/forestry/energy/tiles/TileEngineElectric.java b/src/main/java/forestry/energy/tiles/TileEngineElectric.java index 7ce542d1e..b93c5a862 100755 --- a/src/main/java/forestry/energy/tiles/TileEngineElectric.java +++ b/src/main/java/forestry/energy/tiles/TileEngineElectric.java @@ -19,6 +19,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -40,7 +41,7 @@ import forestry.core.tiles.TileEngine; import forestry.energy.gui.ContainerEngineElectric; import forestry.energy.gui.GuiEngineElectric; import forestry.energy.inventory.InventoryEngineElectric; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModuleUids; import ic2.api.energy.prefab.BasicSink; @@ -68,7 +69,7 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve setInternalInventory(new InventoryEngineElectric(this)); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.INDUSTRIALCRAFT2)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.INDUSTRIALCRAFT2))) { ic2EnergySink = new BasicSink(this, euConfig.euStorage, 4); } } diff --git a/src/main/java/forestry/energy/tiles/TileEnginePeat.java b/src/main/java/forestry/energy/tiles/TileEnginePeat.java index 206740426..ec62a89de 100644 --- a/src/main/java/forestry/energy/tiles/TileEnginePeat.java +++ b/src/main/java/forestry/energy/tiles/TileEnginePeat.java @@ -13,7 +13,7 @@ package forestry.energy.tiles; import java.io.IOException; import forestry.api.fuels.FuelManager; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; import forestry.core.inventory.AdjacentInventoryCache; @@ -74,7 +74,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { return i; } - if (waste.getItem() != PluginCore.getItems().ash) { + if (waste.getItem() != ModuleCore.getItems().ash) { continue; } @@ -180,7 +180,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { IInventoryAdapter inventory = getInternalInventory(); ItemStack wasteStack = inventory.getStackInSlot(wasteSlot); if (wasteStack.isEmpty()) { - inventory.setInventorySlotContents(wasteSlot, PluginCore.getItems().ash.getItemStack()); + inventory.setInventorySlotContents(wasteSlot, ModuleCore.getItems().ash.getItemStack()); } else { wasteStack.grow(1); } diff --git a/src/main/java/forestry/energy/tiles/TileEuGenerator.java b/src/main/java/forestry/energy/tiles/TileEuGenerator.java index eac011d03..5101c42f1 100755 --- a/src/main/java/forestry/energy/tiles/TileEuGenerator.java +++ b/src/main/java/forestry/energy/tiles/TileEuGenerator.java @@ -20,9 +20,11 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -45,7 +47,7 @@ import forestry.core.tiles.TileBase; import forestry.energy.gui.ContainerGenerator; import forestry.energy.gui.GuiGenerator; import forestry.energy.inventory.InventoryGenerator; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModuleUids; import ic2.api.energy.prefab.BasicSource; @@ -69,7 +71,7 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui tankManager = new TankManager(this, resourceTank); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.INDUSTRIALCRAFT2)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.INDUSTRIALCRAFT2))) { ic2EnergySource = new BasicSource(this, maxEnergy, 1); } } diff --git a/src/main/java/forestry/factory/PluginFactory.java b/src/main/java/forestry/factory/ModuleFactory.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/forestry/factory/PluginFactory.java rename to src/main/java/forestry/factory/ModuleFactory.java index ad638f5b2..539a4d23a --- a/src/main/java/forestry/factory/PluginFactory.java +++ b/src/main/java/forestry/factory/ModuleFactory.java @@ -21,6 +21,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -38,10 +39,10 @@ import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; import forestry.api.fuels.RainSubstrate; import forestry.api.recipes.RecipeManagers; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.items.ItemRegistryApiculture; -import forestry.core.PluginCore; -import forestry.core.PluginFluids; +import forestry.core.ModuleCore; +import forestry.core.ModuleFluids; import forestry.core.blocks.BlockBogEarth; import forestry.core.blocks.BlockRegistryCore; import forestry.core.circuits.CircuitLayout; @@ -70,13 +71,13 @@ import forestry.factory.recipes.FermenterRecipeManager; import forestry.factory.recipes.MoistenerRecipeManager; import forestry.factory.recipes.SqueezerRecipeManager; import forestry.factory.recipes.StillRecipeManager; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; -import forestry.storage.PluginStorage; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; +import forestry.storage.ModuleCrates; -@ForestryPlugin(pluginID = ForestryPluginUids.FACTORY, name = "Factory", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.factory.description", lootTable = "factory") -public class PluginFactory extends BlankForestryPlugin { +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.FACTORY, name = "Factory", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.factory.description", lootTable = "factory") +public class ModuleFactory extends BlankForestryModule { @Nullable private static BlockRegistryFactory blocks; @@ -134,9 +135,7 @@ public class PluginFactory extends BlankForestryPlugin { @Override public void preInit() { - super.preInit(); - - ItemRegistryCore coreItems = PluginCore.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); // Set fuels and resources for the fermenter ItemStack fertilizerCompound = coreItems.fertilizerCompound.getItemStack(); @@ -211,7 +210,6 @@ public class PluginFactory extends BlankForestryPlugin { @Override public void addLootPoolNames(Set lootPoolNames) { - super.addLootPoolNames(lootPoolNames); lootPoolNames.add("forestry_factory_items"); } @@ -222,7 +220,6 @@ public class PluginFactory extends BlankForestryPlugin { @Override public void doInit() { - super.doInit(); BlockRegistryFactory blocks = getBlocks(); blocks.bottler.init(); @@ -247,9 +244,9 @@ public class PluginFactory extends BlankForestryPlugin { public void registerRecipes() { // / FABRICATOR - ItemRegistryCore coreItems = PluginCore.getItems(); - BlockRegistryCore coreBlocks = PluginCore.getBlocks(); - ItemRegistryFluids fluidItems = PluginFluids.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); + BlockRegistryCore coreBlocks = ModuleCore.getBlocks(); + ItemRegistryFluids fluidItems = ModuleFluids.getItems(); BlockRegistryFactory blocks = getBlocks(); ItemElectronTube electronTube = coreItems.tubes; @@ -336,8 +333,8 @@ public class PluginFactory extends BlankForestryPlugin { String[] dyes = {"dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite"}; - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - ItemRegistryApiculture beeItems = PluginApiculture.getItems(); + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { + ItemRegistryApiculture beeItems = ModuleApiculture.getItems(); FluidStack liquidGlass = Fluids.GLASS.getFluid(Fluid.BUCKET_VOLUME); FluidStack liquidGlassX4 = Fluids.GLASS.getFluid(Fluid.BUCKET_VOLUME * 4); @@ -481,8 +478,8 @@ public class PluginFactory extends BlankForestryPlugin { // RAIN SUBSTRATES - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - ItemRegistryApiculture beeItems = PluginApiculture.getItems(); + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { + ItemRegistryApiculture beeItems = ModuleApiculture.getItems(); RecipeManagers.carpenterManager.addRecipe(5, new FluidStack(FluidRegistry.WATER, 1000), ItemStack.EMPTY, coreItems.iodineCharge.getItemStack(), "Z#Z", "#Y#", @@ -537,8 +534,8 @@ public class PluginFactory extends BlankForestryPlugin { RecipeManagers.carpenterManager.addRecipe(ItemStack.EMPTY, ingotBronze, "#", '#', coreItems.brokenBronzeShovel); // Crating and uncrating - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.STORAGE)) { - PluginStorage.createCrateRecipes(); + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.CRATE))) { + ModuleCrates.createCrateRecipes(); } ICircuitLayout layout = ChipsetManager.circuitRegistry.getLayout("forestry.machine.upgrade"); diff --git a/src/main/java/forestry/factory/recipes/FermenterRecipe.java b/src/main/java/forestry/factory/recipes/FermenterRecipe.java index 9bb712762..86e81af89 100644 --- a/src/main/java/forestry/factory/recipes/FermenterRecipe.java +++ b/src/main/java/forestry/factory/recipes/FermenterRecipe.java @@ -92,6 +92,6 @@ public class FermenterRecipe implements IFermenterRecipe { @Override public int compareTo(IFermenterRecipe o) { - return resource.isEmpty() ? 1 : 0; + return !resource.isEmpty() ? -1 : 1; } } diff --git a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java index 0d21308af..cabccf989 100644 --- a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java +++ b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java @@ -1,15 +1,23 @@ package forestry.factory.recipes.jei; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.awt.Rectangle; import java.util.List; -import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.ForestryAPI; +import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; import forestry.core.utils.JeiUtil; -import forestry.factory.PluginFactory; +import forestry.factory.ModuleFactory; import forestry.factory.blocks.BlockRegistryFactory; import forestry.factory.gui.GuiBottler; import forestry.factory.gui.GuiCarpenter; @@ -39,7 +47,8 @@ import forestry.factory.recipes.jei.squeezer.SqueezerRecipeCategory; import forestry.factory.recipes.jei.squeezer.SqueezerRecipeMaker; import forestry.factory.recipes.jei.still.StillRecipeCategory; import forestry.factory.recipes.jei.still.StillRecipeMaker; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModuleUids; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IModPlugin; @@ -49,9 +58,6 @@ import mezz.jei.api.gui.BlankAdvancedGuiHandler; import mezz.jei.api.recipe.IRecipeCategoryRegistration; import mezz.jei.api.recipe.VanillaRecipeCategoryUid; import mezz.jei.api.recipe.transfer.IRecipeTransferRegistry; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @JEIPlugin @SideOnly(Side.CLIENT) @@ -61,7 +67,7 @@ public class FactoryJeiPlugin implements IModPlugin { @Override public void registerCategories(IRecipeCategoryRegistration registry) { - if (!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)){ + if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))){ return; } @@ -85,7 +91,7 @@ public class FactoryJeiPlugin implements IModPlugin { public void register(IModRegistry registry) { registry.addAdvancedGuiHandlers(new ForestryAdvancedGuiHandler()); - if(!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)){ + if(!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))){ return; } jeiHelpers = registry.getJeiHelpers(); @@ -112,7 +118,7 @@ public class FactoryJeiPlugin implements IModPlugin { registry.addRecipeClickArea(GuiSqueezer.class, 76, 41, 43, 16, ForestryRecipeCategoryUid.SQUEEZER); registry.addRecipeClickArea(GuiStill.class, 73, 17, 33, 57, ForestryRecipeCategoryUid.STILL); - BlockRegistryFactory blocks = PluginFactory.getBlocks(); + BlockRegistryFactory blocks = ModuleFactory.getBlocks(); Preconditions.checkNotNull(blocks); registry.addRecipeCatalyst(new ItemStack(blocks.bottler), ForestryRecipeCategoryUid.BOTTLER); diff --git a/src/main/java/forestry/farming/PluginFarming.java b/src/main/java/forestry/farming/ModuleFarming.java similarity index 95% rename from src/main/java/forestry/farming/PluginFarming.java rename to src/main/java/forestry/farming/ModuleFarming.java index ac9b48d0e..542c5a646 100644 --- a/src/main/java/forestry/farming/PluginFarming.java +++ b/src/main/java/forestry/farming/ModuleFarming.java @@ -25,6 +25,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; @@ -42,7 +43,7 @@ import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitLayout; import forestry.api.core.ForestryAPI; import forestry.api.farming.IFarmRegistry; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.circuits.CircuitLayout; import forestry.core.circuits.Circuits; import forestry.core.config.Config; @@ -81,12 +82,12 @@ import forestry.farming.tiles.TileFarmHatch; import forestry.farming.tiles.TileFarmPlain; import forestry.farming.tiles.TileFarmValve; import forestry.farming.triggers.FarmingTriggers; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.FARMING, name = "Farming", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.farming.description") -public class PluginFarming extends BlankForestryPlugin { +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.FARMING, name = "Farming", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.farming.description") +public class ModuleFarming extends BlankForestryModule { @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "forestry.farming.proxy.ProxyFarmingClient", serverSide = "forestry.farming.proxy.ProxyFarming") @@ -117,14 +118,14 @@ public class PluginFarming extends BlankForestryPlugin { @Override public void preInit() { - ItemRegistryCore coreItems = PluginCore.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); BlockRegistryFarming blocks = getBlocks(); MinecraftForge.EVENT_BUS.register(this); IFarmRegistry registry = ForestryAPI.farmRegistry; registry.registerFarmables("farmArboreal", new FarmableVanillaSapling()); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))) { registry.registerFarmables("farmArboreal", new FarmableGE()); } @@ -174,7 +175,6 @@ public class PluginFarming extends BlankForestryPlugin { @Override public void doInit() { - super.doInit(); //Load config File configFile = new File(Forestry.instance.getConfigFolder(), Config.CATEGORY_FARM + ".cfg"); @@ -216,7 +216,7 @@ public class PluginFarming extends BlankForestryPlugin { @Override public void registerRecipes() { - ItemRegistryCore coreItems = PluginCore.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); BlockRegistryFarming blocks = getBlocks(); ItemStack basic = blocks.farm.get(EnumFarmBlockType.PLAIN, 1); diff --git a/src/main/java/forestry/farming/compat/FarmingJeiPlugin.java b/src/main/java/forestry/farming/compat/FarmingJeiPlugin.java index 3fc9167bd..aad15e2ba 100644 --- a/src/main/java/forestry/farming/compat/FarmingJeiPlugin.java +++ b/src/main/java/forestry/farming/compat/FarmingJeiPlugin.java @@ -2,12 +2,14 @@ package forestry.farming.compat; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; import forestry.api.core.ForestryAPI; -import forestry.farming.PluginFarming; +import forestry.core.config.Constants; +import forestry.farming.ModuleFarming; import forestry.farming.blocks.BlockRegistryFarming; import forestry.farming.models.EnumFarmBlockTexture; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModuleUids; import mezz.jei.api.IModPlugin; import mezz.jei.api.ISubtypeRegistry; @@ -17,11 +19,11 @@ import mezz.jei.api.JEIPlugin; public class FarmingJeiPlugin implements IModPlugin { @Override public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) { - if (!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) { + if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) { return; } - BlockRegistryFarming blocks = PluginFarming.getBlocks(); + BlockRegistryFarming blocks = ModuleFarming.getBlocks(); Item farmBlock = Item.getItemFromBlock(blocks.farm); subtypeRegistry.registerSubtypeInterpreter(farmBlock, itemStack -> { NBTTagCompound nbt = itemStack.getTagCompound(); diff --git a/src/main/java/forestry/farming/logic/CropBasicIC2Crop.java b/src/main/java/forestry/farming/logic/CropBasicIC2Crop.java index 198508d4d..64cc5315e 100644 --- a/src/main/java/forestry/farming/logic/CropBasicIC2Crop.java +++ b/src/main/java/forestry/farming/logic/CropBasicIC2Crop.java @@ -11,7 +11,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; -import forestry.plugins.compat.PluginIC2; +import forestry.plugins.PluginIC2; import ic2.api.crops.ICropTile; diff --git a/src/main/java/forestry/farming/logic/CropPeat.java b/src/main/java/forestry/farming/logic/CropPeat.java index 5c211cba9..c92659ede 100755 --- a/src/main/java/forestry/farming/logic/CropPeat.java +++ b/src/main/java/forestry/farming/logic/CropPeat.java @@ -18,7 +18,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.blocks.BlockBogEarth; import forestry.core.config.Constants; import forestry.core.network.packets.PacketFXSignal; @@ -45,7 +45,7 @@ public class CropPeat extends Crop { @Override protected NonNullList harvestBlock(World world, BlockPos pos) { NonNullList drops = NonNullList.create(); - drops.add(PluginCore.getItems().peat.getItemStack()); + drops.add(ModuleCore.getItems().peat.getItemStack()); IBlockState blockState = world.getBlockState(pos); diff --git a/src/main/java/forestry/farming/logic/CropRubber.java b/src/main/java/forestry/farming/logic/CropRubber.java index 8fd73d4ef..dc11ef1e2 100755 --- a/src/main/java/forestry/farming/logic/CropRubber.java +++ b/src/main/java/forestry/farming/logic/CropRubber.java @@ -28,7 +28,7 @@ import forestry.core.config.Constants; import forestry.core.network.packets.PacketFXSignal; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.NetworkUtil; -import forestry.plugins.compat.PluginIC2; +import forestry.plugins.PluginIC2; public class CropRubber extends CropDestroy { diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index 5705544cb..6d6da69bc 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -30,7 +30,7 @@ import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.farming.FarmRegistry; public class FarmLogicArboreal extends FarmLogicHomogeneous { @@ -39,7 +39,7 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { } public FarmLogicArboreal() { - super(new ItemStack(Blocks.DIRT), PluginCore.getBlocks().humus.getDefaultState(), FarmRegistry.getInstance().getFarmables("farmArboreal")); + super(new ItemStack(Blocks.DIRT), ModuleCore.getBlocks().humus.getDefaultState(), FarmRegistry.getInstance().getFarmables("farmArboreal")); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index 975dac224..3d486f326 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -34,7 +34,7 @@ import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; import forestry.api.genetics.IFruitBearer; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.tiles.TileUtil; public class FarmLogicOrchard extends FarmLogic { @@ -47,13 +47,13 @@ public class FarmLogicOrchard extends FarmLogic { this.farmables = ForestryAPI.farmRegistry.getFarmables("farmOrchard"); ImmutableList.Builder traversalBlocksBuilder = ImmutableList.builder(); - // if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.AGRICRAFT) || ForestryAPI.enabledPlugins.contains(ForestryPluginUids.INDUSTRIALCRAFT)) { + // if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.AGRICRAFT) || ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.INDUSTRIALCRAFT)) { // traversalBlocksBuilder.add(Blocks.FARMLAND); // } - // if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.INDUSTRIALCRAFT)) { + // if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.INDUSTRIALCRAFT)) { // traversalBlocksBuilder.add(Blocks.DIRT); // } - // if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.PLANTMEGAPACK)) { + // if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.PLANTMEGAPACK)) { // traversalBlocksBuilder.add(Blocks.WATER); // } // @@ -125,7 +125,7 @@ public class FarmLogicOrchard extends FarmLogic { @Override public ItemStack getIconItemStack() { - return new ItemStack(PluginCore.getItems().fruits); + return new ItemStack(ModuleCore.getItems().fruits); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicPeat.java b/src/main/java/forestry/farming/logic/FarmLogicPeat.java index 7191c0b54..1bf4022eb 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPeat.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPeat.java @@ -21,14 +21,14 @@ import net.minecraft.world.World; import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.blocks.BlockBogEarth; public class FarmLogicPeat extends FarmLogicWatered { - private static final ItemStack bogEarth = PluginCore.getBlocks().bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, 1); + private static final ItemStack bogEarth = ModuleCore.getBlocks().bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, 1); public FarmLogicPeat() { - super(bogEarth, PluginCore.getBlocks().bogEarth.getDefaultState()); + super(bogEarth, ModuleCore.getBlocks().bogEarth.getDefaultState()); } @Override @@ -37,7 +37,7 @@ public class FarmLogicPeat extends FarmLogicWatered { return true; } - return blockState.getBlock() == PluginCore.getBlocks().bogEarth; + return blockState.getBlock() == ModuleCore.getBlocks().bogEarth; } @Override @@ -86,6 +86,6 @@ public class FarmLogicPeat extends FarmLogicWatered { @Override public ItemStack getIconItemStack() { - return new ItemStack(PluginCore.getItems().peat); + return new ItemStack(ModuleCore.getItems().peat); } } diff --git a/src/main/java/forestry/farming/logic/FarmLogicRubber.java b/src/main/java/forestry/farming/logic/FarmLogicRubber.java index a92b7fe9d..3e9cb8df0 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicRubber.java +++ b/src/main/java/forestry/farming/logic/FarmLogicRubber.java @@ -27,7 +27,7 @@ import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; -import forestry.plugins.compat.PluginIC2; +import forestry.plugins.PluginIC2; public class FarmLogicRubber extends FarmLogic { diff --git a/src/main/java/forestry/farming/logic/FarmableBasicIC2Crop.java b/src/main/java/forestry/farming/logic/FarmableBasicIC2Crop.java index 61077a1b3..944792619 100644 --- a/src/main/java/forestry/farming/logic/FarmableBasicIC2Crop.java +++ b/src/main/java/forestry/farming/logic/FarmableBasicIC2Crop.java @@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.Optional; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; -import forestry.plugins.compat.PluginIC2; +import forestry.plugins.PluginIC2; import ic2.api.crops.ICropTile; diff --git a/src/main/java/forestry/farming/logic/FarmableGE.java b/src/main/java/forestry/farming/logic/FarmableGE.java index cf2b4924e..208f07e81 100755 --- a/src/main/java/forestry/farming/logic/FarmableGE.java +++ b/src/main/java/forestry/farming/logic/FarmableGE.java @@ -22,8 +22,7 @@ import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.TreeManager; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; -import forestry.arboriculture.PluginArboriculture; -import forestry.core.utils.GeneticsUtil; +import forestry.arboriculture.ModuleArboriculture; public class FarmableGE implements IFarmable { @@ -35,7 +34,7 @@ public class FarmableGE implements IFarmable { } Block block = world.getBlockState(pos).getBlock(); - return PluginArboriculture.getBlocks().saplingGE == block; + return ModuleArboriculture.getBlocks().saplingGE == block; } @Override diff --git a/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java index ec0ed3578..c0558d5c1 100644 --- a/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java +++ b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java @@ -12,7 +12,7 @@ package forestry.farming.proxy; import forestry.core.models.BlockModelEntry; import forestry.core.models.ModelManager; -import forestry.farming.PluginFarming; +import forestry.farming.ModuleFarming; import forestry.farming.models.ModelFarmBlock; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -26,6 +26,6 @@ public class ProxyFarmingClient extends ProxyFarming { public void initializeModels() { ModelManager.getInstance().registerCustomBlockModel(new BlockModelEntry(new ModelResourceLocation("forestry:ffarm"), new ModelResourceLocation("forestry:ffarm", "inventory"), new ModelFarmBlock(), - PluginFarming.getBlocks().farm)); + ModuleFarming.getBlocks().farm)); } } diff --git a/src/main/java/forestry/food/PluginFood.java b/src/main/java/forestry/food/ModuleFood.java similarity index 72% rename from src/main/java/forestry/food/PluginFood.java rename to src/main/java/forestry/food/ModuleFood.java index 8c17804ae..1c115eb12 100644 --- a/src/main/java/forestry/food/PluginFood.java +++ b/src/main/java/forestry/food/ModuleFood.java @@ -10,17 +10,18 @@ ******************************************************************************/ package forestry.food; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; -import com.google.common.base.Preconditions; import forestry.core.config.Constants; import forestry.food.items.ItemRegistryFood; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.FOOD, name = "Food", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.food.description") -public class PluginFood extends BlankForestryPlugin { +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.FOOD, name = "Food", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.food.description") +public class ModuleFood extends BlankForestryModule { @Nullable private static ItemRegistryFood items; diff --git a/src/main/java/forestry/greenhouse/PluginGreenhouse.java b/src/main/java/forestry/greenhouse/ModuleGreenhouse.java similarity index 94% rename from src/main/java/forestry/greenhouse/PluginGreenhouse.java rename to src/main/java/forestry/greenhouse/ModuleGreenhouse.java index f96842f12..983863d7f 100644 --- a/src/main/java/forestry/greenhouse/PluginGreenhouse.java +++ b/src/main/java/forestry/greenhouse/ModuleGreenhouse.java @@ -18,6 +18,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; @@ -32,7 +33,7 @@ import forestry.api.core.CamouflageManager; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.core.CreativeTabForestry; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.circuits.CircuitLayout; import forestry.core.circuits.Circuits; import forestry.core.config.Constants; @@ -70,12 +71,12 @@ import forestry.greenhouse.tiles.TileGreenhouseWindow; import forestry.greenhouse.tiles.TileHeater; import forestry.greenhouse.tiles.TileHumidifier; import forestry.greenhouse.tiles.TileHygroregulator; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.GREENHOUSE, name = "Greenhouse", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.plugin.greenhouse.description") -public class PluginGreenhouse extends BlankForestryPlugin { +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.GREENHOUSE, name = "Greenhouse", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.module.greenhouse.description") +public class ModuleGreenhouse extends BlankForestryModule { @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "forestry.greenhouse.proxy.ProxyGreenhouseClient", serverSide = "forestry.greenhouse.proxy.ProxyGreenhouse") @@ -97,7 +98,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { } public static CreativeTabs getGreenhouseTab() { - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) { return Tabs.tabAgriculture; } return CreativeTabForestry.tabForestry; @@ -130,7 +131,6 @@ public class PluginGreenhouse extends BlankForestryPlugin { @Override public void doInit() { - super.doInit(); IGreenhouseHelper helper = GreenhouseManager.helper; GameRegistry.registerTileEntity(TileGreenhousePlain.class, "forestry.GreenhousePlain"); @@ -163,7 +163,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { @Override public void registerRecipes() { - ItemRegistryCore coreItems = PluginCore.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); BlockRegistryGreenhouse blocks = getBlocks(); ItemRegistryGreenhouse items = getItems(); diff --git a/src/main/java/forestry/greenhouse/blocks/BlockClimatiser.java b/src/main/java/forestry/greenhouse/blocks/BlockClimatiser.java index b05e21d84..146139a52 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockClimatiser.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockClimatiser.java @@ -66,7 +66,7 @@ import forestry.core.tiles.TileUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.ItemTooltipUtil; import forestry.core.utils.Translator; -import forestry.greenhouse.PluginGreenhouse; +import forestry.greenhouse.ModuleGreenhouse; import forestry.greenhouse.models.ModelCamouflaged; import forestry.greenhouse.tiles.TileDehumidifier; import forestry.greenhouse.tiles.TileFan; @@ -82,7 +82,7 @@ public class BlockClimatiser extends Block implements IBlockWithMeta, ISpriteReg setHardness(1.0f); setHarvestLevel("pickaxe", 0); - setCreativeTab(PluginGreenhouse.getGreenhouseTab()); + setCreativeTab(ModuleGreenhouse.getGreenhouseTab()); this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, BlockClimatiserType.HUMIDIFIER)); } diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java index 9045ec5fa..52c50ad01 100755 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java @@ -71,7 +71,7 @@ import forestry.core.utils.ClimateUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.ItemTooltipUtil; import forestry.core.utils.Translator; -import forestry.greenhouse.PluginGreenhouse; +import forestry.greenhouse.ModuleGreenhouse; import forestry.greenhouse.api.climate.IClimateContainer; import forestry.greenhouse.api.greenhouse.IGreenhouseProvider; import forestry.greenhouse.models.ModelCamouflaged; @@ -88,7 +88,7 @@ public class BlockGreenhouse extends BlockStructure implements ISpriteRegister, setHardness(1.0f); setHarvestLevel("pickaxe", 0); - setCreativeTab(PluginGreenhouse.getGreenhouseTab()); + setCreativeTab(ModuleGreenhouse.getGreenhouseTab()); this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, BlockGreenhouseType.PLAIN)); } diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseWindow.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseWindow.java index bbe20d0bb..b6c51bbe6 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseWindow.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseWindow.java @@ -55,7 +55,7 @@ import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.tiles.IActivatable; import forestry.core.tiles.TileUtil; import forestry.core.utils.Log; -import forestry.greenhouse.PluginGreenhouse; +import forestry.greenhouse.ModuleGreenhouse; import forestry.greenhouse.api.greenhouse.GreenhouseManager; import forestry.greenhouse.tiles.TileGreenhouseWindow; import forestry.greenhouse.tiles.TileGreenhouseWindow.WindowMode; @@ -72,7 +72,7 @@ public class BlockGreenhouseWindow extends Block implements IBlockRotatable, ITi setHardness(1.0f); setHarvestLevel("pickaxe", 0); - setCreativeTab(PluginGreenhouse.getGreenhouseTab()); + setCreativeTab(ModuleGreenhouse.getGreenhouseTab()); setSoundType(SoundType.GLASS); this.roofWindow = roofWindow; } diff --git a/src/main/java/forestry/greenhouse/climate/modifiers/ClimateSourceModifier.java b/src/main/java/forestry/greenhouse/climate/modifiers/ClimateSourceModifier.java index 03e7bda65..cada42144 100644 --- a/src/main/java/forestry/greenhouse/climate/modifiers/ClimateSourceModifier.java +++ b/src/main/java/forestry/greenhouse/climate/modifiers/ClimateSourceModifier.java @@ -25,7 +25,7 @@ import forestry.api.climate.IClimateState; import forestry.core.climate.ClimateStates; import forestry.core.utils.StringUtil; import forestry.core.utils.Translator; -import forestry.greenhouse.PluginGreenhouse; +import forestry.greenhouse.ModuleGreenhouse; import forestry.greenhouse.api.climate.IClimateContainer; import forestry.greenhouse.api.climate.IClimateModifier; import forestry.greenhouse.api.climate.IClimateSource; @@ -127,6 +127,6 @@ public class ClimateSourceModifier implements IClimateModifier { @Override @SideOnly(Side.CLIENT) public ItemStack getIconItemStack() { - return PluginGreenhouse.getBlocks().window.getItem("glass"); + return ModuleGreenhouse.getBlocks().window.getItem("glass"); } } diff --git a/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java b/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java index 3f36927e5..cb9a28c27 100755 --- a/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java +++ b/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java @@ -20,7 +20,6 @@ import forestry.api.climate.IClimateState; import forestry.core.climate.ClimateStates; import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; -import forestry.core.gui.TextLayoutHelper; import forestry.core.utils.NetworkUtil; import forestry.greenhouse.api.climate.IClimateContainer; import forestry.greenhouse.gui.widgets.WidgetCamouflageTab; @@ -82,10 +81,6 @@ public class GuiGreenhouse extends GuiForestryTitled { } } - TextLayoutHelper getTextLayout() { - return textLayout; - } - @Override protected void addLedgers() { addErrorLedger(controller); diff --git a/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageTab.java b/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageTab.java index 145627178..d857714d0 100644 --- a/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageTab.java +++ b/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageTab.java @@ -90,7 +90,7 @@ public class WidgetCamouflageTab extends Widget { @Override public boolean handleMouseRelease(int mouseX, int mouseY, int eventType) { - return isMouseOver(mouseX - manager.gui.getGuiLeft(), mouseY - manager.gui.getGuiTop()); + return isMouseOver(mouseX, mouseY); } @Nullable diff --git a/src/main/java/forestry/greenhouse/gui/widgets/WidgetClimateBar.java b/src/main/java/forestry/greenhouse/gui/widgets/WidgetClimateBar.java index 2e4be85fb..855e2978f 100644 --- a/src/main/java/forestry/greenhouse/gui/widgets/WidgetClimateBar.java +++ b/src/main/java/forestry/greenhouse/gui/widgets/WidgetClimateBar.java @@ -84,8 +84,6 @@ public class WidgetClimateBar extends Widget { @Override public boolean handleMouseRelease(int mouseX, int mouseY, int eventType) { - mouseX -= manager.gui.getGuiLeft(); - mouseY -= manager.gui.getGuiTop(); return isMouseOver(mouseX, mouseY); } diff --git a/src/main/java/forestry/greenhouse/items/ItemCamouflageSprayCan.java b/src/main/java/forestry/greenhouse/items/ItemCamouflageSprayCan.java index 678217856..e55733b22 100644 --- a/src/main/java/forestry/greenhouse/items/ItemCamouflageSprayCan.java +++ b/src/main/java/forestry/greenhouse/items/ItemCamouflageSprayCan.java @@ -31,7 +31,7 @@ import forestry.api.core.ICamouflageHandler; import forestry.api.core.IModelManager; import forestry.core.items.ItemWithGui; import forestry.core.tiles.TileUtil; -import forestry.greenhouse.PluginGreenhouse; +import forestry.greenhouse.ModuleGreenhouse; import forestry.greenhouse.gui.ContainerCamouflageSprayCan; import forestry.greenhouse.gui.GuiCamouflageSprayCan; import forestry.greenhouse.inventory.ItemInventoryCamouflageSprayCan; @@ -39,7 +39,7 @@ import forestry.greenhouse.inventory.ItemInventoryCamouflageSprayCan; public class ItemCamouflageSprayCan extends ItemWithGui { public ItemCamouflageSprayCan() { - setCreativeTab(PluginGreenhouse.getGreenhouseTab()); + setCreativeTab(ModuleGreenhouse.getGreenhouseTab()); } @Override diff --git a/src/main/java/forestry/greenhouse/items/ItemGreenhouseScreen.java b/src/main/java/forestry/greenhouse/items/ItemGreenhouseScreen.java index b75bd1ad0..feea47de7 100644 --- a/src/main/java/forestry/greenhouse/items/ItemGreenhouseScreen.java +++ b/src/main/java/forestry/greenhouse/items/ItemGreenhouseScreen.java @@ -42,7 +42,7 @@ import forestry.core.multiblock.MultiblockUtil; import forestry.core.utils.ClimateUtil; import forestry.core.utils.StringUtil; import forestry.core.utils.Translator; -import forestry.greenhouse.PluginGreenhouse; +import forestry.greenhouse.ModuleGreenhouse; import forestry.greenhouse.api.climate.IClimateContainer; import forestry.greenhouse.multiblock.IGreenhouseControllerInternal; @@ -52,7 +52,7 @@ public class ItemGreenhouseScreen extends ItemForestry implements IColoredItem { public static final String PREVIEW_KEY = "preview"; public ItemGreenhouseScreen() { - setCreativeTab(PluginGreenhouse.getGreenhouseTab()); + setCreativeTab(ModuleGreenhouse.getGreenhouseTab()); } public static boolean isPreviewModeActive(ItemStack itemStack) { diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index 90cc80857..b7b86f580 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -36,7 +36,7 @@ import forestry.api.multiblock.IGreenhouseComponent; import forestry.api.multiblock.IGreenhouseComponent.Active; import forestry.api.multiblock.IGreenhouseComponent.Listener; import forestry.api.multiblock.IMultiblockComponent; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.climate.ClimateStates; import forestry.core.config.Config; import forestry.core.multiblock.IMultiblockControllerInternal; @@ -118,7 +118,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im * The default camouflage block {@link ItemStack} for every greenhouse block. */ public static ItemStack createDefaultCamouflageBlock() { - return new ItemStack(PluginCore.getBlocks().ashBrick); + return new ItemStack(ModuleCore.getBlocks().ashBrick); } /* IClimateHousing */ diff --git a/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java b/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java index 399a145a4..5c7d7b332 100644 --- a/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java +++ b/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java @@ -33,7 +33,7 @@ import forestry.core.models.BlockModelEntry; import forestry.core.models.ModelEntry; import forestry.core.models.ModelManager; import forestry.greenhouse.GreenhouseEventHandler; -import forestry.greenhouse.PluginGreenhouse; +import forestry.greenhouse.ModuleGreenhouse; import forestry.greenhouse.api.climate.IClimateContainer; import forestry.greenhouse.api.greenhouse.IGreenhouseBlock; import forestry.greenhouse.blocks.BlockClimatiser; @@ -53,7 +53,7 @@ public class ProxyGreenhouseClient extends ProxyGreenhouse { @Override public void initializeModels() { - BlockRegistryGreenhouse blocks = PluginGreenhouse.getBlocks(); + BlockRegistryGreenhouse blocks = ModuleGreenhouse.getBlocks(); Preconditions.checkState(blocks != null); ModelManager modelManager = ModelManager.getInstance(); @@ -76,13 +76,13 @@ public class ProxyGreenhouseClient extends ProxyGreenhouse { { ModelResourceLocation blockModelLocation = new ModelResourceLocation("forestry:greenhouse.window"); ModelResourceLocation itemModelLocation = new ModelResourceLocation("forestry:greenhouse_window", "inventory"); - BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModelLocation, new ModelGreenhouseWindow(), PluginGreenhouse.getBlocks().window); + BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModelLocation, new ModelGreenhouseWindow(), ModuleGreenhouse.getBlocks().window); modelManager.registerCustomBlockModel(blockModelIndex); } { ModelResourceLocation blockModelLocation = new ModelResourceLocation("forestry:greenhouse.window_up"); ModelResourceLocation itemModelLocation = new ModelResourceLocation("forestry:greenhouse_window_up", "inventory"); - BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModelLocation, new ModelGreenhouseWindow(), PluginGreenhouse.getBlocks().roofWindow); + BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModelLocation, new ModelGreenhouseWindow(), ModuleGreenhouse.getBlocks().roofWindow); modelManager.registerCustomBlockModel(blockModelIndex); } { diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhousePlain.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhousePlain.java index 8884f544d..4f82934f7 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhousePlain.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhousePlain.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; import forestry.api.multiblock.IGreenhouseController; import forestry.api.multiblock.IMultiblockController; -import forestry.greenhouse.PluginGreenhouse; +import forestry.greenhouse.ModuleGreenhouse; import forestry.greenhouse.blocks.BlockGreenhouse; import forestry.greenhouse.blocks.BlockGreenhouseType; @@ -34,7 +34,7 @@ public class TileGreenhousePlain extends TileGreenhouse { if (getPos().equals(greenhouseController.getCenterCoordinates())) { type = BlockGreenhouseType.BORDER_CENTER; } - this.world.setBlockState(getPos(), PluginGreenhouse.getBlocks().greenhouseBlock.getDefaultState().withProperty(BlockGreenhouse.TYPE, type), 2); + this.world.setBlockState(getPos(), ModuleGreenhouse.getBlocks().greenhouseBlock.getDefaultState().withProperty(BlockGreenhouse.TYPE, type), 2); } } @@ -43,7 +43,7 @@ public class TileGreenhousePlain extends TileGreenhouse { super.onMachineBroken(); // set border block state back to normal - this.world.setBlockState(getPos(), PluginGreenhouse.getBlocks().greenhouseBlock.getDefaultState().withProperty(BlockGreenhouse.TYPE, BlockGreenhouseType.PLAIN), 2); + this.world.setBlockState(getPos(), ModuleGreenhouse.getBlocks().greenhouseBlock.getDefaultState().withProperty(BlockGreenhouse.TYPE, BlockGreenhouseType.PLAIN), 2); } @Override diff --git a/src/main/java/forestry/lepidopterology/ButterflySpawner.java b/src/main/java/forestry/lepidopterology/ButterflySpawner.java index 39c76f3e6..6799cd308 100755 --- a/src/main/java/forestry/lepidopterology/ButterflySpawner.java +++ b/src/main/java/forestry/lepidopterology/ButterflySpawner.java @@ -32,17 +32,17 @@ public class ButterflySpawner implements ILeafTickHandler { IButterfly spawn = ButterflyManager.butterflyRoot.getIndividualTemplates().get(rand.nextInt(ButterflyManager.butterflyRoot.getIndividualTemplates().size())); float rarity; - if (!PluginLepidopterology.spawnRaritys.containsKey(spawn.getGenome().getPrimary().getUID())) { + if (!ModuleLepidopterology.spawnRaritys.containsKey(spawn.getGenome().getPrimary().getUID())) { rarity = spawn.getGenome().getPrimary().getRarity(); } else { - rarity = PluginLepidopterology.spawnRaritys.get(spawn.getGenome().getPrimary().getUID()); + rarity = ModuleLepidopterology.spawnRaritys.get(spawn.getGenome().getPrimary().getUID()); } if (rand.nextFloat() >= rarity * 0.5f) { return false; } - if (world.countEntities(EntityButterfly.class) > PluginLepidopterology.spawnConstraint) { + if (world.countEntities(EntityButterfly.class) > ModuleLepidopterology.spawnConstraint) { return false; } diff --git a/src/main/java/forestry/lepidopterology/ButterflyUtils.java b/src/main/java/forestry/lepidopterology/ButterflyUtils.java index 1c97f0bf0..1dd438e47 100644 --- a/src/main/java/forestry/lepidopterology/ButterflyUtils.java +++ b/src/main/java/forestry/lepidopterology/ButterflyUtils.java @@ -1,12 +1,13 @@ package forestry.lepidopterology; +import net.minecraft.entity.EntityLiving; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; import forestry.core.utils.Log; import forestry.lepidopterology.entities.EntityButterfly; -import net.minecraft.entity.EntityLiving; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class ButterflyUtils { @@ -17,7 +18,7 @@ public class ButterflyUtils { } public static boolean spawnButterfly(IButterfly butterfly, World world, BlockPos pos){ - if (world.countEntities(EntityButterfly.class) > PluginLepidopterology.spawnConstraint) { + if (world.countEntities(EntityButterfly.class) > ModuleLepidopterology.spawnConstraint) { return false; } @@ -32,7 +33,7 @@ public class ButterflyUtils { } public static boolean spawnButterflyWithoutCheck(IButterfly butterfly, World world, BlockPos pos){ - if (world.countEntities(EntityButterfly.class) > PluginLepidopterology.spawnConstraint) { + if (world.countEntities(EntityButterfly.class) > ModuleLepidopterology.spawnConstraint) { return false; } diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/ModuleLepidopterology.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/lepidopterology/PluginLepidopterology.java rename to src/main/java/forestry/lepidopterology/ModuleLepidopterology.java index 1fc9c0766..7461add21 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/ModuleLepidopterology.java @@ -19,6 +19,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -33,14 +34,15 @@ import net.minecraft.world.gen.IChunkGenerator; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; + import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.RecipeSorter; import forestry.Forestry; import forestry.api.arboriculture.TreeManager; @@ -50,7 +52,7 @@ import forestry.api.genetics.IAllele; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IAlleleButterflyCocoon; import forestry.api.lepidopterology.IAlleleButterflySpecies; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; import forestry.core.recipes.RecipeUtil; @@ -74,12 +76,12 @@ import forestry.lepidopterology.recipes.MatingRecipe; import forestry.lepidopterology.render.ModelButterflyItem; import forestry.lepidopterology.tiles.TileCocoon; import forestry.lepidopterology.worldgen.CocoonDecorator; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.LEPIDOPTEROLOGY, name = "Lepidopterology", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.lepidopterology.description") -public class PluginLepidopterology extends BlankForestryPlugin { +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.LEPIDOPTEROLOGY, name = "Lepidopterology", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.lepidopterology.description") +public class ModuleLepidopterology extends BlankForestryModule { @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "forestry.lepidopterology.proxy.ProxyLepidopterologyClient", serverSide = "forestry.lepidopterology.proxy.ProxyLepidopterology") @@ -142,9 +144,10 @@ public class PluginLepidopterology extends BlankForestryPlugin { } @Override - public Set getDependencyUids() { - Set dependencyUids = super.getDependencyUids(); - dependencyUids.add(ForestryPluginUids.ARBORICULTURE); + public Set getDependencyUids() { + Set dependencyUids = new HashSet<>(); + dependencyUids.add(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.CORE)); + dependencyUids.add(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE)); return dependencyUids; } @@ -152,7 +155,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { public void doInit() { BlockRegistryLepidopterology blocks = getBlocks(); - PluginCore.rootCommand.addChildCommand(new CommandButterfly()); + ModuleCore.rootCommand.addChildCommand(new CommandButterfly()); ResourceLocation butterflyResourceLocation = new ResourceLocation(Constants.MOD_ID, "butterflyGE"); EntityUtil.registerEntity(butterflyResourceLocation, EntityButterfly.class, "butterflyGE", 0, 0x000000, diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java index 9b624069f..4fcb781d4 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java @@ -15,7 +15,7 @@ import java.util.List; import forestry.api.lepidopterology.IButterflyNursery; import forestry.core.utils.GeneticsUtil; -import forestry.lepidopterology.PluginLepidopterology; +import forestry.lepidopterology.ModuleLepidopterology; public class AIButterflyMate extends AIButterflyInteract { @Nullable @@ -38,7 +38,7 @@ public class AIButterflyMate extends AIButterflyInteract { return false; } - if (entity.world.countEntities(EntityButterfly.class) > PluginLepidopterology.spawnConstraint) { + if (entity.world.countEntities(EntityButterfly.class) > ModuleLepidopterology.spawnConstraint) { return false; } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java index eb1758571..566d25405 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java @@ -13,7 +13,7 @@ package forestry.lepidopterology.entities; import forestry.api.genetics.ICheckPollinatable; import forestry.api.genetics.IPollinatable; import forestry.core.utils.GeneticsUtil; -import forestry.lepidopterology.PluginLepidopterology; +import forestry.lepidopterology.ModuleLepidopterology; public class AIButterflyPollinate extends AIButterflyInteract { @@ -26,7 +26,7 @@ public class AIButterflyPollinate extends AIButterflyInteract { */ @Override protected boolean canInteract() { - if (entity.cooldownPollination > 0 || !PluginLepidopterology.isPollinationAllowed()) { + if (entity.cooldownPollination > 0 || !ModuleLepidopterology.isPollinationAllowed()) { return false; } diff --git a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java index 9e7b87d54..0ae06fa36 100755 --- a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java +++ b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java @@ -60,7 +60,7 @@ import forestry.api.lepidopterology.IButterflyRoot; import forestry.api.lepidopterology.IEntityButterfly; import forestry.api.lepidopterology.ILepidopteristTracker; import forestry.core.utils.ItemStackUtil; -import forestry.lepidopterology.PluginLepidopterology; +import forestry.lepidopterology.ModuleLepidopterology; import forestry.lepidopterology.genetics.Butterfly; public class EntityButterfly extends EntityCreature implements IEntityButterfly { @@ -108,7 +108,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly super(world); setDefaults(); setIndividual(butterfly); - setHomePosAndDistance(homePos, PluginLepidopterology.maxDistance); + setHomePosAndDistance(homePos, ModuleLepidopterology.maxDistance); } @Override @@ -183,7 +183,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly setState(state); exhaustion = nbttagcompound.getInteger("EXH"); BlockPos home = new BlockPos(nbttagcompound.getInteger("homeX"), nbttagcompound.getInteger("homeY"), nbttagcompound.getInteger("homeZ")); - setHomePosAndDistance(home, PluginLepidopterology.maxDistance); + setHomePosAndDistance(home, ModuleLepidopterology.maxDistance); } public float getWingFlap(float partialTicktime) { diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index 35ae40867..d9bd2db82 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -55,7 +55,7 @@ import forestry.core.genetics.GenericRatings; import forestry.core.genetics.IndividualLiving; import forestry.core.utils.ClimateUtil; import forestry.core.utils.Translator; -import forestry.lepidopterology.PluginLepidopterology; +import forestry.lepidopterology.ModuleLepidopterology; public class Butterfly extends IndividualLiving implements IButterfly { private static final Random rand = new Random(); @@ -365,11 +365,11 @@ public class Butterfly extends IndividualLiving implements IButterfly { } } - if (PluginLepidopterology.getSerumChance() > 0) { - if (rand.nextFloat() < PluginLepidopterology.getSerumChance() * metabolism) { + if (ModuleLepidopterology.getSerumChance() > 0) { + if (rand.nextFloat() < ModuleLepidopterology.getSerumChance() * metabolism) { ItemStack stack = ButterflyManager.butterflyRoot.getMemberStack(this, EnumFlutterType.SERUM); - if (PluginLepidopterology.getSecondSerumChance() > 0) { - if (rand.nextFloat() < PluginLepidopterology.getSecondSerumChance() * metabolism) { + if (ModuleLepidopterology.getSecondSerumChance() > 0) { + if (rand.nextFloat() < ModuleLepidopterology.getSecondSerumChance() * metabolism) { stack.setCount(2); } } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyDatabaseTab.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyDatabaseTab.java new file mode 100644 index 000000000..690a235e5 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyDatabaseTab.java @@ -0,0 +1,103 @@ +package forestry.lepidopterology.genetics; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.GuiElementAlignment; +import forestry.api.core.IGuiElementHelper; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.EnumDatabaseTab; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IDatabaseTab; +import forestry.api.lepidopterology.EnumButterflyChromosome; +import forestry.api.lepidopterology.IAlleleButterflySpecies; +import forestry.api.lepidopterology.IButterfly; +import forestry.core.genetics.GenericRatings; +import forestry.core.genetics.alleles.AlleleBoolean; +import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; + +@SideOnly(Side.CLIENT) +public class ButterflyDatabaseTab implements IDatabaseTab { + private final EnumDatabaseTab tab; + + ButterflyDatabaseTab(EnumDatabaseTab tab) { + this.tab = tab; + } + + @Override + public void createElements(IGuiElementHelper elementHelper, IButterfly butterfly, ItemStack itemStack) { + boolean active = tab == EnumDatabaseTab.ACTIVE_SPECIES; + IAlleleButterflySpecies primarySpecies = butterfly.getGenome().getPrimary(); + + elementHelper.addText(Translator.translateToLocal("for.gui.database.tab." + tab.name().toLowerCase() + ".name"), GuiElementAlignment.CENTER, 0xcfb53b); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.species"), butterfly, EnumButterflyChromosome.SPECIES, active); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.size"), butterfly, EnumButterflyChromosome.SIZE, active); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.lifespan"), butterfly, EnumButterflyChromosome.LIFESPAN, active); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.speed"), butterfly,EnumButterflyChromosome.SPEED, active); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.metabolism"), (IAlleleInteger a)-> GenericRatings.rateMetabolism(a.getValue()), butterfly, EnumButterflyChromosome.METABOLISM, active); + + IAlleleInteger fertility = (IAlleleInteger) (active ? butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.FERTILITY) : butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FERTILITY)); + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.fertility"), GuiElementAlignment.CENTER); + elementHelper.addFertilityInfo(fertility, 0, 8); + + elementHelper.addAllele(Translator.translateToLocal("for.gui.flowers"), butterfly, EnumButterflyChromosome.FLOWER_PROVIDER, active); + elementHelper.addAllele(Translator.translateToLocal("for.gui.effect"), butterfly, EnumButterflyChromosome.EFFECT, active); + + IAlleleTolerance tempTolerance = (IAlleleTolerance) (active ? butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE) : butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE)); + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.climate"), GuiElementAlignment.CENTER); + elementHelper.addToleranceInfo(tempTolerance, primarySpecies, AlleleManager.climateHelper.toDisplay(primarySpecies.getTemperature())); + + IAlleleTolerance humidTolerance = (IAlleleTolerance) (active ? butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE) : butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE)); + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.humidity"), GuiElementAlignment.CENTER); + elementHelper.addToleranceInfo(humidTolerance, primarySpecies, AlleleManager.climateHelper.toDisplay(primarySpecies.getHumidity())); + + String yes = Translator.translateToLocal("for.yes"); + String no = Translator.translateToLocal("for.no"); + + String diurnal, nocturnal; + if(active) { + if (butterfly.getGenome().getNocturnal()) { + nocturnal = diurnal = yes; + } else { + nocturnal = butterfly.getGenome().getPrimary().isNocturnal() ? yes : no; + diurnal = !butterfly.getGenome().getPrimary().isNocturnal() ? yes : no; + } + }else { + if (((AlleleBoolean) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.NOCTURNAL)).getValue()) { + nocturnal = diurnal = yes; + } else { + nocturnal = butterfly.getGenome().getSecondary().isNocturnal() ? yes : no; + diurnal = !butterfly.getGenome().getSecondary().isNocturnal() ? yes : no; + } + } + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.diurnal"), GuiElementAlignment.CENTER); + elementHelper.addText(diurnal, GuiElementAlignment.CENTER, elementHelper.factory().getColorCoding(false)); + + elementHelper.addText(TextFormatting.UNDERLINE + Translator.translateToLocal("for.gui.nocturnal"), GuiElementAlignment.CENTER); + elementHelper.addText(nocturnal, GuiElementAlignment.CENTER, elementHelper.factory().getColorCoding(false)); + + String flyer = StringUtil.readableBoolean(active ? butterfly.getGenome().getTolerantFlyer() : ((AlleleBoolean) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.TOLERANT_FLYER)).getValue(), yes, no); + elementHelper.addAllele(Translator.translateToLocal("for.gui.flyer"), (a) -> flyer, butterfly, EnumButterflyChromosome.TOLERANT_FLYER, active); + + String fireresist = StringUtil.readableBoolean(active ? butterfly.getGenome().getFireResist() : ((AlleleBoolean) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FIRE_RESIST)).getValue(), yes, no); + elementHelper.addAllele(Translator.translateToLocal("for.gui.fireresist"), (a) -> fireresist, butterfly, EnumButterflyChromosome.FIRE_RESIST, active); + } + + @Override + public EnumDatabaseTab getTab() { + return tab; + } +} diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyPlugin.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyPlugin.java new file mode 100644 index 000000000..4183b8d43 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyPlugin.java @@ -0,0 +1,77 @@ +package forestry.lepidopterology.genetics; + +import javax.annotation.Nullable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.EnumDatabaseTab; +import forestry.api.genetics.IDatabaseTab; +import forestry.api.genetics.ISpeciesPlugin; +import forestry.api.lepidopterology.EnumFlutterType; +import forestry.api.lepidopterology.IAlleleButterflySpecies; +import forestry.api.lepidopterology.IButterfly; +import forestry.core.config.Config; +import forestry.lepidopterology.ModuleLepidopterology; + +@SideOnly(Side.CLIENT) +public class ButterflyPlugin implements ISpeciesPlugin { + public static final ButterflyPlugin INSTANCE = new ButterflyPlugin(); + private static final ButterflyDatabaseTab ACTIVE = new ButterflyDatabaseTab(EnumDatabaseTab.ACTIVE_SPECIES); + private static final ButterflyDatabaseTab INACTIVE = new ButterflyDatabaseTab(EnumDatabaseTab.INACTIVE_SPECIES); + private static final ButterflyProductsTab PRODUCTS = new ButterflyProductsTab(); + + protected final Map iconStacks = new HashMap<>(); + + private ButterflyPlugin() { + NonNullList butterflyList = NonNullList.create(); + ModuleLepidopterology.getItems().butterflyGE.addCreativeItems(butterflyList, false); + for (ItemStack butterflyStack : butterflyList) { + IAlleleButterflySpecies species = ButterflyGenome.getSpecies(butterflyStack); + iconStacks.put(species.getUID(), butterflyStack); + } + } + + @Override + public Map getIndividualStacks() { + return iconStacks; + } + + @Override + public List getHints() { + return Config.hints.get("flutterlyzer"); + } + + @Override + public IDatabaseTab getSpeciesTab(boolean active) { + if(active){ + return ACTIVE; + } + return INACTIVE; + } + + @Nullable + @Override + public IDatabaseTab getProductsTab() { + return PRODUCTS; + } + + @Override + public ItemStack getTabDatabaseIconItem(EnumDatabaseTab tab) { + switch (tab){ + case ACTIVE_SPECIES: + return ButterflyDefinition.BlueWing.getMemberStack(EnumFlutterType.BUTTERFLY); + case PRODUCTS: + return ButterflyDefinition.Aurora.getMemberStack(EnumFlutterType.SERUM); + case MUTATIONS: + return ButterflyDefinition.Glasswing.getMemberStack(EnumFlutterType.COCOON); + } + return ButterflyDefinition.GlassyTiger.getMemberStack(EnumFlutterType.CATERPILLAR); + } +} diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyProductsTab.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyProductsTab.java new file mode 100644 index 000000000..c7beb263e --- /dev/null +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyProductsTab.java @@ -0,0 +1,53 @@ +package forestry.lepidopterology.genetics; + +import java.util.Collection; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.GuiElementAlignment; +import forestry.api.core.IGuiElementHelper; +import forestry.api.core.IGuiElementLayoutHelper; +import forestry.api.genetics.EnumDatabaseTab; +import forestry.api.genetics.IDatabaseTab; +import forestry.api.lepidopterology.IButterfly; +import forestry.core.gui.elements.GuiElementItemStack; +import forestry.core.utils.Translator; + +@SideOnly(Side.CLIENT) +public class ButterflyProductsTab implements IDatabaseTab { + ButterflyProductsTab() { + } + + @Override + public void createElements(IGuiElementHelper layoutHelper, IButterfly individual, ItemStack itemStack) { + IGuiElementLayoutHelper groupHelper = layoutHelper.layoutHelper((x, y) -> layoutHelper.factory().createHorizontal(x + 4, y, 18).setDistance(2), 90, 0); + Collection butterflyLoot = individual.getGenome().getPrimary().getButterflyLoot().keySet(); + if(!butterflyLoot.isEmpty()) { + layoutHelper.addText(Translator.translateToLocal("for.gui.loot.butterfly"), GuiElementAlignment.CENTER); + butterflyLoot.forEach(stack -> groupHelper.add(new GuiElementItemStack(0, 0, stack))); + groupHelper.finish(); + } + + Collection caterpillarLoot = individual.getGenome().getPrimary().getCaterpillarLoot().keySet(); + if(!caterpillarLoot.isEmpty()){ + layoutHelper.addText(Translator.translateToLocal("for.gui.loot.caterpillar"), GuiElementAlignment.CENTER); + caterpillarLoot.forEach(stack -> groupHelper.add(new GuiElementItemStack(0, 0, stack))); + groupHelper.finish(); + } + + Collection cocoonLoot = individual.getGenome().getCocoon().getCocoonLoot().keySet(); + if(!cocoonLoot.isEmpty()){ + layoutHelper.addText(Translator.translateToLocal("for.gui.loot.cocoon"), GuiElementAlignment.CENTER); + cocoonLoot.forEach(stack -> groupHelper.add(new GuiElementItemStack(0, 0, stack))); + groupHelper.finish(); + } + } + + @Override + public EnumDatabaseTab getTab() { + return EnumDatabaseTab.PRODUCTS; + } +} diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java index 1bc07ff3d..8ed1671bd 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java @@ -28,12 +28,16 @@ import net.minecraft.world.World; import com.mojang.authlib.GameProfile; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlyzerPlugin; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesPlugin; import forestry.api.genetics.ISpeciesType; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumButterflyChromosome; @@ -50,7 +54,7 @@ import forestry.core.tiles.TileUtil; import forestry.core.utils.BlockUtil; import forestry.core.utils.EntityUtil; import forestry.core.utils.GeneticsUtil; -import forestry.lepidopterology.PluginLepidopterology; +import forestry.lepidopterology.ModuleLepidopterology; import forestry.lepidopterology.blocks.BlockRegistryLepidopterology; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.items.ItemButterflyGE; @@ -103,7 +107,7 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { return null; } - ItemRegistryLepidopterology butterflyItems = PluginLepidopterology.getItems(); + ItemRegistryLepidopterology butterflyItems = ModuleLepidopterology.getItems(); Preconditions.checkState(butterflyItems != null); Item item = stack.getItem(); @@ -152,7 +156,7 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { @Override public ItemStack getMemberStack(IIndividual butterfly, ISpeciesType type) { Preconditions.checkArgument(type instanceof EnumFlutterType); - ItemRegistryLepidopterology items = PluginLepidopterology.getItems(); + ItemRegistryLepidopterology items = ModuleLepidopterology.getItems(); Preconditions.checkState(items != null); Item butterflyItem; @@ -194,7 +198,7 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { return BlockPos.ORIGIN; } - BlockRegistryLepidopterology blocks = PluginLepidopterology.getBlocks(); + BlockRegistryLepidopterology blocks = ModuleLepidopterology.getBlocks(); BlockPos pos = getValidCocoonPos(world, coordinates, caterpillar, owner, createNursery); if(pos == BlockPos.ORIGIN){ @@ -363,4 +367,10 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { public IAlyzerPlugin getAlyzerPlugin() { return FlutterlyzerPlugin.INSTANCE; } + + @Override + @SideOnly(Side.CLIENT) + public ISpeciesPlugin getSpeciesPlugin() { + return ButterflyPlugin.INSTANCE; + } } diff --git a/src/main/java/forestry/lepidopterology/genetics/FlutterlyzerPlugin.java b/src/main/java/forestry/lepidopterology/genetics/FlutterlyzerPlugin.java index 6e14dc0cf..c2d372aed 100644 --- a/src/main/java/forestry/lepidopterology/genetics/FlutterlyzerPlugin.java +++ b/src/main/java/forestry/lepidopterology/genetics/FlutterlyzerPlugin.java @@ -14,6 +14,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleFlowers; import forestry.api.genetics.IAlleleInteger; @@ -30,13 +38,7 @@ import forestry.core.gui.GuiAlyzer; import forestry.core.gui.TextLayoutHelper; import forestry.core.utils.StringUtil; import forestry.core.utils.Translator; -import forestry.lepidopterology.PluginLepidopterology; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.lepidopterology.ModuleLepidopterology; public class FlutterlyzerPlugin implements IAlyzerPlugin { public static final FlutterlyzerPlugin INSTANCE = new FlutterlyzerPlugin(); @@ -45,7 +47,7 @@ public class FlutterlyzerPlugin implements IAlyzerPlugin { private FlutterlyzerPlugin() { NonNullList butterflyList = NonNullList.create(); - PluginLepidopterology.getItems().butterflyGE.addCreativeItems(butterflyList, false); + ModuleLepidopterology.getItems().butterflyGE.addCreativeItems(butterflyList, false); for (ItemStack butterflyStack : butterflyList) { IAlleleButterflySpecies species = ButterflyGenome.getSpecies(butterflyStack); iconStacks.put(species.getUID(), butterflyStack); @@ -247,6 +249,22 @@ public class FlutterlyzerPlugin implements IAlyzerPlugin { } } + textLayout.newLine(); + textLayout.newLine(); + + textLayout.drawLine(Translator.translateToLocal("for.gui.loot.cocoon") + ":", GuiAlyzer.COLUMN_0); + textLayout.newLine(); + + x = GuiAlyzer.COLUMN_0; + for (ItemStack stack : butterfly.getGenome().getCocoon().getCocoonLoot().keySet()) { + Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(stack, guiAlyzer.getGuiLeft() + x, guiAlyzer.getGuiTop() + textLayout.getLineY()); + x += 18; + if (x > 148) { + x = GuiAlyzer.COLUMN_0; + textLayout.newLine(); + } + } + textLayout.endPage(); } } diff --git a/src/main/java/forestry/lepidopterology/genetics/alleles/ButterflyAlleles.java b/src/main/java/forestry/lepidopterology/genetics/alleles/ButterflyAlleles.java index 51684a752..6ce39bbbe 100644 --- a/src/main/java/forestry/lepidopterology/genetics/alleles/ButterflyAlleles.java +++ b/src/main/java/forestry/lepidopterology/genetics/alleles/ButterflyAlleles.java @@ -7,7 +7,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.IAlleleButterflyCocoon; import forestry.api.lepidopterology.IAlleleButterflyEffect; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.items.ItemRegistryCore; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -39,7 +39,7 @@ public class ButterflyAlleles { cocoonDefault.addLoot(new ItemStack(Items.STRING), 0.75F); cocoonDefault.addLoot(new ItemStack(Items.STRING, 3), 0.25F); - ItemRegistryCore itemRegistry = PluginCore.getItems(); + ItemRegistryCore itemRegistry = ModuleCore.getItems(); cocoonSilk.addLoot(new ItemStack(itemRegistry.craftingMaterial, 3, 2), 0.75F); cocoonSilk.addLoot(new ItemStack(itemRegistry.craftingMaterial, 2, 2), 0.25F); } diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index 4c3b94939..016ed0b8c 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -59,7 +59,7 @@ import forestry.core.utils.EntityUtil; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.NetworkUtil; import forestry.core.utils.Translator; -import forestry.lepidopterology.PluginLepidopterology; +import forestry.lepidopterology.ModuleLepidopterology; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.genetics.ButterflyGenome; @@ -142,7 +142,7 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IColored return false; } - if (entityItem.world.countEntities(EntityButterfly.class) > PluginLepidopterology.entityConstraint) { + if (entityItem.world.countEntities(EntityButterfly.class) > ModuleLepidopterology.entityConstraint) { return false; } diff --git a/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java b/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java index 7fab7a706..f7b2a6a7f 100755 --- a/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java +++ b/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java @@ -33,7 +33,7 @@ import forestry.api.lepidopterology.IButterfly; import forestry.core.config.Constants; import forestry.core.tiles.TileUtil; import forestry.core.utils.BlockUtil; -import forestry.lepidopterology.PluginLepidopterology; +import forestry.lepidopterology.ModuleLepidopterology; import forestry.lepidopterology.tiles.TileCocoon; public abstract class CocoonDecorator { @@ -60,7 +60,7 @@ public abstract class CocoonDecorator { } public static boolean genCocoon(World world, Random rand, int chunkX, int chunkZ, IButterfly butterfly) { - if (butterfly.getGenome().getPrimary().getRarity() * PluginLepidopterology.getGenerateCocoonsAmount() < rand.nextFloat() * 100.0f) { + if (butterfly.getGenome().getPrimary().getRarity() * ModuleLepidopterology.getGenerateCocoonsAmount() < rand.nextFloat() * 100.0f) { return false; } @@ -110,7 +110,7 @@ public abstract class CocoonDecorator { } private static boolean setCocoon(World world, BlockPos pos, IButterfly butterfly) { - Block cocoonBlock = PluginLepidopterology.getBlocks().solidCocoon; + Block cocoonBlock = ModuleLepidopterology.getBlocks().solidCocoon; boolean placed = world.setBlockState(pos, cocoonBlock.getDefaultState(), Constants.FLAG_BLOCK_SYNC); if (!placed) { return false; diff --git a/src/main/java/forestry/mail/LetterProperties.java b/src/main/java/forestry/mail/LetterProperties.java index c4fafe98d..b4bec2cc7 100644 --- a/src/main/java/forestry/mail/LetterProperties.java +++ b/src/main/java/forestry/mail/LetterProperties.java @@ -13,9 +13,6 @@ package forestry.mail; import java.util.ArrayList; import java.util.List; -import forestry.api.core.IModelManager; -import forestry.api.mail.ILetter; -import forestry.mail.items.ItemLetter; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -23,9 +20,14 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.mail.ILetter; +import forestry.mail.items.ItemLetter; + public class LetterProperties { private enum State { FRESH, STAMPED, OPENED, EMPTIED @@ -38,7 +40,7 @@ public class LetterProperties { public static ItemStack createStampedLetterStack(ILetter letter) { Size size = getSize(letter); int meta = encodeMeta(State.STAMPED, size); - return new ItemStack(PluginMail.getItems().letters, 1, meta); + return new ItemStack(ModuleMail.getItems().letters, 1, meta); } public static void closeLetter(ItemStack parent, ILetter letter) { diff --git a/src/main/java/forestry/mail/PluginMail.java b/src/main/java/forestry/mail/ModuleMail.java similarity index 87% rename from src/main/java/forestry/mail/PluginMail.java rename to src/main/java/forestry/mail/ModuleMail.java index 3fec137f6..608912175 100644 --- a/src/main/java/forestry/mail/PluginMail.java +++ b/src/main/java/forestry/mail/ModuleMail.java @@ -10,18 +10,27 @@ ******************************************************************************/ package forestry.mail; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; -import com.google.common.base.Preconditions; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import forestry.api.circuits.ICircuit; import forestry.api.core.ForestryAPI; import forestry.api.mail.EnumAddressee; import forestry.api.mail.PostManager; import forestry.api.recipes.RecipeManagers; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.ISaveEventHandler; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.circuits.EnumCircuitBoardType; import forestry.core.circuits.ItemCircuitBoard; import forestry.core.config.Config; @@ -37,17 +46,12 @@ import forestry.mail.commands.CommandMail; import forestry.mail.items.EnumStampDefinition; import forestry.mail.items.ItemRegistryMail; import forestry.mail.network.PacketRegistryMail; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.MAIL, name = "Mail", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.mail.description") -public class PluginMail extends BlankForestryPlugin { +@ForestryModule(containerID = Constants.MOD_ID, moduleID = ForestryModuleUids.MAIL, name = "Mail", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.mail.description") +public class ModuleMail extends BlankForestryModule { @Nullable private static ItemRegistryMail items; @Nullable @@ -78,9 +82,7 @@ public class PluginMail extends BlankForestryPlugin { @Override public void preInit() { - super.preInit(); - - PluginCore.rootCommand.addChildCommand(new CommandMail()); + ModuleCore.rootCommand.addChildCommand(new CommandMail()); if (Config.mailAlertEnabled) { MinecraftForge.EVENT_BUS.register(new EventHandlerMailAlert()); @@ -95,8 +97,6 @@ public class PluginMail extends BlankForestryPlugin { @Override public void doInit() { - super.doInit(); - BlockRegistryMail blocks = getBlocks(); blocks.mailbox.init(); blocks.tradeStation.init(); @@ -110,15 +110,15 @@ public class PluginMail extends BlankForestryPlugin { @Override public void registerRecipes() { - ItemRegistryCore coreItems = PluginCore.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); ItemRegistryMail items = getItems(); BlockRegistryMail blocks = getBlocks(); ItemStack stampGlue; ItemStack letterGlue; - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - ItemRegistryApiculture beeItems = PluginApiculture.getItems(); + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { + ItemRegistryApiculture beeItems = ModuleApiculture.getItems(); stampGlue = beeItems.honeyDrop.getItemStack(); letterGlue = beeItems.propolis.getWildcard(); } else { diff --git a/src/main/java/forestry/mail/PostOffice.java b/src/main/java/forestry/mail/PostOffice.java index 331955143..07d7cdf3f 100755 --- a/src/main/java/forestry/mail/PostOffice.java +++ b/src/main/java/forestry/mail/PostOffice.java @@ -137,7 +137,7 @@ public class PostOffice extends WorldSavedData implements IPostOffice { if (collected > 0) { EnumStampDefinition stampDefinition = EnumStampDefinition.getFromPostage(postage); - return PluginMail.getItems().stamps.get(stampDefinition, collected); + return ModuleMail.getItems().stamps.get(stampDefinition, collected); } } diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index f6bc22f06..cb6413f09 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -241,6 +241,6 @@ public class PostRegistry implements IPostRegistry { @Override public boolean isLetter(ItemStack itemstack) { - return itemstack.getItem() == PluginMail.getItems().letters; + return itemstack.getItem() == ModuleMail.getItems().letters; } } diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index 14282a5a1..8eb281346 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -232,7 +232,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve if (count > 0) { EnumPostage postage = EnumPostage.values()[i]; EnumStampDefinition stampDefinition = EnumStampDefinition.getFromPostage(postage); - mail.addStamps(PluginMail.getItems().stamps.get(stampDefinition, count)); + mail.addStamps(ModuleMail.getItems().stamps.get(stampDefinition, count)); } } @@ -282,7 +282,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve orderFilledMessage = orderFilledMessage.replace("%SENDER", letter.getSender().getName()); confirm.setText(orderFilledMessage); - confirm.addStamps(PluginMail.getItems().stamps.get(EnumStampDefinition.P_1, 1)); + confirm.addStamps(ModuleMail.getItems().stamps.get(EnumStampDefinition.P_1, 1)); confirm.writeToNBT(nbttagcompound); ItemStack confirmstack = LetterProperties.createStampedLetterStack(confirm); diff --git a/src/main/java/forestry/mail/compat/MailJeiPlugin.java b/src/main/java/forestry/mail/compat/MailJeiPlugin.java index 17b2d8f48..99ca5a6a4 100644 --- a/src/main/java/forestry/mail/compat/MailJeiPlugin.java +++ b/src/main/java/forestry/mail/compat/MailJeiPlugin.java @@ -1,7 +1,7 @@ package forestry.mail.compat; import forestry.core.utils.JeiUtil; -import forestry.mail.PluginMail; +import forestry.mail.ModuleMail; import forestry.mail.blocks.BlockRegistryMail; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; @@ -11,7 +11,7 @@ import mezz.jei.api.JEIPlugin; public class MailJeiPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { - BlockRegistryMail blocks = PluginMail.getBlocks(); + BlockRegistryMail blocks = ModuleMail.getBlocks(); JeiUtil.addDescription(registry, blocks.mailbox, blocks.stampCollector, diff --git a/src/main/java/forestry/modules/BlankForestryModule.java b/src/main/java/forestry/modules/BlankForestryModule.java new file mode 100644 index 000000000..509ec5211 --- /dev/null +++ b/src/main/java/forestry/modules/BlankForestryModule.java @@ -0,0 +1,28 @@ +package forestry.modules; + +import com.google.common.collect.ImmutableSet; + +import java.util.Set; + +import net.minecraft.util.ResourceLocation; + +import forestry.core.config.Constants; + +public class BlankForestryModule implements IForestryModule { + + /** + * The ForestryModule.moduleID()s of any other modules this module depends on. + */ + public Set getDependencyUids(){ + return ImmutableSet.of(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.CORE)); + } + + @Override + public String toString() { + ForestryModule forestryModule = getClass().getAnnotation(ForestryModule.class); + if (forestryModule == null) { + return getClass().getSimpleName(); + } + return forestryModule.name() + " Module"; + } +} diff --git a/src/main/java/forestry/plugins/ForestryPlugin.java b/src/main/java/forestry/modules/ForestryModule.java similarity index 53% rename from src/main/java/forestry/plugins/ForestryPlugin.java rename to src/main/java/forestry/modules/ForestryModule.java index 86adb3c54..b7518f231 100644 --- a/src/main/java/forestry/plugins/ForestryPlugin.java +++ b/src/main/java/forestry/modules/ForestryModule.java @@ -3,31 +3,36 @@ * * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. ******************************************************************************/ -package forestry.plugins; +package forestry.modules; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; /** - * Optional annotation to provide additional information on IPlugins. This information will be available via the "/forestry plugin info $pluginID" command ingame. + * Annotation to provide additional information on IForestryModules. This information will be available via the "/forestry module info {@link #moduleID()}" command ingame. * - * @author SirSengir + * @author Nedelosk */ @Retention(RetentionPolicy.RUNTIME) -public @interface ForestryPlugin { +public @interface ForestryModule { /** - * @return Unique identifier for the plugin, no spaces! + * @return Unique identifier for the module, no spaces! */ - String pluginID(); + String moduleID(); /** - * @return Nice and readable plugin name. + * @return The unique identifier of the module container. + */ + String containerID(); + + /** + * @return Nice and readable module name. */ String name(); /** - * @return ForestryPlugin author's name. + * @return ForestryModule author's name. */ String author() default ""; @@ -36,16 +41,6 @@ public @interface ForestryPlugin { */ String url() default ""; - /** - * @return Version of the plugin, if any. - */ - String version() default ""; - - /** - * @return Localization key for a short description what the plugin does. - */ - String unlocalizedDescription() default ""; - /** * @return Not used (yet?). */ @@ -56,4 +51,19 @@ public @interface ForestryPlugin { */ String lootTable() default ""; + /** + * @return True if this is a core module. + */ + boolean coreModule() default false; + + /** + * @return Version of the module, if any. + */ + String version() default ""; + + /** + * @return Localization key for a short description what the module does. + */ + String unlocalizedDescription() default ""; + } diff --git a/src/main/java/forestry/modules/ForestryModuleUids.java b/src/main/java/forestry/modules/ForestryModuleUids.java new file mode 100644 index 000000000..b87e5c1f9 --- /dev/null +++ b/src/main/java/forestry/modules/ForestryModuleUids.java @@ -0,0 +1,39 @@ +package forestry.modules; + +public class ForestryModuleUids { + //Forestry + public static final String APICULTURE = "apiculture"; + public static final String ARBORICULTURE = "arboriculture"; + public static final String CHARCOAL = "charcoal"; + public static final String CORE = "core"; + public static final String ENERGY = "energy"; + public static final String FACTORY = "factory"; + public static final String FARMING = "farming"; + public static final String GREENHOUSE = "greenhouse"; + public static final String FLUIDS = "fluids"; + public static final String FOOD = "food"; + public static final String LEPIDOPTEROLOGY = "lepidopterology"; + public static final String MAIL = "mail"; + public static final String CRATE = "crates"; + public static final String BACKPACKS = "backpacks"; + public static final String DATABASE = "database"; + + //Mod Plugins + public static final String BIOMES_O_PLENTY = "biomes.o.plenty"; + public static final String BUILDCRAFT_FUELS = "buildcraft.fuels"; + public static final String BUILDCRAFT_RECIPES = "buildcraft.recipes"; + public static final String BUILDCRAFT_STATEMENTS = "buildcraft.statements"; + public static final String BUILDCRAFT_TRANSPORT = "buildcraft.transport"; + public static final String CHISEL = "chisel"; + public static final String ENDER_IO = "ender.io"; + public static final String EXTRA_UTILITIES = "extra.utilities"; + public static final String NATURA = "natura"; + public static final String INDUSTRIALCRAFT2 = "industrialcraft2"; + public static final String ACT_ADD = "actuallyadditions"; + public static final String HARVESTCRAFT = "harvestcraft"; + public static final String IMMERSIVE_ENGINEERING = "immersiveengineering"; + public static final String MAGICAL_AGRICULTURE = "mysticalagriculture"; + public static final String RUSTIC = "rustic"; + public static final String ROOTS = "roots"; + public static final String BETTER_WITH_MODS = "betterwithmods"; +} diff --git a/src/main/java/forestry/modules/ForestryModules.java b/src/main/java/forestry/modules/ForestryModules.java new file mode 100644 index 000000000..8baea15f4 --- /dev/null +++ b/src/main/java/forestry/modules/ForestryModules.java @@ -0,0 +1,46 @@ +package forestry.modules; + +import java.io.File; + +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; + +import forestry.Forestry; +import forestry.core.config.Constants; + +public class ForestryModules implements IModuleContainer { + private static final String MODULE_CONFIG_FILE_NAME = "modules.cfg"; + private static final String CONFIG_CATEGORY = "modules"; + private static Configuration config; + + @Override + public String getID() { + return Constants.MOD_ID; + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public Configuration getModulesConfig() { + return getModulesConfiguration(); + } + + public static final Configuration getModulesConfiguration(){ + if(config == null){ + config = new Configuration(new File(Forestry.instance.getConfigFolder(), MODULE_CONFIG_FILE_NAME)); + } + return config; + } + + @Override + public boolean isModuleEnabled(IForestryModule module) { + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + + String comment = ForestryPluginUtil.getComment(module); + Property prop = getModulesConfig().get(CONFIG_CATEGORY, info.moduleID(), true, comment); + return prop.getBoolean(); + } +} diff --git a/src/main/java/forestry/modules/ForestryPluginUtil.java b/src/main/java/forestry/modules/ForestryPluginUtil.java new file mode 100644 index 000000000..957f6d5aa --- /dev/null +++ b/src/main/java/forestry/modules/ForestryPluginUtil.java @@ -0,0 +1,71 @@ +package forestry.modules; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.translation.I18n; + +import net.minecraftforge.fml.common.discovery.ASMDataTable; + +import forestry.core.utils.Log; + +public class ForestryPluginUtil { + private ForestryPluginUtil() { + + } + + public static Map> getForestryModules(ASMDataTable asmDataTable) { + List instances = getInstances(asmDataTable, ForestryModule.class, IForestryModule.class); + Map> modules = new LinkedHashMap<>(); + for(IForestryModule module : instances){ + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + modules.computeIfAbsent(info.containerID(), k-> new ArrayList<>()).add(module); + } + return modules; + } + + + public static String getComment(IForestryModule module) { + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + + String comment = I18n.translateToLocal(info.unlocalizedDescription()); + Set dependencies = module.getDependencyUids(); + if(!dependencies.isEmpty()){ + Iterator iDependencies = dependencies.iterator(); + + StringBuilder builder = new StringBuilder(comment); + builder.append("\n"); + builder.append("Dependencies: [ "); + builder.append(iDependencies.next()); + while(iDependencies.hasNext()){ + ResourceLocation uid = iDependencies.next(); + builder.append(", ").append(uid.toString()); + } + builder.append(" ]"); + comment = builder.toString(); + } + return comment; + } + + private static List getInstances(ASMDataTable asmDataTable, Class annotationClass, Class instanceClass) { + String annotationClassName = annotationClass.getCanonicalName(); + Set asmDatas = asmDataTable.getAll(annotationClassName); + List instances = new ArrayList<>(); + for (ASMDataTable.ASMData asmData : asmDatas) { + try { + Class asmClass = Class.forName(asmData.getClassName()); + Class asmInstanceClass = asmClass.asSubclass(instanceClass); + T instance = asmInstanceClass.newInstance(); + instances.add(instance); + } catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) { + Log.error("Failed to load: {}", asmData.getClassName(), e); + } + } + return instances; + } +} diff --git a/src/main/java/forestry/modules/IForestryModule.java b/src/main/java/forestry/modules/IForestryModule.java new file mode 100644 index 000000000..16e720da5 --- /dev/null +++ b/src/main/java/forestry/modules/IForestryModule.java @@ -0,0 +1,116 @@ +package forestry.modules; + +import javax.annotation.Nullable; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.Set; + +import net.minecraft.command.ICommand; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.gen.IChunkGenerator; + +import net.minecraftforge.fml.common.event.FMLInterModComms; + +import forestry.core.IPickupHandler; +import forestry.core.IResupplyHandler; +import forestry.core.ISaveEventHandler; +import forestry.core.network.IPacketRegistry; + +public interface IForestryModule { + default boolean isAvailable() { + return true; + } + + default boolean canBeDisabled() { + return true; + } + + default String getFailMessage() { + return ""; + } + + /** + * The ForestryModule.moduleID()s of any other modules this module depends on. + */ + default Set getDependencyUids(){ + return Collections.emptySet(); + } + + default void setupAPI() { + } + + default void disabledSetupAPI() { + } + + default void registerItemsAndBlocks() { + } + + default void preInit() { + } + + default void registerTriggers() { + } + + default void registerBackpackItems() { + } + + default void registerCrates() { + } + + default void doInit() { + } + + default void registerRecipes(){ + } + + default void addLootPoolNames(Set lootPoolNames){ + } + + default void postInit(){ + } + + default boolean processIMCMessage(FMLInterModComms.IMCMessage message){ + return false; + } + + default void populateChunk(IChunkGenerator chunkGenerator, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated){ + } + + default void populateChunkRetroGen(World world, Random rand, int chunkX, int chunkZ){ + } + + default void decorateBiome(World world, Random rand, BlockPos pos){ + } + + default void getHiddenItems(List hiddenItems){ + } + + @Nullable + default ISaveEventHandler getSaveEventHandler(){ + return null; + } + + @Nullable + default IPacketRegistry getPacketRegistry(){ + return null; + } + + @Nullable + default IPickupHandler getPickupHandler(){ + return null; + } + + @Nullable + default IResupplyHandler getResupplyHandler(){ + return null; + } + + @Nullable + default ICommand[] getConsoleCommands(){ + return null; + } +} diff --git a/src/main/java/forestry/modules/IModuleContainer.java b/src/main/java/forestry/modules/IModuleContainer.java new file mode 100644 index 000000000..8c9e6969b --- /dev/null +++ b/src/main/java/forestry/modules/IModuleContainer.java @@ -0,0 +1,19 @@ +package forestry.modules; + +import net.minecraftforge.common.config.Configuration; + +public interface IModuleContainer { + /** + * @return Unique identifier for the module container, no spaces! + */ + String getID(); + + boolean isAvailable(); + + Configuration getModulesConfig(); + + /** + * @return true if the module is enabled in the config file of this container. + */ + boolean isModuleEnabled(IForestryModule module); +} diff --git a/src/main/java/forestry/modules/IModuleManager.java b/src/main/java/forestry/modules/IModuleManager.java new file mode 100644 index 000000000..e075c1344 --- /dev/null +++ b/src/main/java/forestry/modules/IModuleManager.java @@ -0,0 +1,18 @@ +package forestry.modules; + +import java.util.Collection; + +import net.minecraft.util.ResourceLocation; + +public interface IModuleManager { + + default boolean isModuleEnabled(String containerID, String moduleID){ + return isModuleEnabled(new ResourceLocation(containerID, moduleID)); + } + + boolean isModuleEnabled(ResourceLocation id); + + void registerContainers(IModuleContainer... container); + + Collection getContainers(); +} diff --git a/src/main/java/forestry/modules/ModuleManager.java b/src/main/java/forestry/modules/ModuleManager.java new file mode 100644 index 000000000..1862c4ba8 --- /dev/null +++ b/src/main/java/forestry/modules/ModuleManager.java @@ -0,0 +1,417 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.modules; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.stream.Collectors; + +import net.minecraft.command.CommandHandler; +import net.minecraft.command.ICommand; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.gen.IChunkGenerator; + +import net.minecraftforge.common.config.Configuration; + +import net.minecraftforge.fml.common.discovery.ASMDataTable; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.relauncher.Side; + +import forestry.api.core.ForestryAPI; +import forestry.core.IPickupHandler; +import forestry.core.IResupplyHandler; +import forestry.core.ISaveEventHandler; +import forestry.core.config.Constants; +import forestry.core.network.IPacketRegistry; +import forestry.core.utils.Log; + +public class ModuleManager implements IModuleManager{ + + private static final String CONFIG_CATEGORY = "modules"; + private static ModuleManager ourInstance = new ModuleManager(); + + public static final ArrayList pickupHandlers = Lists.newArrayList(); + public static final ArrayList saveEventHandlers = Lists.newArrayList(); + public static final ArrayList resupplyHandlers = Lists.newArrayList(); + + private static final HashMap sortedModules = new LinkedHashMap<>(); + private static final Set loadedModules = new LinkedHashSet<>(); + private static final Set unloadedModules = new LinkedHashSet<>(); + private static final HashMap moduleContainers = new HashMap<>(); + public static final Set configDisabledModules = new HashSet<>(); + private static Stage stage = Stage.SETUP; + + public enum Stage { + SETUP, // setup API to make it functional. GameMode Configs are not yet accessible + SETUP_DISABLED, // setup fallback API to avoid crashes + REGISTER, // register basic blocks and items + PRE_INIT, // register handlers, triggers, definitions, and anything that depends on basic items + BACKPACKS_CRATES, // backpacks, crates + INIT, // anything that depends on PreInit stages, recipe registration + POST_INIT, // stubborn mod integration, dungeon loot, and finalization of things that take input from mods + FINISHED + } + + private ModuleManager() { + } + + public static ModuleManager getInstance() { + return ourInstance; + } + + @Override + public boolean isModuleEnabled(ResourceLocation id) { + return sortedModules.get(id) != null; + } + + @Override + public void registerContainers(IModuleContainer... containers) { + for(IModuleContainer container : containers) { + Preconditions.checkNotNull(container); + moduleContainers.put(container.getID(), container); + } + } + + @Override + public Collection getContainers() { + return moduleContainers.values(); + } + + public static Stage getStage() { + return stage; + } + + public static Set getLoadedModules() { + return ImmutableSet.copyOf(sortedModules.values()); + } + + private static void registerHandlers(IForestryModule module, Side side) { + Log.debug("Registering Handlers for Module: {}", module); + + IPacketRegistry packetRegistry = module.getPacketRegistry(); + if (packetRegistry != null) { + packetRegistry.registerPacketsServer(); + if (side == Side.CLIENT) { + packetRegistry.registerPacketsClient(); + } + } + + IPickupHandler pickupHandler = module.getPickupHandler(); + if (pickupHandler != null) { + pickupHandlers.add(pickupHandler); + } + + ISaveEventHandler saveHandler = module.getSaveEventHandler(); + if (saveHandler != null) { + saveEventHandlers.add(saveHandler); + } + + IResupplyHandler resupplyHandler = module.getResupplyHandler(); + if (resupplyHandler != null) { + resupplyHandlers.add(resupplyHandler); + } + } + + private static IForestryModule getModuleCore(List forestryModules) { + for (IForestryModule module : forestryModules) { + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + if (module.isAvailable() && info.coreModule()) { + return module; + } + } + return null; + } + + private static IForestryModule getCoreModule(List modules, String containerID) { + for (IForestryModule module : modules) { + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + if (info.coreModule()) { + return module; + } + } + throw new IllegalStateException("Could not find core module for the container " + containerID); + } + + private static void configureModules(Map> modules) { + Locale locale = Locale.getDefault(); + Locale.setDefault(Locale.ENGLISH); + + Set toLoad = new HashSet<>(); + Set modulesToLoad = new HashSet<>(); + + ImmutableList allModules = ImmutableList.copyOf(modules.values().stream().flatMap(x -> x.stream()).collect(Collectors.toList())); + + for(IModuleContainer container : moduleContainers.values()){ + String containerID = container.getID(); + List containerModules = modules.get(containerID); + Configuration config = container.getModulesConfig(); + + config.load(); + config.addCustomCategoryComment(CONFIG_CATEGORY, "Disabling these modules can greatly change how the mod functions.\n" + + "Your mileage may vary, please report any issues."); + IForestryModule coreModule = getModuleCore(containerModules); + if(coreModule != null) { + containerModules.remove(coreModule); + containerModules.add(0, coreModule); + }else{ + Log.debug("Could not find core module for the module container: {}", containerID); + } + + Iterator iterator = containerModules.iterator(); + while (iterator.hasNext()) { + IForestryModule module = iterator.next(); + if(!container.isAvailable()){ + iterator.remove(); + Log.info("Module disabled: {}", module); + continue; + } + if (module.canBeDisabled()) { + if (!container.isModuleEnabled(module)) { + configDisabledModules.add(module); + iterator.remove(); + Log.info("Module disabled: {}", module); + continue; + } + if (!module.isAvailable()) { + iterator.remove(); + Log.info("Module {} failed to load: {}", module, module.getFailMessage()); + continue; + } + } + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + toLoad.add(new ResourceLocation(containerID, info.moduleID())); + modulesToLoad.add(module); + } + } + + //Check Dependencies + Iterator iterator; + boolean changed; + do { + changed = false; + iterator = modulesToLoad.iterator(); + while (iterator.hasNext()) { + IForestryModule module = iterator.next(); + Set dependencies = module.getDependencyUids(); + if (!toLoad.containsAll(dependencies)) { + iterator.remove(); + changed = true; + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + String moduleId = info.moduleID(); + toLoad.remove(moduleId); + Log.warning("Module {} is missing dependencies: {}", moduleId, dependencies); + } + } + } while (changed); + + //Sort Modules + do { + changed = false; + iterator = modulesToLoad.iterator(); + while (iterator.hasNext()) { + IForestryModule module = iterator.next(); + if (sortedModules.keySet().containsAll(module.getDependencyUids())) { + iterator.remove(); + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + sortedModules.put(new ResourceLocation(info.containerID(), info.moduleID()), module); + changed = true; + break; + } + } + } while (changed); + + for(IModuleContainer container : moduleContainers.values()){ + Configuration config = container.getModulesConfig(); + if(config.hasChanged()){ + config.save(); + } + } + + loadedModules.addAll(sortedModules.values()); + unloadedModules.addAll(allModules); + unloadedModules.removeAll(sortedModules.values()); + + ForestryAPI.enabledModules = new HashSet<>(); + for (IForestryModule module : sortedModules.values()) { + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + ForestryAPI.enabledModules.add(new ResourceLocation(info.containerID(), info.moduleID())); + } + + Locale.setDefault(locale); + } + + public static void runSetup(FMLPreInitializationEvent event) { + + ASMDataTable asmDataTable = event.getAsmData(); + Map> forestryModules = ForestryPluginUtil.getForestryModules(asmDataTable); + + stage = Stage.SETUP; + configureModules(forestryModules); + + for (IForestryModule module : loadedModules) { + Log.debug("Setup API Start: {}", module); + module.setupAPI(); + Log.debug("Setup API Complete: {}", module); + } + + stage = Stage.SETUP_DISABLED; + for (IForestryModule module : unloadedModules) { + Log.debug("Disabled-Setup Start: {}", module); + module.disabledSetupAPI(); + Log.debug("Disabled-Setup Complete: {}", module); + } + + stage = Stage.REGISTER; + for (IForestryModule module : loadedModules) { + Log.debug("Register Items and Blocks Start: {}", module); + module.registerItemsAndBlocks(); + Log.debug("Register Items and Blocks Complete: {}", module); + } + } + + public static void runPreInit(Side side) { + stage = Stage.PRE_INIT; + for (IForestryModule module : loadedModules) { + Log.debug("Pre-Init Start: {}", module); + registerHandlers(module, side); + module.preInit(); + if (getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.BUILDCRAFT_STATEMENTS)) { + module.registerTriggers(); + } + Log.debug("Pre-Init Complete: {}", module); + } + } + + public static void runRegisterBackpacksAndCrates() { + stage = Stage.BACKPACKS_CRATES; + for (IForestryModule module : loadedModules) { + if (getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.CRATE)) { + Log.debug("BackpacksAndCrates Start: {}", module); + module.registerBackpackItems(); + module.registerCrates(); + Log.debug("BackpacksAndCrates Complete: {}", module); + } + } + } + + public static void runInit() { + stage = Stage.INIT; + for (IForestryModule module : loadedModules) { + Log.debug("Init Start: {}", module); + module.doInit(); + module.registerRecipes(); + Log.debug("Init Complete: {}", module); + } + } + + public static void runPostInit() { + stage = Stage.POST_INIT; + for (IForestryModule module : loadedModules) { + Log.debug("Post-Init Start: {}", module); + module.postInit(); + Log.debug("Post-Init Complete: {}", module); + } + + stage = Stage.FINISHED; + } + + public static void serverStarting(MinecraftServer server) { + CommandHandler commandManager = (CommandHandler) server.getCommandManager(); + + for (IForestryModule module : loadedModules) { + ICommand[] commands = module.getConsoleCommands(); + if (commands == null) { + continue; + } + for (ICommand command : commands) { + commandManager.registerCommand(command); + } + } + } + + public static void processIMCMessages(ImmutableList messages) { + for (FMLInterModComms.IMCMessage message : messages) { + for (IForestryModule module : loadedModules) { + if (module.processIMCMessage(message)) { + break; + } + } + } + } + + public static void populateChunk(IChunkGenerator chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated) { + for (IForestryModule module : loadedModules) { + module.populateChunk(chunkProvider, world, rand, chunkX, chunkZ, hasVillageGenerated); + } + } + + public static void decorateBiome(World world, Random rand, BlockPos pos) { + for (IForestryModule module : loadedModules) { + module.decorateBiome(world, rand, pos); + } + } + + public static void populateChunkRetroGen(World world, Random rand, int chunkX, int chunkZ) { + for (IForestryModule module : loadedModules) { + module.populateChunkRetroGen(world, rand, chunkX, chunkZ); + } + } + + + public static List getHiddenItems() { + List hiddenItems = new ArrayList<>(); + for (IForestryModule module : loadedModules) { + module.getHiddenItems(hiddenItems); + } + return hiddenItems; + } + + + public static Set getLootPoolNames() { + Set lootPoolNames = new HashSet<>(); + for (IForestryModule module : loadedModules) { + module.addLootPoolNames(lootPoolNames); + } + return lootPoolNames; + } + + public static Set getLootTableFiles() { + Set lootTableNames = new HashSet<>(); + for (IForestryModule module : loadedModules) { + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + String lootTableFolder = info.lootTable(); + if (!lootTableFolder.isEmpty()) { + lootTableNames.add(lootTableFolder); + } + } + return lootTableNames; + } +} diff --git a/src/main/java/forestry/modules/package-info.java b/src/main/java/forestry/modules/package-info.java new file mode 100644 index 000000000..6c7a82cba --- /dev/null +++ b/src/main/java/forestry/modules/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package forestry.modules; + +import javax.annotation.ParametersAreNonnullByDefault; + +import forestry.core.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/forestry/plugins/BlankForestryPlugin.java b/src/main/java/forestry/plugins/BlankForestryPlugin.java deleted file mode 100755 index b143b3705..000000000 --- a/src/main/java/forestry/plugins/BlankForestryPlugin.java +++ /dev/null @@ -1,162 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins; - -import javax.annotation.Nullable; -import java.util.HashSet; -import java.util.List; -import java.util.Random; -import java.util.Set; - -import net.minecraft.command.ICommand; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.gen.IChunkGenerator; - -import net.minecraftforge.fml.common.IFuelHandler; -import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; - -import forestry.core.IPickupHandler; -import forestry.core.IResupplyHandler; -import forestry.core.ISaveEventHandler; -import forestry.core.network.IPacketRegistry; - -public abstract class BlankForestryPlugin implements IForestryPlugin { - - @Override - public boolean isAvailable() { - return true; - } - - @Override - public boolean canBeDisabled() { - return true; - } - - @Override - public String getFailMessage() { - return ""; - } - - @Override - public Set getDependencyUids() { - Set dependencyUids = new HashSet<>(); - dependencyUids.add(ForestryPluginUids.CORE); - return dependencyUids; - } - - @Override - public void setupAPI() { - } - - @Override - public void disabledSetupAPI() { - } - - @Override - public void registerItemsAndBlocks() { - } - - @Override - public void preInit() { - } - - @Override - public void registerTriggers() { - } - - @Override - public void registerBackpackItems() { - } - - @Override - public void registerCrates() { - } - - @Override - public void doInit() { - } - - @Override - public void registerRecipes() { - } - - @Override - public void addLootPoolNames(Set lootPoolNames) { - - } - - @Override - public void postInit() { - } - - @Override - public boolean processIMCMessage(IMCMessage message) { - return false; - } - - @Override - public void populateChunk(IChunkGenerator chunkGenerator, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated) { - } - - @Override - public void populateChunkRetroGen(World world, Random rand, int chunkX, int chunkZ) { - } - - @Override - public void decorateBiome(World world, Random rand, BlockPos pos) { - } - - @Override - public void getHiddenItems(List hiddenItems) { - } - - @Nullable - @Override - public ISaveEventHandler getSaveEventHandler() { - return null; - } - - @Nullable - @Override - public IPacketRegistry getPacketRegistry() { - return null; - } - - @Nullable - @Override - public IPickupHandler getPickupHandler() { - return null; - } - - @Nullable - @Override - public IResupplyHandler getResupplyHandler() { - return null; - } - - @Nullable - @Override - public ICommand[] getConsoleCommands() { - return null; - } - - @Override - public String toString() { - ForestryPlugin forestryPlugin = getClass().getAnnotation(ForestryPlugin.class); - if (forestryPlugin == null) { - return getClass().getSimpleName(); - } - return forestryPlugin.name() + " Plugin"; - } - -} diff --git a/src/main/java/forestry/plugins/compat/BlockRegistryIC2.java b/src/main/java/forestry/plugins/BlockRegistryIC2.java similarity index 95% rename from src/main/java/forestry/plugins/compat/BlockRegistryIC2.java rename to src/main/java/forestry/plugins/BlockRegistryIC2.java index 95a073881..e62234f55 100644 --- a/src/main/java/forestry/plugins/compat/BlockRegistryIC2.java +++ b/src/main/java/forestry/plugins/BlockRegistryIC2.java @@ -1,4 +1,4 @@ -package forestry.plugins.compat; +package forestry.plugins; import forestry.core.blocks.BlockBase; import forestry.core.blocks.BlockRegistry; diff --git a/src/main/java/forestry/plugins/compat/CompatPlugin.java b/src/main/java/forestry/plugins/CompatPlugin.java similarity index 69% rename from src/main/java/forestry/plugins/compat/CompatPlugin.java rename to src/main/java/forestry/plugins/CompatPlugin.java index b1949b1c7..a3120f9a0 100644 --- a/src/main/java/forestry/plugins/compat/CompatPlugin.java +++ b/src/main/java/forestry/plugins/CompatPlugin.java @@ -1,4 +1,4 @@ -package forestry.plugins.compat; +package forestry.plugins; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -10,14 +10,16 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.fml.common.registry.ForgeRegistries; +import forestry.api.storage.BackpackManager; import forestry.core.utils.Log; import forestry.core.utils.ModUtil; -import forestry.plugins.BlankForestryPlugin; +import forestry.modules.BlankForestryModule; -public abstract class CompatPlugin extends BlankForestryPlugin { +public abstract class CompatPlugin extends BlankForestryModule { protected final String modName; protected final String modID; @@ -79,4 +81,21 @@ public abstract class CompatPlugin extends BlankForestryPlugin { } return fluid; } + + protected void addBlocksToBackpack(String backpackUid, String... blockNames) { + for (String blockName : blockNames) { + Block block = getBlock(blockName); + if (block != null) { + Item item = Item.getItemFromBlock(block); + ItemStack blockStack = new ItemStack(item, 1, OreDictionary.WILDCARD_VALUE); + if (!blockStack.isEmpty()) { + BackpackManager.backpackInterface.addItemToForestryBackpack(backpackUid, blockStack); + } else { + Log.warning("Could not find an item for block: {}", blockName); + } + } else { + Log.warning("Missing block: {}", blockName); + } + } + } } diff --git a/src/main/java/forestry/plugins/ForestryCompatPlugins.java b/src/main/java/forestry/plugins/ForestryCompatPlugins.java new file mode 100644 index 000000000..8abc67400 --- /dev/null +++ b/src/main/java/forestry/plugins/ForestryCompatPlugins.java @@ -0,0 +1,41 @@ +package forestry.plugins; + +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; + +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModules; +import forestry.modules.ForestryPluginUtil; +import forestry.modules.IForestryModule; +import forestry.modules.IModuleContainer; + +public class ForestryCompatPlugins implements IModuleContainer { + private static final String MODULE_CONFIG_FILE_NAME = "modules.cfg"; + private static final String CONFIG_CATEGORY = "modules.plugins"; + public static final String ID = "forestry_compat"; + private Configuration config; + + @Override + public String getID() { + return ID; + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public Configuration getModulesConfig() { + return ForestryModules.getModulesConfiguration(); + } + + @Override + public boolean isModuleEnabled(IForestryModule module) { + ForestryModule info = module.getClass().getAnnotation(ForestryModule.class); + + String comment = ForestryPluginUtil.getComment(module); + Property prop = getModulesConfig().get(CONFIG_CATEGORY, info.moduleID(), true, comment); + return prop.getBoolean(); + } +} diff --git a/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java b/src/main/java/forestry/plugins/ForestryJeiPlugin.java similarity index 78% rename from src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java rename to src/main/java/forestry/plugins/ForestryJeiPlugin.java index 16540c81c..a09ce4a39 100644 --- a/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java +++ b/src/main/java/forestry/plugins/ForestryJeiPlugin.java @@ -1,31 +1,34 @@ -package forestry.plugins.compat; +package forestry.plugins; import java.util.List; -import forestry.core.PluginCore; +import net.minecraft.item.ItemStack; + +import forestry.core.ModuleCore; import forestry.core.blocks.BlockRegistryCore; import forestry.core.items.ItemRegistryCore; import forestry.core.utils.JeiUtil; -import forestry.plugins.PluginManager; +import forestry.modules.ModuleManager; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import mezz.jei.api.ingredients.IIngredientBlacklist; -import net.minecraft.item.ItemStack; @JEIPlugin +@SuppressWarnings("unused") public class ForestryJeiPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { IJeiHelpers jeiHelpers = registry.getJeiHelpers(); IIngredientBlacklist ingredientBlacklist = jeiHelpers.getIngredientBlacklist(); - List hiddenItems = PluginManager.getHiddenItems(); + List hiddenItems = ModuleManager.getHiddenItems(); for (ItemStack hiddenItem : hiddenItems) { ingredientBlacklist.addIngredientToBlacklist(hiddenItem); } - ItemRegistryCore items = PluginCore.getItems(); + ItemRegistryCore items = ModuleCore.getItems(); JeiUtil.addDescription(registry, items.solderingIron, @@ -37,7 +40,7 @@ public class ForestryJeiPlugin implements IModPlugin { items.fertilizerCompound ); - BlockRegistryCore blocks = PluginCore.getBlocks(); + BlockRegistryCore blocks = ModuleCore.getBlocks(); JeiUtil.addDescription(registry, blocks.analyzer, diff --git a/src/main/java/forestry/plugins/ForestryPluginUids.java b/src/main/java/forestry/plugins/ForestryPluginUids.java deleted file mode 100644 index 7da9fa8b9..000000000 --- a/src/main/java/forestry/plugins/ForestryPluginUids.java +++ /dev/null @@ -1,35 +0,0 @@ -package forestry.plugins; - -public class ForestryPluginUids { - public static final String APICULTURE = "forestry.apiculture"; - public static final String ARBORICULTURE = "forestry.arboriculture"; - public static final String CORE = "forestry.core"; - public static final String ENERGY = "forestry.energy"; - public static final String FACTORY = "forestry.factory"; - public static final String FARMING = "forestry.farming"; - public static final String GREENHOUSE = "forestry.greenhouse"; - public static final String FLUIDS = "forestry.fluids"; - public static final String FOOD = "forestry.food"; - public static final String LEPIDOPTEROLOGY = "forestry.lepidopterology"; - public static final String MAIL = "forestry.mail"; - public static final String STORAGE = "forestry.storage"; - - public static final String BIOMES_O_PLENTY = "forestry.biomes.o.plenty"; - public static final String BUILDCRAFT_FUELS = "forestry.buildcraft.fuels"; - public static final String BUILDCRAFT_RECIPES = "forestry.buildcraft.recipes"; - public static final String BUILDCRAFT_STATEMENTS = "forestry.buildcraft.statements"; - public static final String BUILDCRAFT_TRANSPORT = "forestry.buildcraft.transport"; - public static final String CHISEL = "forestry.chisel"; - public static final String ENDER_IO = "forestry.ender.io"; - public static final String MALISIS_DOORES = "forestry.malisis.doors"; - public static final String EXTRA_UTILITIES = "forestry.extra.utilities"; - public static final String NATURA = "forestry.natura"; - public static final String INDUSTRIALCRAFT2 = "forestry.industrialcraft2"; - public static final String ACT_ADD = "forestry.actuallyadditions"; - public static final String HARVESTCRAFT = "forestry.harvestcraft"; - public static final String IMMERSIVE_ENGINEERING = "forestry.immersiveengineering"; - public static final String MAGICAL_AGRICULTURE = "forestry.mysticalagriculture"; - public static final String RUSTIC = "forestry.rustic"; - public static final String ROOTS = "forestry.roots"; - public static final String BETTER_WITH_MODS = "forestry.betterwithmods"; -} diff --git a/src/main/java/forestry/plugins/ForestryPluginUtil.java b/src/main/java/forestry/plugins/ForestryPluginUtil.java deleted file mode 100644 index 6671391ec..000000000 --- a/src/main/java/forestry/plugins/ForestryPluginUtil.java +++ /dev/null @@ -1,35 +0,0 @@ -package forestry.plugins; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import forestry.core.utils.Log; -import net.minecraftforge.fml.common.discovery.ASMDataTable; - -public class ForestryPluginUtil { - private ForestryPluginUtil() { - - } - - public static List getForestryPlugins(ASMDataTable asmDataTable) { - return getInstances(asmDataTable, ForestryPlugin.class, IForestryPlugin.class); - } - - private static List getInstances(ASMDataTable asmDataTable, Class annotationClass, Class instanceClass) { - String annotationClassName = annotationClass.getCanonicalName(); - Set asmDatas = asmDataTable.getAll(annotationClassName); - List instances = new ArrayList<>(); - for (ASMDataTable.ASMData asmData : asmDatas) { - try { - Class asmClass = Class.forName(asmData.getClassName()); - Class asmInstanceClass = asmClass.asSubclass(instanceClass); - T instance = asmInstanceClass.newInstance(); - instances.add(instance); - } catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) { - Log.error("Failed to load: {}", asmData.getClassName(), e); - } - } - return instances; - } -} diff --git a/src/main/java/forestry/plugins/IForestryPlugin.java b/src/main/java/forestry/plugins/IForestryPlugin.java deleted file mode 100755 index e95273d2b..000000000 --- a/src/main/java/forestry/plugins/IForestryPlugin.java +++ /dev/null @@ -1,80 +0,0 @@ -package forestry.plugins; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.Random; -import java.util.Set; - -import net.minecraft.command.ICommand; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.gen.IChunkGenerator; - -import net.minecraftforge.fml.common.IFuelHandler; -import net.minecraftforge.fml.common.event.FMLInterModComms; - -import forestry.core.IPickupHandler; -import forestry.core.IResupplyHandler; -import forestry.core.ISaveEventHandler; -import forestry.core.network.IPacketRegistry; - -public interface IForestryPlugin { - boolean isAvailable(); - - boolean canBeDisabled(); - - String getFailMessage(); - - /** - * See ForestryPlugin.pluginID() - */ - Set getDependencyUids(); - - void setupAPI(); - - void disabledSetupAPI(); - - void registerItemsAndBlocks(); - - void preInit(); - - void registerTriggers(); - - void registerBackpackItems(); - - void registerCrates(); - - void doInit(); - - void registerRecipes(); - - void addLootPoolNames(Set lootPoolNames); - - void postInit(); - - boolean processIMCMessage(FMLInterModComms.IMCMessage message); - - void populateChunk(IChunkGenerator chunkGenerator, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated); - - void populateChunkRetroGen(World world, Random rand, int chunkX, int chunkZ); - - void decorateBiome(World world, Random rand, BlockPos pos); - - void getHiddenItems(List hiddenItems); - - @Nullable - ISaveEventHandler getSaveEventHandler(); - - @Nullable - IPacketRegistry getPacketRegistry(); - - @Nullable - IPickupHandler getPickupHandler(); - - @Nullable - IResupplyHandler getResupplyHandler(); - - @Nullable - ICommand[] getConsoleCommands(); -} diff --git a/src/main/java/forestry/plugins/compat/PluginActuallyAdditions.java b/src/main/java/forestry/plugins/PluginActuallyAdditions.java similarity index 81% rename from src/main/java/forestry/plugins/compat/PluginActuallyAdditions.java rename to src/main/java/forestry/plugins/PluginActuallyAdditions.java index 2af5f2d04..4f1e2aa6b 100644 --- a/src/main/java/forestry/plugins/compat/PluginActuallyAdditions.java +++ b/src/main/java/forestry/plugins/PluginActuallyAdditions.java @@ -1,4 +1,4 @@ -package forestry.plugins.compat; +package forestry.plugins; import javax.annotation.Nullable; import java.util.Arrays; @@ -7,18 +7,21 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import forestry.api.core.ForestryAPI; import forestry.api.recipes.RecipeManagers; +import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.farming.logic.FarmableAgingCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.ACT_ADD, name = "Actually Additions", author = "Ellpeck", url = "http://ellpeck.de/actadd", unlocalizedDescription = "for.plugin.actuallyadditions.description") +@SuppressWarnings("unused") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.ACT_ADD, name = "Actually Additions", author = "Ellpeck", url = "http://ellpeck.de/actadd", unlocalizedDescription = "for.module.actuallyadditions.description") public class PluginActuallyAdditions extends CompatPlugin { private static final String ACT_ADD = "actuallyadditions"; @@ -35,7 +38,7 @@ public class PluginActuallyAdditions extends CompatPlugin { Item coffeeSeed = getItem("item_coffee_seed"); //add farm seed planting - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) { registerSeedPlant(canolaSeed, "block_canola"); registerSeedPlant(flaxSeed, "block_flax"); registerSeedPlant(riceSeed, "block_rice"); diff --git a/src/main/java/forestry/plugins/compat/PluginBetterWithMods.java b/src/main/java/forestry/plugins/PluginBetterWithMods.java similarity index 81% rename from src/main/java/forestry/plugins/compat/PluginBetterWithMods.java rename to src/main/java/forestry/plugins/PluginBetterWithMods.java index 9ccc16281..bbade4b1a 100644 --- a/src/main/java/forestry/plugins/compat/PluginBetterWithMods.java +++ b/src/main/java/forestry/plugins/PluginBetterWithMods.java @@ -1,4 +1,4 @@ -package forestry.plugins.compat; +package forestry.plugins; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; @@ -13,10 +13,11 @@ import forestry.api.recipes.RecipeManagers; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.farming.logic.FarmableDoubleCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.BETTER_WITH_MODS, name = "Better With Mods", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.plugin.betterwithmods.description") +@SuppressWarnings("unused") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.BETTER_WITH_MODS, name = "Better With Mods", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.module.betterwithmods.description") public class PluginBetterWithMods extends CompatPlugin { public PluginBetterWithMods() { super("Better With Mods", "betterwithmods"); diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/PluginBiomesOPlenty.java similarity index 76% rename from src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java rename to src/main/java/forestry/plugins/PluginBiomesOPlenty.java index f05b9a942..053f22333 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/PluginBiomesOPlenty.java @@ -8,39 +8,36 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins.compat; +package forestry.plugins; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import forestry.api.core.ForestryAPI; -import forestry.api.recipes.RecipeManagers; -import forestry.api.storage.BackpackManager; -import forestry.core.PluginCore; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.recipes.RecipeUtil; -import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.Log; -import forestry.core.utils.ModUtil; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.registry.ForgeRegistries; + import net.minecraftforge.oredict.OreDictionary; -@ForestryPlugin(pluginID = ForestryPluginUids.BIOMES_O_PLENTY, name = "BiomesOPlenty", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.biomesoplenty.description") -public class PluginBiomesOPlenty extends BlankForestryPlugin { +import net.minecraftforge.fml.common.event.FMLInterModComms; - private static final String BoP = "BiomesOPlenty"; +import forestry.api.core.ForestryAPI; +import forestry.api.recipes.RecipeManagers; +import forestry.api.storage.BackpackManager; +import forestry.core.ModuleCore; +import forestry.core.config.Constants; +import forestry.core.fluids.Fluids; +import forestry.core.recipes.RecipeUtil; +import forestry.core.utils.ItemStackUtil; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; +@SuppressWarnings("unused") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.BIOMES_O_PLENTY, name = "BiomesOPlenty", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.module.biomesoplenty.description") +public class PluginBiomesOPlenty extends CompatPlugin { @Nullable private static Block saplings; @Nullable @@ -49,44 +46,34 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { private static Item food; private static int amount; - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(BoP); - } - - @Override - public String getFailMessage() { - return "BiomesOPlenty not found"; + public PluginBiomesOPlenty() { + super("BiomesOPlenty", "biomesoplenty"); } @Override public void doInit() { - super.doInit(); + saplings = getBlock("saplings"); + colorizedSaplings = getBlock("colorizedSaplings"); + food = getItem("food"); - saplings = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(BoP, "saplings")); - colorizedSaplings = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(BoP, "colorizedSaplings")); - food = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BoP, "food")); - - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { addFlowers(); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) { addFarmCrops(); } } @Override public void registerRecipes() { - super.registerRecipes(); - amount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed"); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))) { addFermenterRecipes(); addSqueezerRecipes(); } } - private static void addFarmCrops() { + private void addFarmCrops() { List saplingItemKeys = new ArrayList<>(); if (saplings != null) { @@ -97,7 +84,7 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { } for (String key : saplingItemKeys) { - Item saplingItem = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BoP, key)); + Item saplingItem = getItem(key); String saplingName = ItemStackUtil.getItemNameFromRegistryAsString(saplingItem); if (saplingName != null) { FMLInterModComms.sendMessage(Constants.MOD_ID, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); @@ -105,18 +92,18 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { } //TODO BoP for 1.9: Add farmables -// if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && saplings != null && persimmon != null) { +// if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && saplings != null && persimmon != null) { // Farmables.farmables.put("farmArboreal", new FarmableGenericSapling(saplings, 15, persimmon)); // } - Block boPTurnip = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(BoP, "turnip")); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && boPTurnip != null) { - Item boPTurnipSeeds = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BoP, "turnipSeeds")); + Block boPTurnip = getBlock("turnip"); + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && boPTurnip != null) { + Item boPTurnipSeeds = getItem("turnipSeeds"); ItemStack boPTurnipSeedStack = new ItemStack(boPTurnipSeeds, 1, 0); if (!boPTurnipSeedStack.isEmpty()) { //TODO BoP for 1.9: Add farmable saplings // Farmables.farmables.get("farmVegetables").add(new FarmableHandPlanted(boPTurnipSeedStack, boPTurnip, 7)); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))) { RecipeManagers.squeezerManager.addRecipe(10, boPTurnipSeedStack, Fluids.SEED_OIL.getFluid(amount)); } } @@ -138,10 +125,10 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { } } - private static void addSqueezerRecipes() { - ItemStack mulch = new ItemStack(PluginCore.getItems().mulch); + private void addSqueezerRecipes() { + ItemStack mulch = new ItemStack(ModuleCore.getItems().mulch); - Item pinecone = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BoP, "pinecone")); + Item pinecone = getItem("pinecone"); if (pinecone != null) { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack(pinecone), Fluids.SEED_OIL.getFluid(3 * amount)); } @@ -150,7 +137,7 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack(food), Fluids.JUICE.getFluid(50), mulch, 5); } - Item persimmon = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BoP, "persimmon")); + Item persimmon = getItem("persimmon"); if (persimmon != null) { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack(persimmon), Fluids.JUICE.getFluid(200), mulch, 20); } @@ -229,21 +216,4 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { ); } - private static void addBlocksToBackpack(String backpackUid, String... blockNames) { - for (String blockName : blockNames) { - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(BoP, blockName)); - if (block != null) { - Item item = Item.getItemFromBlock(block); - ItemStack blockStack = new ItemStack(item, 1, OreDictionary.WILDCARD_VALUE); - if (!blockStack.isEmpty()) { - BackpackManager.backpackInterface.addItemToForestryBackpack(backpackUid, blockStack); - } else { - Log.warning("Could not find an item for block: {}", blockName); - } - } else { - Log.warning("Missing block: {}", blockName); - } - } - } - } diff --git a/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java similarity index 78% rename from src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java rename to src/main/java/forestry/plugins/PluginBuildCraftFuels.java index 1d6c939ef..3b6afc9a6 100644 --- a/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java @@ -8,17 +8,17 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins.compat; +package forestry.plugins; import forestry.core.config.Constants; import forestry.core.utils.ModUtil; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; // TODO: Buildcraft for 1.9 -@ForestryPlugin(pluginID = ForestryPluginUids.BUILDCRAFT_FUELS, name = "BuildCraft 6 Fuels", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") -public class PluginBuildCraftFuels extends BlankForestryPlugin { +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.BUILDCRAFT_FUELS, name = "BuildCraft 6 Fuels", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.module.buildcraft6.description") +public class PluginBuildCraftFuels extends BlankForestryModule { @Override public boolean isAvailable() { diff --git a/src/main/java/forestry/plugins/compat/PluginBuildCraftRecipes.java b/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java similarity index 72% rename from src/main/java/forestry/plugins/compat/PluginBuildCraftRecipes.java rename to src/main/java/forestry/plugins/PluginBuildCraftRecipes.java index 199da566d..2218639d1 100644 --- a/src/main/java/forestry/plugins/compat/PluginBuildCraftRecipes.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java @@ -8,18 +8,19 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins.compat; +package forestry.plugins; + +import net.minecraftforge.fml.common.Optional; import forestry.core.config.Constants; import forestry.core.utils.ModUtil; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; -import net.minecraftforge.fml.common.Optional; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.BUILDCRAFT_RECIPES, name = "BuildCraft 6 Recipes", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") -public class PluginBuildCraftRecipes extends BlankForestryPlugin { +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.BUILDCRAFT_RECIPES, name = "BuildCraft 6 Recipes", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.buildcraft6.description") +public class PluginBuildCraftRecipes extends BlankForestryModule { @Override public boolean isAvailable() { diff --git a/src/main/java/forestry/plugins/compat/PluginBuildCraftStatements.java b/src/main/java/forestry/plugins/PluginBuildCraftStatements.java similarity index 79% rename from src/main/java/forestry/plugins/compat/PluginBuildCraftStatements.java rename to src/main/java/forestry/plugins/PluginBuildCraftStatements.java index 701ef67d3..f969dc287 100644 --- a/src/main/java/forestry/plugins/compat/PluginBuildCraftStatements.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftStatements.java @@ -8,18 +8,19 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins.compat; +package forestry.plugins; + +import net.minecraftforge.fml.common.Optional; import forestry.core.config.Constants; import forestry.core.utils.ModUtil; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; -import net.minecraftforge.fml.common.Optional; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.BUILDCRAFT_STATEMENTS, name = "BuildCraft 6 Statements", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.BUILDCRAFT_STATEMENTS, name = "BuildCraft 6 Statements", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.module.buildcraft6.description") //@Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") -public class PluginBuildCraftStatements extends BlankForestryPlugin {//implements ITriggerProvider { +public class PluginBuildCraftStatements extends BlankForestryModule {//implements ITriggerProvider { @Override public boolean isAvailable() { diff --git a/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java b/src/main/java/forestry/plugins/PluginBuildCraftTransport.java similarity index 72% rename from src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java rename to src/main/java/forestry/plugins/PluginBuildCraftTransport.java index 4ad1b0050..9e5ddd94f 100644 --- a/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftTransport.java @@ -8,23 +8,25 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins.compat; +package forestry.plugins; -import forestry.core.PluginCore; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.common.registry.ForgeRegistries; + +import forestry.core.ModuleCore; import forestry.core.config.Constants; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.Log; import forestry.core.utils.ModUtil; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.ForgeRegistries; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.BUILDCRAFT_TRANSPORT, name = "BuildCraft 6 Transport", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") -public class PluginBuildCraftTransport extends BlankForestryPlugin { +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.BUILDCRAFT_TRANSPORT, name = "BuildCraft 6 Transport", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.module.buildcraft6.description") +public class PluginBuildCraftTransport extends BlankForestryModule { private static final String BCT = "buildcrafttransport"; @@ -40,7 +42,7 @@ public class PluginBuildCraftTransport extends BlankForestryPlugin { @Override public void registerRecipes() { - Item beeswax = PluginCore.getItems().beeswax; + Item beeswax = ModuleCore.getItems().beeswax; Item pipeWaterproof = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BCT, "waterproof")); if (pipeWaterproof != null) { RecipeUtil.addShapelessRecipe("pipe_waterproof", new ItemStack(pipeWaterproof), beeswax); diff --git a/src/main/java/forestry/plugins/compat/PluginChisel.java b/src/main/java/forestry/plugins/PluginChisel.java similarity index 77% rename from src/main/java/forestry/plugins/compat/PluginChisel.java rename to src/main/java/forestry/plugins/PluginChisel.java index 135421758..c157f099c 100644 --- a/src/main/java/forestry/plugins/compat/PluginChisel.java +++ b/src/main/java/forestry/plugins/PluginChisel.java @@ -8,19 +8,21 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins.compat; +package forestry.plugins; import com.google.common.collect.ImmutableList; + +import net.minecraftforge.fml.common.event.FMLInterModComms; + import forestry.api.storage.BackpackManager; import forestry.core.config.Constants; import forestry.core.utils.ModUtil; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; -import net.minecraftforge.fml.common.event.FMLInterModComms; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.CHISEL, name = "Chisel", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.chisel.description") -public class PluginChisel extends BlankForestryPlugin { +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.CHISEL, name = "Chisel", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.module.chisel.description") +public class PluginChisel extends BlankForestryModule { private static final String Chisel = "chisel"; diff --git a/src/main/java/forestry/plugins/compat/PluginEnderIO.java b/src/main/java/forestry/plugins/PluginEnderIO.java similarity index 81% rename from src/main/java/forestry/plugins/compat/PluginEnderIO.java rename to src/main/java/forestry/plugins/PluginEnderIO.java index 185460c03..fc73d1105 100644 --- a/src/main/java/forestry/plugins/compat/PluginEnderIO.java +++ b/src/main/java/forestry/plugins/PluginEnderIO.java @@ -1,20 +1,23 @@ -package forestry.plugins.compat; +package forestry.plugins; + +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fluids.Fluid; + +import net.minecraftforge.fml.common.event.FMLInterModComms; import forestry.api.core.ForestryAPI; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.utils.ModUtil; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fml.common.event.FMLInterModComms; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.ENDER_IO, name = "EnderIO", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.enderIO.description") -public class PluginEnderIO extends BlankForestryPlugin { +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.ENDER_IO, name = "EnderIO", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.module.enderIO.description") +public class PluginEnderIO extends BlankForestryModule { - private static final String EnderIO = "EnderIO"; + private static final String EnderIO = "enderio"; private static final String FLUID_FUEL_ADD = "fluidFuel:add"; private static final String FLUID_COOLANT_ADD = "fluidCoolant:add"; diff --git a/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java b/src/main/java/forestry/plugins/PluginExtraUtilities.java similarity index 83% rename from src/main/java/forestry/plugins/compat/PluginExtraUtilities.java rename to src/main/java/forestry/plugins/PluginExtraUtilities.java index 152b0a571..f477be3ac 100644 --- a/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java +++ b/src/main/java/forestry/plugins/PluginExtraUtilities.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins.compat; +package forestry.plugins; import java.util.Collections; import java.util.function.Consumer; @@ -26,7 +26,7 @@ import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitLayout; import forestry.api.core.ForestryAPI; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.circuits.Circuits; import forestry.core.config.Config; import forestry.core.config.Constants; @@ -38,12 +38,13 @@ import forestry.farming.FarmRegistry; import forestry.farming.circuits.CircuitFarmLogic; import forestry.farming.logic.FarmLogicExU; import forestry.farming.logic.FarmableAgingCrop; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.EXTRA_UTILITIES, name = "ExtraUtilities", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.extrautilities.description") -public class PluginExtraUtilities extends BlankForestryPlugin { +@SuppressWarnings("unused") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.EXTRA_UTILITIES, name = "ExtraUtilities", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.module.extrautilities.description") +public class PluginExtraUtilities extends BlankForestryModule { private static final String ExU = "extrautils2"; @@ -59,8 +60,6 @@ public class PluginExtraUtilities extends BlankForestryPlugin { @Override public void doInit() { - super.doInit(); - if (Config.isExUtilRedOrchidEnabled()) { registerExPlant("Orchid", "redorchid", "Red Orchid", Blocks.REDSTONE_ORE, circuit -> Circuits.farmOrchidManaged = circuit); } @@ -72,15 +71,14 @@ public class PluginExtraUtilities extends BlankForestryPlugin { @Override public void registerRecipes() { - super.registerRecipes(); - if (!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) return; + if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) return; if(Circuits.farmEnderManaged != null) { ICircuitLayout layoutManaged = ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"); - ChipsetManager.solderManager.addRecipe(layoutManaged, PluginCore.getItems().tubes.get(EnumElectronTube.ENDER, 1), Circuits.farmEnderManaged); + ChipsetManager.solderManager.addRecipe(layoutManaged, ModuleCore.getItems().tubes.get(EnumElectronTube.ENDER, 1), Circuits.farmEnderManaged); } if(Circuits.farmOrchidManaged != null) { ICircuitLayout layoutManaged = ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"); - ChipsetManager.solderManager.addRecipe(layoutManaged, PluginCore.items.tubes.get(EnumElectronTube.ORCHID, 1), Circuits.farmOrchidManaged); + ChipsetManager.solderManager.addRecipe(layoutManaged, ModuleCore.items.tubes.get(EnumElectronTube.ORCHID, 1), Circuits.farmOrchidManaged); } } diff --git a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java b/src/main/java/forestry/plugins/PluginHarvestCraft.java similarity index 84% rename from src/main/java/forestry/plugins/compat/PluginHarvestCraft.java rename to src/main/java/forestry/plugins/PluginHarvestCraft.java index 01a0d784d..671eba34f 100644 --- a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/PluginHarvestCraft.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins.compat; +package forestry.plugins; import com.google.common.collect.ImmutableList; @@ -16,23 +16,25 @@ import net.minecraft.block.Block; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import forestry.api.core.ForestryAPI; import forestry.api.farming.IFarmRegistry; import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; import forestry.api.recipes.RecipeManagers; -import forestry.core.PluginCore; -import forestry.core.PluginFluids; +import forestry.core.ModuleCore; +import forestry.core.ModuleFluids; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.items.ItemRegistryCore; import forestry.core.recipes.RecipeUtil; import forestry.farming.logic.FarmableAgingCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.HARVESTCRAFT, name = "HarvestCraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.harvestcraft.description") +@SuppressWarnings("unused") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.HARVESTCRAFT, name = "HarvestCraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.module.harvestcraft.description") public class PluginHarvestCraft extends CompatPlugin { private static final String HC = "harvestcraft"; @@ -198,7 +200,7 @@ public class PluginHarvestCraft extends CompatPlugin { if (berrySeed != null) { RecipeManagers.squeezerManager.addRecipe(10, berrySeed, Fluids.SEED_OIL.getFluid(seedamount)); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && berrySeed != null && berryBlock != null) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && berrySeed != null && berryBlock != null) { farmRegistry.registerFarmables("farmWheat", new FarmableAgingCrop(berrySeed, berryBlock, plantAGE, 3)); farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(berrySeed, berryBlock, plantAGE, 3, 0)); } @@ -216,7 +218,7 @@ public class PluginHarvestCraft extends CompatPlugin { if (fruitSeed != null) { RecipeManagers.squeezerManager.addRecipe(10, fruitSeed, Fluids.SEED_OIL.getFluid(seedamount)); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && fruitSeed != null && fruitBlock != null) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && fruitSeed != null && fruitBlock != null) { farmRegistry.registerFarmables("farmWheat", new FarmableAgingCrop(fruitSeed, fruitBlock, plantAGE, 3)); farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(fruitSeed, fruitBlock, plantAGE, 3, 0)); } @@ -235,14 +237,14 @@ public class PluginHarvestCraft extends CompatPlugin { if (vegetableSeed != null) { RecipeManagers.squeezerManager.addRecipe(10, vegetableSeed, Fluids.SEED_OIL.getFluid(seedamount)); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && vegetableSeed != null && vegetableBlock != null) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && vegetableSeed != null && vegetableBlock != null) { farmRegistry.registerFarmables("farmVegetables", new FarmableAgingCrop(vegetableSeed, vegetableBlock, plantAGE, 3)); farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(vegetableSeed, vegetableBlock, plantAGE, 3, 0)); } plants.add(vegetableName); } - ItemRegistryCore coreItems = PluginCore.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); for (String grainName : grains) { ItemStack grain = getItemStack(grainName + "item"); ItemStack grainSeed = getItemStack(grainName + "seeditem"); @@ -255,7 +257,7 @@ public class PluginHarvestCraft extends CompatPlugin { RecipeManagers.squeezerManager.addRecipe(10, grainSeed, Fluids.SEED_OIL.getFluid(seedamount)); RecipeManagers.moistenerManager.addRecipe(grainSeed, new ItemStack(Blocks.MYCELIUM), 5000); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && grainSeed != null && grainBlock != null) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && grainSeed != null && grainBlock != null) { farmRegistry.registerFarmables("farmWheat", new FarmableAgingCrop(grainSeed, grainBlock, plantAGE, 3)); farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(grainSeed, grainBlock, plantAGE, 3, 0)); } @@ -265,7 +267,7 @@ public class PluginHarvestCraft extends CompatPlugin { for (String treeFruitName : treeFruits) { ItemStack treeFruit = getItemStack(treeFruitName + "item"); Block treeFruitBlock = getBlock("pam" + treeFruitName); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && treeFruitBlock != null) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && treeFruitBlock != null) { farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(ItemStack.EMPTY, treeFruitBlock, fruitAGE, 2, 0)); } if (treeFruit != null) { @@ -276,7 +278,7 @@ public class PluginHarvestCraft extends CompatPlugin { for (String treeName : trees) { Block fruitBlock = getBlock("pam" + treeName); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && fruitBlock != null) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && fruitBlock != null) { farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(ItemStack.EMPTY, fruitBlock, fruitAGE, 2, 0)); } plants.add(treeName); @@ -284,7 +286,7 @@ public class PluginHarvestCraft extends CompatPlugin { for (String treeName : treesSpecial) { Block fruitBlock = getBlock("pam" + treeName); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && fruitBlock != null) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && fruitBlock != null) { farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(ItemStack.EMPTY, fruitBlock, fruitAGE, 2, 0)); } } @@ -302,7 +304,7 @@ public class PluginHarvestCraft extends CompatPlugin { if (genericCropSeed != null) { RecipeManagers.squeezerManager.addRecipe(10, genericCropSeed, Fluids.SEED_OIL.getFluid(seedamount)); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && genericCropSeed != null && genericCropBlock != null) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && genericCropSeed != null && genericCropBlock != null) { farmRegistry.registerFarmables("farmWheat", new FarmableAgingCrop(genericCropSeed, genericCropBlock, plantAGE, 3)); farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(genericCropSeed, genericCropBlock, plantAGE, 3, 0)); } @@ -314,7 +316,7 @@ public class PluginHarvestCraft extends CompatPlugin { if (mustardCropSeed != null) { RecipeManagers.squeezerManager.addRecipe(10, mustardCropSeed, Fluids.SEED_OIL.getFluid(seedamount)); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && mustardCropSeed != null && mustardCropBlock != null) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && mustardCropSeed != null && mustardCropBlock != null) { farmRegistry.registerFarmables("farmWheat", new FarmableAgingCrop(mustardCropSeed, mustardCropBlock, plantAGE, 3)); farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(mustardCropSeed, mustardCropBlock, plantAGE, 3, 0)); } @@ -336,7 +338,7 @@ public class PluginHarvestCraft extends CompatPlugin { if (cropnutSeed != null) { RecipeManagers.squeezerManager.addRecipe(10, cropnutSeed, Fluids.SEED_OIL.getFluid(seedamount)); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && cropnutSeed != null && cropnutBlock != null) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && cropnutSeed != null && cropnutBlock != null) { farmRegistry.registerFarmables("farmWheat", new FarmableAgingCrop(cropnutSeed, cropnutBlock, plantAGE, 3)); farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(cropnutSeed, cropnutBlock, plantAGE, 3, 0)); } @@ -348,7 +350,7 @@ public class PluginHarvestCraft extends CompatPlugin { for (String nutName : nuts) { ItemStack nut = getItemStack(nutName + "item"); Block nutBlock = getBlock("pam" + nutName); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && nutBlock != null) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && nutBlock != null) { farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(ItemStack.EMPTY, nutBlock, fruitAGE, 2, 0)); } if (nut != null) { @@ -363,7 +365,7 @@ public class PluginHarvestCraft extends CompatPlugin { ItemStack hcBeeswaxItem = getItemStack("beeswaxitem"); if (hcBeeswaxItem != null) { - RecipeUtil.addRecipe("pam_wax_capsule", PluginFluids.getItems().waxCapsuleEmpty.getItemStack(ForestryAPI.activeMode.getIntegerSetting("recipe.output.capsule")), "XXX ", 'X', hcBeeswaxItem); + RecipeUtil.addRecipe("pam_wax_capsule", ModuleFluids.getItems().waxCapsuleEmpty.getItemStack(ForestryAPI.activeMode.getIntegerSetting("recipe.output.capsule")), "XXX ", 'X', hcBeeswaxItem); } } diff --git a/src/main/java/forestry/plugins/compat/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java old mode 100755 new mode 100644 similarity index 86% rename from src/main/java/forestry/plugins/compat/PluginIC2.java rename to src/main/java/forestry/plugins/PluginIC2.java index 80fee26fc..64e0a125c --- a/src/main/java/forestry/plugins/compat/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -8,19 +8,22 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins.compat; +package forestry.plugins; import com.google.common.collect.ImmutableMap; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.util.HashSet; import java.util.Set; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; + import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.event.FMLInterModComms; @@ -34,10 +37,10 @@ import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.items.EnumPropolis; import forestry.apiculture.items.ItemRegistryApiculture; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.blocks.BlockBogEarth; import forestry.core.circuits.CircuitLayout; import forestry.core.circuits.Circuits; @@ -49,7 +52,7 @@ import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.ModUtil; -import forestry.energy.PluginEnergy; +import forestry.energy.ModuleEnergy; import forestry.energy.blocks.BlockRegistryEnergy; import forestry.energy.circuits.CircuitElectricBoost; import forestry.energy.circuits.CircuitElectricChoke; @@ -58,15 +61,16 @@ import forestry.farming.FarmRegistry; import forestry.farming.circuits.CircuitFarmLogic; import forestry.farming.logic.FarmLogicRubber; import forestry.farming.logic.FarmableBasicIC2Crop; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; import ic2.api.item.IC2Items; import ic2.api.recipe.Recipes; -@ForestryPlugin(pluginID = ForestryPluginUids.INDUSTRIALCRAFT2, name = "IndustrialCraft2", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.ic2.description") -public class PluginIC2 extends BlankForestryPlugin { +@SuppressWarnings("unused") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.INDUSTRIALCRAFT2, name = "IndustrialCraft2", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.ic2.description") +public class PluginIC2 extends BlankForestryModule { public static final String modId = "ic2"; @Nullable @@ -95,18 +99,17 @@ public class PluginIC2 extends BlankForestryPlugin { @Nonnull @Override - public Set getDependencyUids() { - Set dependencyUids = super.getDependencyUids(); - dependencyUids.add(ForestryPluginUids.FARMING); - dependencyUids.add(ForestryPluginUids.FACTORY); + public Set getDependencyUids() { + Set dependencyUids = new HashSet<>(); + dependencyUids.add(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.CORE)); + dependencyUids.add(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)); + dependencyUids.add(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY)); return dependencyUids; } @Override @Optional.Method(modid = PluginIC2.modId) public void preInit() { - super.preInit(); - // rubber chain rubberWood = IC2Items.getItem("rubber_wood"); resin = IC2Items.getItem("misc_resource", "resin"); @@ -127,11 +130,9 @@ public class PluginIC2 extends BlankForestryPlugin { @Override @Optional.Method(modid = PluginIC2.modId) public void doInit() { - super.doInit(); - // Remove some items from the recycler if (Recipes.recyclerBlacklist != null) { - ItemRegistryApiculture beeItems = PluginApiculture.getItems(); + ItemRegistryApiculture beeItems = ModuleApiculture.getItems(); if (beeItems != null) { Recipes.recyclerBlacklist.add(Recipes.inputFactory.forStack(new ItemStack(beeItems.beeQueenGE))); Recipes.recyclerBlacklist.add(Recipes.inputFactory.forStack(new ItemStack(beeItems.beePrincessGE))); @@ -151,8 +152,6 @@ public class PluginIC2 extends BlankForestryPlugin { @Override public void postInit() { - super.postInit(); - if (BackpackManager.backpackInterface == null) { return; } @@ -211,7 +210,7 @@ public class PluginIC2 extends BlankForestryPlugin { @Override @Optional.Method(modid = PluginIC2.modId) public void registerRecipes() { - ItemRegistryCore coreItems = PluginCore.items; + ItemRegistryCore coreItems = ModuleCore.items; if (rubber != null) { RecipeManagers.fabricatorManager.addRecipe(ItemStack.EMPTY, Fluids.GLASS.getFluid(500), coreItems.tubes.get(EnumElectronTube.RUBBER, 4), @@ -228,7 +227,7 @@ public class PluginIC2 extends BlankForestryPlugin { RecipeUtil.addFermenterRecipes(bioChaff, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS); } - ItemRegistryApiculture beeItems = PluginApiculture.getItems(); + ItemRegistryApiculture beeItems = ModuleApiculture.getItems(); if (beeItems != null) { if (resin != null) { RecipeManagers.centrifugeManager.addRecipe(20, beeItems.propolis.get(EnumPropolis.NORMAL, 1), ImmutableMap.of(resin, 1.0f)); @@ -256,7 +255,7 @@ public class PluginIC2 extends BlankForestryPlugin { } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ENERGY)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ENERGY))) { Fluid biogas = FluidRegistry.getFluid("ic2biogas"); if (biogas != null) { int burnDuration = Math.round(Constants.ENGINE_CYCLE_DURATION_BIOMASS * ForestryAPI.activeMode.getFloatSetting("fuel.biomass.biogas")); @@ -269,7 +268,7 @@ public class PluginIC2 extends BlankForestryPlugin { if (waterCell != null) { int bogEarthOutputCan = ForestryAPI.activeMode.getIntegerSetting("recipe.output.bogearth.can"); if (bogEarthOutputCan > 0) { - ItemStack bogEarthCan = PluginCore.getBlocks().bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, bogEarthOutputCan); + ItemStack bogEarthCan = ModuleCore.getBlocks().bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, bogEarthOutputCan); RecipeUtil.addRecipe("ic2_bog_earth_can", bogEarthCan, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', waterCell, 'Y', "sand"); } } @@ -282,7 +281,7 @@ public class PluginIC2 extends BlankForestryPlugin { ChipsetManager.solderManager.addRecipe(layout, coreItems.tubes.get(EnumElectronTube.BRONZE, 1), Circuits.energyElectricBoost2); ChipsetManager.solderManager.addRecipe(layout, coreItems.tubes.get(EnumElectronTube.IRON, 1), Circuits.energyElectricEfficiency1); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) { if (resin != null && rubberWood != null) { ICircuitLayout layoutManual = ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual"); ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.RUBBER, 1), Circuits.farmRubberManual); @@ -292,7 +291,7 @@ public class PluginIC2 extends BlankForestryPlugin { } - BlockRegistryEnergy energyBlocks = PluginEnergy.blocks; + BlockRegistryEnergy energyBlocks = ModuleEnergy.blocks; if (energyBlocks != null) { RecipeUtil.addRecipe("ic2_generator", blocks.generator, "X#X", @@ -311,11 +310,10 @@ public class PluginIC2 extends BlankForestryPlugin { 'Y', "gearTin", 'V', Blocks.PISTON); } - } + } - @Override - public void registerItemsAndBlocks() { - super.registerItemsAndBlocks(); - blocks = new BlockRegistryIC2(); + @Override + public void registerItemsAndBlocks() { + blocks = new BlockRegistryIC2(); } } diff --git a/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java b/src/main/java/forestry/plugins/PluginImmersiveEngineering.java similarity index 86% rename from src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java rename to src/main/java/forestry/plugins/PluginImmersiveEngineering.java index 487934300..fdc3dcf96 100644 --- a/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java +++ b/src/main/java/forestry/plugins/PluginImmersiveEngineering.java @@ -1,4 +1,4 @@ -package forestry.plugins.compat; +package forestry.plugins; import com.google.common.base.Optional; @@ -22,10 +22,11 @@ import forestry.api.recipes.RecipeManagers; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.farming.logic.FarmableDoubleCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.IMMERSIVE_ENGINEERING, name = "ImmersiveEngineering", author = "marcin212", url = Constants.URL, unlocalizedDescription = "for.plugin.immersiveengineering.description") +@SuppressWarnings("unused") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.IMMERSIVE_ENGINEERING, name = "ImmersiveEngineering", author = "marcin212", url = Constants.URL, unlocalizedDescription = "for.module.immersiveengineering.description") public class PluginImmersiveEngineering extends CompatPlugin { public PluginImmersiveEngineering() { diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java deleted file mode 100755 index 0a98835a6..000000000 --- a/src/main/java/forestry/plugins/PluginManager.java +++ /dev/null @@ -1,355 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Locale; -import java.util.Random; -import java.util.Set; - -import net.minecraft.command.CommandHandler; -import net.minecraft.command.ICommand; -import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.gen.IChunkGenerator; - -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; - -import net.minecraftforge.fml.common.discovery.ASMDataTable; -import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.relauncher.Side; - -import forestry.Forestry; -import forestry.api.core.ForestryAPI; -import forestry.core.IPickupHandler; -import forestry.core.IResupplyHandler; -import forestry.core.ISaveEventHandler; -import forestry.core.PluginCore; -import forestry.core.network.IPacketRegistry; -import forestry.core.utils.Log; -import forestry.core.utils.Translator; - -public class PluginManager { - - private static final String PLUGIN_CONFIG_FILE_NAME = "plugins.cfg"; - private static final String CATEGORY_PLUGINS = "plugins"; - - public static final ArrayList pickupHandlers = Lists.newArrayList(); - public static final ArrayList saveEventHandlers = Lists.newArrayList(); - public static final ArrayList resupplyHandlers = Lists.newArrayList(); - - private static final Set loadedPlugins = new LinkedHashSet<>(); - private static final Set unloadedPlugins = new LinkedHashSet<>(); - private static Stage stage = Stage.SETUP; - - public enum Stage { - SETUP, // setup API to make it functional. GameMode Configs are not yet accessible - SETUP_DISABLED, // setup fallback API to avoid crashes - REGISTER, // register basic blocks and items - PRE_INIT, // register handlers, triggers, definitions, and anything that depends on basic items - BACKPACKS_CRATES, // backpacks, crates - INIT, // anything that depends on PreInit stages, recipe registration - POST_INIT, // stubborn mod integration, dungeon loot, and finalization of things that take input from mods - FINISHED - } - - public static final Set configDisabledPlugins = new HashSet<>(); - - public static Stage getStage() { - return stage; - } - - public static Set getLoadedPlugins() { - return ImmutableSet.copyOf(loadedPlugins); - } - - private static void registerHandlers(IForestryPlugin plugin, Side side) { - Log.debug("Registering Handlers for Plugin: {}", plugin); - - IPacketRegistry packetRegistry = plugin.getPacketRegistry(); - if (packetRegistry != null) { - packetRegistry.registerPacketsServer(); - if (side == Side.CLIENT) { - packetRegistry.registerPacketsClient(); - } - } - - IPickupHandler pickupHandler = plugin.getPickupHandler(); - if (pickupHandler != null) { - pickupHandlers.add(pickupHandler); - } - - ISaveEventHandler saveHandler = plugin.getSaveEventHandler(); - if (saveHandler != null) { - saveEventHandlers.add(saveHandler); - } - - IResupplyHandler resupplyHandler = plugin.getResupplyHandler(); - if (resupplyHandler != null) { - resupplyHandlers.add(resupplyHandler); - } - } - - private static IForestryPlugin getPluginCore(List forestryPlugins) { - for (IForestryPlugin plugin : forestryPlugins) { - if (plugin instanceof PluginCore) { - return plugin; - } - } - throw new IllegalStateException("Could not find core plugin"); - } - - private static void configurePlugins(List forestryPlugins) { - Locale locale = Locale.getDefault(); - Locale.setDefault(Locale.ENGLISH); - - Configuration config = new Configuration(new File(Forestry.instance.getConfigFolder(), PLUGIN_CONFIG_FILE_NAME)); - - config.load(); - config.addCustomCategoryComment(CATEGORY_PLUGINS, "Disabling these plugins can greatly change how the mod functions.\n" - + "Your mileage may vary, please report any issues."); - - IForestryPlugin corePlugin = getPluginCore(forestryPlugins); - forestryPlugins.remove(corePlugin); - forestryPlugins.add(0, corePlugin); - - Set toLoad = new HashSet<>(); - - ImmutableList allForestryPlugins = ImmutableList.copyOf(forestryPlugins); - - Iterator iterator = forestryPlugins.iterator(); - while (iterator.hasNext()) { - IForestryPlugin plugin = iterator.next(); - if (plugin.canBeDisabled()) { - if (!isEnabled(config, plugin)) { - iterator.remove(); - Log.info("Plugin disabled: {}", plugin); - continue; - } - if (!plugin.isAvailable()) { - iterator.remove(); - Log.info("Plugin {} failed to load: {}", plugin, plugin.getFailMessage()); - continue; - } - } - ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); - toLoad.add(info.pluginID()); - } - - boolean changed; - do { - changed = false; - iterator = forestryPlugins.iterator(); - while (iterator.hasNext()) { - IForestryPlugin plugin = iterator.next(); - Set dependencies = plugin.getDependencyUids(); - if (!toLoad.containsAll(dependencies)) { - iterator.remove(); - changed = true; - ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); - String pluginId = info.pluginID(); - toLoad.remove(pluginId); - Log.warning("Plugin {} is missing dependencies: {}", pluginId, dependencies); - } - } - } while (changed); - - loadedPlugins.addAll(forestryPlugins); - unloadedPlugins.addAll(allForestryPlugins); - unloadedPlugins.removeAll(loadedPlugins); - - ForestryAPI.enabledPlugins = new HashSet<>(); - for (IForestryPlugin plugin : loadedPlugins) { - ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); - ForestryAPI.enabledPlugins.add(info.pluginID()); - } - - if (config.hasChanged()) { - config.save(); - } - - Locale.setDefault(locale); - } - - public static void runSetup(FMLPreInitializationEvent event) { - - ASMDataTable asmDataTable = event.getAsmData(); - List forestryPlugins = ForestryPluginUtil.getForestryPlugins(asmDataTable); - - stage = Stage.SETUP; - configurePlugins(forestryPlugins); - - for (IForestryPlugin plugin : loadedPlugins) { - Log.debug("Setup API Start: {}", plugin); - plugin.setupAPI(); - Log.debug("Setup API Complete: {}", plugin); - } - - stage = Stage.SETUP_DISABLED; - for (IForestryPlugin plugin : unloadedPlugins) { - Log.debug("Disabled-Setup Start: {}", plugin); - plugin.disabledSetupAPI(); - Log.debug("Disabled-Setup Complete: {}", plugin); - } - - stage = Stage.REGISTER; - for (IForestryPlugin plugin : loadedPlugins) { - Log.debug("Register Items and Blocks Start: {}", plugin); - plugin.registerItemsAndBlocks(); - Log.debug("Register Items and Blocks Complete: {}", plugin); - } - } - - public static void runPreInit(Side side) { - stage = Stage.PRE_INIT; - for (IForestryPlugin plugin : loadedPlugins) { - Log.debug("Pre-Init Start: {}", plugin); - registerHandlers(plugin, side); - plugin.preInit(); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.BUILDCRAFT_STATEMENTS)) { - plugin.registerTriggers(); - } - Log.debug("Pre-Init Complete: {}", plugin); - } - } - - public static void runRegisterBackpacksAndCrates() { - stage = Stage.BACKPACKS_CRATES; - for (IForestryPlugin plugin : loadedPlugins) { - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.STORAGE)) { - Log.debug("BackpacksAndCrates Start: {}", plugin); - plugin.registerBackpackItems(); - plugin.registerCrates(); - Log.debug("BackpacksAndCrates Complete: {}", plugin); - } - } - } - - public static void runInit() { - stage = Stage.INIT; - for (IForestryPlugin plugin : loadedPlugins) { - Log.debug("Init Start: {}", plugin); - plugin.doInit(); - plugin.registerRecipes(); - Log.debug("Init Complete: {}", plugin); - } - } - - public static void runPostInit() { - stage = Stage.POST_INIT; - for (IForestryPlugin plugin : loadedPlugins) { - Log.debug("Post-Init Start: {}", plugin); - plugin.postInit(); - Log.debug("Post-Init Complete: {}", plugin); - } - - stage = Stage.FINISHED; - } - - public static void serverStarting(MinecraftServer server) { - CommandHandler commandManager = (CommandHandler) server.getCommandManager(); - - for (IForestryPlugin plugin : loadedPlugins) { - ICommand[] commands = plugin.getConsoleCommands(); - if (commands == null) { - continue; - } - for (ICommand command : commands) { - commandManager.registerCommand(command); - } - } - } - - public static void processIMCMessages(ImmutableList messages) { - for (FMLInterModComms.IMCMessage message : messages) { - for (IForestryPlugin plugin : loadedPlugins) { - if (plugin.processIMCMessage(message)) { - break; - } - } - } - } - - public static void populateChunk(IChunkGenerator chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated) { - for (IForestryPlugin plugin : loadedPlugins) { - plugin.populateChunk(chunkProvider, world, rand, chunkX, chunkZ, hasVillageGenerated); - } - } - - public static void decorateBiome(World world, Random rand, BlockPos pos) { - for (IForestryPlugin plugin : loadedPlugins) { - plugin.decorateBiome(world, rand, pos); - } - } - - public static void populateChunkRetroGen(World world, Random rand, int chunkX, int chunkZ) { - for (IForestryPlugin plugin : loadedPlugins) { - plugin.populateChunkRetroGen(world, rand, chunkX, chunkZ); - } - } - - - public static List getHiddenItems() { - List hiddenItems = new ArrayList<>(); - for (IForestryPlugin plugin : loadedPlugins) { - plugin.getHiddenItems(hiddenItems); - } - return hiddenItems; - } - - - public static Set getLootPoolNames() { - Set lootPoolNames = new HashSet<>(); - for (IForestryPlugin plugin : loadedPlugins) { - plugin.addLootPoolNames(lootPoolNames); - } - return lootPoolNames; - } - - public static Set getLootTableFiles() { - Set lootTableNames = new HashSet<>(); - for (IForestryPlugin plugin : loadedPlugins) { - ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); - String lootTableFolder = info.lootTable(); - if (!lootTableFolder.isEmpty()) { - lootTableNames.add(lootTableFolder); - } - } - return lootTableNames; - } - - private static boolean isEnabled(Configuration config, IForestryPlugin plugin) { - ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); - - String comment = Translator.translateToLocal(info.unlocalizedDescription()); - Property prop = config.get(CATEGORY_PLUGINS, info.pluginID(), true, comment); - boolean enabled = prop.getBoolean(); - - if (!enabled) { - configDisabledPlugins.add(plugin); - } - - return enabled; - } -} diff --git a/src/main/java/forestry/plugins/compat/PluginMysticalAgriculture.java b/src/main/java/forestry/plugins/PluginMysticalAgriculture.java similarity index 87% rename from src/main/java/forestry/plugins/compat/PluginMysticalAgriculture.java rename to src/main/java/forestry/plugins/PluginMysticalAgriculture.java index 159d9e46b..734bba45a 100644 --- a/src/main/java/forestry/plugins/compat/PluginMysticalAgriculture.java +++ b/src/main/java/forestry/plugins/PluginMysticalAgriculture.java @@ -1,10 +1,11 @@ -package forestry.plugins.compat; +package forestry.plugins; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import forestry.api.core.ForestryAPI; import forestry.api.farming.IFarmRegistry; @@ -12,10 +13,11 @@ import forestry.api.recipes.RecipeManagers; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.farming.logic.FarmableAgingCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.MAGICAL_AGRICULTURE, name = "Mystical Agriculture", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.plugin.mysticalagriculture.description") +@SuppressWarnings("unused") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.MAGICAL_AGRICULTURE, name = "Mystical Agriculture", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.module.mysticalagriculture.description") public class PluginMysticalAgriculture extends CompatPlugin { private static final String MAGICAL_AGRICULTURE = "mysticalagriculture"; @@ -25,7 +27,7 @@ public class PluginMysticalAgriculture extends CompatPlugin { @Override public void registerRecipes() { - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) { ImmutableList crops = ImmutableList.of( "stone", "dirt", diff --git a/src/main/java/forestry/plugins/compat/PluginNatura.java b/src/main/java/forestry/plugins/PluginNatura.java similarity index 91% rename from src/main/java/forestry/plugins/compat/PluginNatura.java rename to src/main/java/forestry/plugins/PluginNatura.java index 8c4667060..b394a5335 100644 --- a/src/main/java/forestry/plugins/compat/PluginNatura.java +++ b/src/main/java/forestry/plugins/PluginNatura.java @@ -8,7 +8,9 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.plugins.compat; +package forestry.plugins; + +import com.google.common.collect.Iterables; import java.util.ArrayList; import java.util.Collection; @@ -22,13 +24,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.oredict.OreDictionary; -import com.google.common.collect.Iterables; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import forestry.api.core.ForestryAPI; import forestry.api.farming.IFarmLogic; @@ -37,7 +39,7 @@ import forestry.api.fuels.MoistenerFuel; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; @@ -47,12 +49,13 @@ import forestry.core.utils.ModUtil; import forestry.farming.FarmRegistry; import forestry.farming.logic.FarmableAgingCrop; import forestry.farming.logic.FarmableSapling; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.NATURA, name = "Natura", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.natura.description") -public class PluginNatura extends BlankForestryPlugin { +@SuppressWarnings("unused") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.NATURA, name = "Natura", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.natura.description") +public class PluginNatura extends BlankForestryModule { public static final String modId = "natura"; @@ -184,8 +187,6 @@ public class PluginNatura extends BlankForestryPlugin { @Override public void registerCrates() { - super.registerCrates(); - ICrateRegistry crateRegistry = StorageManager.crateRegistry; Iterables.concat( @@ -203,7 +204,7 @@ public class PluginNatura extends BlankForestryPlugin { RecipeManagers.moistenerManager.addRecipe(seed, new ItemStack(Blocks.MYCELIUM), 5000); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) { cropBlocks.forEach(itemStack -> { Block block = ItemStackUtil.getBlock(itemStack); ItemStack seedItem; @@ -232,7 +233,7 @@ public class PluginNatura extends BlankForestryPlugin { amount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.apple") / 2; final int juiceAmount = Math.max(amount, 1); // Produce at least 1 mb of juice. - ItemStack mulch = PluginCore.items.mulch.getItemStack(); + ItemStack mulch = ModuleCore.items.mulch.getItemStack(); fruits.forEach(fruit -> RecipeManagers.squeezerManager.addRecipe( 10, NonNullList.from(fruit, fruit), Fluids.JUICE.getFluid(juiceAmount), mulch, @@ -252,10 +253,10 @@ public class PluginNatura extends BlankForestryPlugin { int compostWheatAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.compost.wheat"); if (compostWheatAmount > 0) { - ItemStack compostWheat = PluginCore.items.fertilizerCompound.getItemStack(compostWheatAmount); + ItemStack compostWheat = ModuleCore.items.fertilizerCompound.getItemStack(compostWheatAmount); RecipeUtil.addRecipe(compostWheat.getUnlocalizedName(), compostWheat, " X ", "X#X", " X ", '#', Blocks.DIRT, 'X', crop); } - FuelManager.moistenerResource.put(crop, new MoistenerFuel(crop, PluginCore.items.mouldyWheat.getItemStack(), 0, 300)); + FuelManager.moistenerResource.put(crop, new MoistenerFuel(crop, ModuleCore.items.mouldyWheat.getItemStack(), 0, 300)); }); } diff --git a/src/main/java/forestry/plugins/compat/PluginRoots.java b/src/main/java/forestry/plugins/PluginRoots.java similarity index 84% rename from src/main/java/forestry/plugins/compat/PluginRoots.java rename to src/main/java/forestry/plugins/PluginRoots.java index f10a7227e..500bf4204 100644 --- a/src/main/java/forestry/plugins/compat/PluginRoots.java +++ b/src/main/java/forestry/plugins/PluginRoots.java @@ -1,4 +1,4 @@ -package forestry.plugins.compat; +package forestry.plugins; import com.google.common.collect.ImmutableList; @@ -12,10 +12,11 @@ import forestry.api.recipes.RecipeManagers; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.farming.logic.FarmableAgingCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.ROOTS, name = "Roots", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.plugin.roots.description") +@SuppressWarnings("unused") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.ROOTS, name = "Roots", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.module.roots.description") public class PluginRoots extends CompatPlugin { public PluginRoots() { super("Roots", "roots"); diff --git a/src/main/java/forestry/plugins/compat/PluginRustic.java b/src/main/java/forestry/plugins/PluginRustic.java similarity index 88% rename from src/main/java/forestry/plugins/compat/PluginRustic.java rename to src/main/java/forestry/plugins/PluginRustic.java index 124f45cb2..e7b9538b5 100644 --- a/src/main/java/forestry/plugins/compat/PluginRustic.java +++ b/src/main/java/forestry/plugins/PluginRustic.java @@ -1,4 +1,4 @@ -package forestry.plugins.compat; +package forestry.plugins; import com.google.common.collect.ImmutableList; @@ -14,10 +14,11 @@ import forestry.core.fluids.Fluids; import forestry.farming.logic.FarmableAgingCrop; import forestry.farming.logic.FarmableRusticGrape; import forestry.farming.logic.FarmableRusticSapling; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; -@ForestryPlugin(pluginID = ForestryPluginUids.RUSTIC, name = "rustic", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.plugin.rustic.description") +@SuppressWarnings("unused") +@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.RUSTIC, name = "rustic", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.module.rustic.description") public class PluginRustic extends CompatPlugin { public PluginRustic() { diff --git a/src/main/java/forestry/storage/CrateRegistry.java b/src/main/java/forestry/storage/CrateRegistry.java index e3fde8c1a..4e9149fef 100755 --- a/src/main/java/forestry/storage/CrateRegistry.java +++ b/src/main/java/forestry/storage/CrateRegistry.java @@ -16,15 +16,16 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.fml.common.registry.ForgeRegistries; + import forestry.api.storage.ICrateRegistry; -import forestry.core.items.ItemCrated; import forestry.core.proxy.Proxies; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.MigrationHelper; +import forestry.storage.items.ItemCrated; public class CrateRegistry implements ICrateRegistry { @@ -55,7 +56,7 @@ public class CrateRegistry implements ICrateRegistry { ForgeRegistries.ITEMS.register(crate); Proxies.common.registerItem(crate); - PluginStorage.registerCrate(crate); + ModuleCrates.registerCrate(crate); } @Override diff --git a/src/main/java/forestry/storage/PluginStorage.java b/src/main/java/forestry/storage/ModuleBackpacks.java similarity index 85% rename from src/main/java/forestry/storage/PluginStorage.java rename to src/main/java/forestry/storage/ModuleBackpacks.java index bec35b87d..4ad531cf6 100644 --- a/src/main/java/forestry/storage/PluginStorage.java +++ b/src/main/java/forestry/storage/ModuleBackpacks.java @@ -28,8 +28,8 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; import net.minecraftforge.fluids.Fluid; @@ -37,11 +37,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import forestry.Forestry; import forestry.api.core.ForestryAPI; @@ -50,42 +46,34 @@ import forestry.api.storage.BackpackManager; import forestry.api.storage.IBackpackDefinition; import forestry.api.storage.IBackpackFilterConfigurable; import forestry.api.storage.StorageManager; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.ModuleApiculture; import forestry.apiculture.blocks.BlockRegistryApiculture; import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; -import forestry.core.PluginCore; +import forestry.core.ModuleCore; import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; -import forestry.core.items.ItemCrated; import forestry.core.items.ItemRegistryCore; -import forestry.core.models.ModelCrate; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.IMCUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.OreDictUtil; import forestry.core.utils.Translator; -import forestry.lepidopterology.PluginLepidopterology; +import forestry.lepidopterology.ModuleLepidopterology; import forestry.lepidopterology.blocks.BlockRegistryLepidopterology; -import forestry.plugins.BlankForestryPlugin; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.ForestryPluginUids; -import forestry.storage.items.ItemRegistryStorage; -import forestry.storage.proxy.ProxyStorage; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; +import forestry.storage.items.ItemRegistryBackpacks; -@ForestryPlugin(pluginID = ForestryPluginUids.STORAGE, name = "Storage", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.storage.description", lootTable = "storage") -public class PluginStorage extends BlankForestryPlugin { +@ForestryModule(moduleID = ForestryModuleUids.BACKPACKS, containerID = Constants.MOD_ID, name = "Backpack", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.backpacks.description", lootTable = "storage") +public class ModuleBackpacks extends BlankForestryModule { - @SuppressWarnings("NullableProblems") - @SidedProxy(clientSide = "forestry.storage.proxy.ProxyStorageClient", serverSide = "forestry.storage.proxy.ProxyStorage") - public static ProxyStorage proxy; - - private static final List crates = new ArrayList<>(); private static final String CONFIG_CATEGORY = "backpacks"; @Nullable - private static ItemRegistryStorage items; + private static ItemRegistryBackpacks items; private final Map> backpackAcceptedOreDictRegexpDefaults = new HashMap<>(); private final Map> backpackRejectedOreDictRegexpDefaults = new HashMap<>(); @@ -101,14 +89,13 @@ public class PluginStorage extends BlankForestryPlugin { BackpackManager.BUILDER_UID ); - public static ItemRegistryStorage getItems() { + public static ItemRegistryBackpacks getItems() { Preconditions.checkState(items != null); return items; } @Override public void setupAPI() { - super.setupAPI(); StorageManager.crateRegistry = new CrateRegistry(); @@ -116,13 +103,13 @@ public class PluginStorage extends BlankForestryPlugin { BackpackDefinition definition; - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { Predicate filter = BackpackManager.backpackInterface.createNaturalistBackpackFilter("rootBees"); definition = new BackpackDefinition(new Color(0xc4923d), Color.WHITE, filter); BackpackManager.backpackInterface.registerBackpackDefinition("apiarist", definition); } - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.LEPIDOPTEROLOGY))) { Predicate filter = BackpackManager.backpackInterface.createNaturalistBackpackFilter("rootButterflies"); definition = new BackpackDefinition(new Color(0x995b31), Color.WHITE, filter); BackpackManager.backpackInterface.registerBackpackDefinition("lepidopterist", definition); @@ -145,13 +132,11 @@ public class PluginStorage extends BlankForestryPlugin { definition = new BackpackDefinition(new Color(0xdd3a3a), Color.WHITE); BackpackManager.backpackInterface.registerBackpackDefinition(BackpackManager.BUILDER_UID, definition); - - proxy.registerCrateModel(); } @Override public void registerItemsAndBlocks() { - items = new ItemRegistryStorage(); + items = new ItemRegistryBackpacks(); } @Override @@ -183,7 +168,7 @@ public class PluginStorage extends BlankForestryPlugin { } private void setDefaultsForConfig() { - ItemRegistryCore coreItems = PluginCore.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); backpackAcceptedOreDictRegexpDefaults.put(BackpackManager.MINER_UID, Arrays.asList( "obsidian", @@ -389,8 +374,8 @@ public class PluginStorage extends BlankForestryPlugin { new ItemStack(Items.SPRUCE_DOOR) ))); - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - BlockRegistryApiculture beeBlocks = PluginApiculture.getBlocks(); + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { + BlockRegistryApiculture beeBlocks = ModuleApiculture.getBlocks(); backpackAcceptedItemDefaults.put(BackpackManager.BUILDER_UID, getItemStrings(Arrays.asList( new ItemStack(beeBlocks.candle, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(beeBlocks.stump, 1, OreDictionary.WILDCARD_VALUE) @@ -530,36 +515,6 @@ public class PluginStorage extends BlankForestryPlugin { } } - public static void registerCrate(ItemCrated crate) { - crates.add(crate); - } - - public static void createCrateRecipes() { - for (ItemCrated crate : crates) { - ItemStack crateStack = new ItemStack(crate); - ItemStack uncrated = crate.getContained(); - if (!uncrated.isEmpty()) { - if (crate.getOreDictName() != null) { - addCrating(crateStack, crate.getOreDictName()); - } else { - addCrating(crateStack, uncrated); - } - addUncrating(crateStack, uncrated); - } - } - } - - private static void addCrating(ItemStack crateStack, Object uncrated) { - FluidStack water = new FluidStack(FluidRegistry.WATER, Constants.CARPENTER_CRATING_LIQUID_QUANTITY); - ItemStack box = getItems().crate.getItemStack(); - RecipeManagers.carpenterManager.addRecipe(Constants.CARPENTER_CRATING_CYCLES, water, box, crateStack, "###", "###", "###", '#', uncrated); - } - - private static void addUncrating(ItemStack crateStack, ItemStack uncrated) { - ItemStack product = new ItemStack(uncrated.getItem(), 9, uncrated.getItemDamage()); - RecipeManagers.carpenterManager.addRecipe(Constants.CARPENTER_UNCRATING_CYCLES, ItemStack.EMPTY, product, "#", '#', crateStack); - } - @Override public boolean processIMCMessage(IMCMessage message) { if (message.key.equals("add-backpack-items")) { @@ -601,14 +556,14 @@ public class PluginStorage extends BlankForestryPlugin { @Override public void registerRecipes() { - ItemRegistryStorage items = getItems(); - if (items.apiaristBackpack != null && ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - BlockRegistryApiculture beeBlocks = PluginApiculture.getBlocks(); + ItemRegistryBackpacks items = getItems(); + if (items.apiaristBackpack != null && ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { + BlockRegistryApiculture beeBlocks = ModuleApiculture.getBlocks(); addBackpackRecipe("bee", items.apiaristBackpack, "stickWood", beeBlocks.beeChest); } - if (items.lepidopteristBackpack != null && ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { - BlockRegistryLepidopterology butterflyBlocks = PluginLepidopterology.getBlocks(); + if (items.lepidopteristBackpack != null && ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.LEPIDOPTEROLOGY))) { + BlockRegistryLepidopterology butterflyBlocks = ModuleLepidopterology.getBlocks(); ItemStack chest = new ItemStack(butterflyBlocks.butterflyChest); addBackpackRecipe("butterfly", items.lepidopteristBackpack, "stickWood", chest); } @@ -621,11 +576,7 @@ public class PluginStorage extends BlankForestryPlugin { addBackpackRecipe("building", items.builderBackpack, Items.CLAY_BALL); // / CARPENTER - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { - // / CRATES - RecipeManagers.carpenterManager.addRecipe(20, new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), ItemStack.EMPTY, items.crate.getItemStack(24), - " # ", "# #", " # ", '#', "logWood"); - + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))) { // / BACKPACKS WOVEN addT2BackpackRecipe(items.minerBackpack, items.minerBackpackT2); addT2BackpackRecipe(items.diggerBackpack, items.diggerBackpackT2); @@ -652,7 +603,7 @@ public class PluginStorage extends BlankForestryPlugin { } private static void addT2BackpackRecipe(Item backpackT1, Item backpackT2) { - ItemRegistryCore coreItems = PluginCore.getItems(); + ItemRegistryCore coreItems = ModuleCore.getItems(); ItemStack wovenSilk = coreItems.craftingMaterial.getWovenSilk(); RecipeManagers.carpenterManager.addRecipe(200, new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), ItemStack.EMPTY, new ItemStack(backpackT2), @@ -664,15 +615,8 @@ public class PluginStorage extends BlankForestryPlugin { 'T', backpackT1); } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onBakeModel(ModelBakeEvent event) { - ModelCrate.onModelBake(event); - } - @Override public void addLootPoolNames(Set lootPoolNames) { - super.addLootPoolNames(lootPoolNames); lootPoolNames.add("forestry_storage_items"); } } diff --git a/src/main/java/forestry/storage/ModuleCrates.java b/src/main/java/forestry/storage/ModuleCrates.java new file mode 100644 index 000000000..919e95af8 --- /dev/null +++ b/src/main/java/forestry/storage/ModuleCrates.java @@ -0,0 +1,123 @@ +package forestry.storage; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.ForestryAPI; +import forestry.api.recipes.RecipeManagers; +import forestry.api.storage.StorageManager; +import forestry.core.config.Constants; +import forestry.modules.BlankForestryModule; +import forestry.modules.ForestryModule; +import forestry.modules.ForestryModuleUids; +import forestry.storage.items.ItemCrated; +import forestry.storage.items.ItemRegistryCrates; +import forestry.storage.models.ModelCrate; +import forestry.storage.proxy.ProxyStorage; + +@ForestryModule(moduleID = ForestryModuleUids.CRATE, containerID = Constants.MOD_ID, name = "Crate", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.module.crates.description") +public class ModuleCrates extends BlankForestryModule { + + private static final List crates = new ArrayList<>(); + + @SuppressWarnings("NullableProblems") + @SidedProxy(clientSide = "forestry.storage.proxy.ProxyStorageClient", serverSide = "forestry.storage.proxy.ProxyStorage") + public static ProxyStorage proxy; + + @Nullable + private static ItemRegistryCrates items; + + public static ItemRegistryCrates getItems() { + Preconditions.checkState(items != null); + return items; + } + + @Override + public void setupAPI() { + StorageManager.crateRegistry = new CrateRegistry(); + proxy.registerCrateModel(); + } + + @Override + public void registerItemsAndBlocks() { + items = new ItemRegistryCrates(); + } + + @Override + public void preInit() { + MinecraftForge.EVENT_BUS.register(this); + } + + @Override + public Set getDependencyUids() { + return ImmutableSet.of(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.CORE)); + } + + @Override + public void registerRecipes() { + ItemRegistryCrates items = getItems(); + + // / CARPENTER + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FACTORY))) { + // / CRATES + RecipeManagers.carpenterManager.addRecipe(20, new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), ItemStack.EMPTY, items.crate.getItemStack(24), + " # ", "# #", " # ", '#', "logWood"); + } + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onBakeModel(ModelBakeEvent event) { + ModelCrate.onModelBake(event); + } + + public static void registerCrate(ItemCrated crate) { + crates.add(crate); + } + + public static void createCrateRecipes() { + for (ItemCrated crate : crates) { + ItemStack crateStack = new ItemStack(crate); + ItemStack uncrated = crate.getContained(); + if (!uncrated.isEmpty()) { + if (crate.getOreDictName() != null) { + addCrating(crateStack, crate.getOreDictName()); + } else { + addCrating(crateStack, uncrated); + } + addUncrating(crateStack, uncrated); + } + } + } + + + private static void addCrating(ItemStack crateStack, Object uncrated) { + FluidStack water = new FluidStack(FluidRegistry.WATER, Constants.CARPENTER_CRATING_LIQUID_QUANTITY); + ItemStack box = getItems().crate.getItemStack(); + RecipeManagers.carpenterManager.addRecipe(Constants.CARPENTER_CRATING_CYCLES, water, box, crateStack, "###", "###", "###", '#', uncrated); + } + + private static void addUncrating(ItemStack crateStack, ItemStack uncrated) { + ItemStack product = new ItemStack(uncrated.getItem(), 9, uncrated.getItemDamage()); + RecipeManagers.carpenterManager.addRecipe(Constants.CARPENTER_UNCRATING_CYCLES, ItemStack.EMPTY, product, "#", '#', crateStack); + } +} diff --git a/src/main/java/forestry/storage/compat/StorageJeiPlugin.java b/src/main/java/forestry/storage/compat/StorageJeiPlugin.java index 31e23d624..b2da93bd4 100644 --- a/src/main/java/forestry/storage/compat/StorageJeiPlugin.java +++ b/src/main/java/forestry/storage/compat/StorageJeiPlugin.java @@ -1,8 +1,8 @@ package forestry.storage.compat; import forestry.core.utils.JeiUtil; -import forestry.storage.PluginStorage; -import forestry.storage.items.ItemRegistryStorage; +import forestry.storage.ModuleBackpacks; +import forestry.storage.items.ItemRegistryBackpacks; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; @@ -11,7 +11,7 @@ import mezz.jei.api.JEIPlugin; public class StorageJeiPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { - ItemRegistryStorage items = PluginStorage.getItems(); + ItemRegistryBackpacks items = ModuleBackpacks.getItems(); JeiUtil.addDescription(registry, "minerBag", items.minerBackpack, diff --git a/src/main/java/forestry/core/items/ItemCrated.java b/src/main/java/forestry/storage/items/ItemCrated.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/core/items/ItemCrated.java rename to src/main/java/forestry/storage/items/ItemCrated.java index 9d8d74702..f7f0dcc46 --- a/src/main/java/forestry/core/items/ItemCrated.java +++ b/src/main/java/forestry/storage/items/ItemCrated.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.items; +package forestry.storage.items; import javax.annotation.Nullable; @@ -30,6 +30,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; +import forestry.core.items.IColoredItem; +import forestry.core.items.ItemForestry; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Translator; diff --git a/src/main/java/forestry/storage/items/ItemRegistryStorage.java b/src/main/java/forestry/storage/items/ItemRegistryBackpacks.java similarity index 87% rename from src/main/java/forestry/storage/items/ItemRegistryStorage.java rename to src/main/java/forestry/storage/items/ItemRegistryBackpacks.java index 30e9f694e..d2555223a 100644 --- a/src/main/java/forestry/storage/items/ItemRegistryStorage.java +++ b/src/main/java/forestry/storage/items/ItemRegistryBackpacks.java @@ -1,87 +1,84 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.storage.items; - -import javax.annotation.Nullable; - -import forestry.api.apiculture.BeeManager; -import forestry.api.core.ForestryAPI; -import forestry.api.core.Tabs; -import forestry.api.lepidopterology.ButterflyManager; -import forestry.api.storage.BackpackManager; -import forestry.api.storage.EnumBackpackType; -import forestry.api.storage.IBackpackInterface; -import forestry.core.items.ItemCrated; -import forestry.core.items.ItemRegistry; -import forestry.plugins.ForestryPluginUids; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemRegistryStorage extends ItemRegistry { - public final ItemCrated crate; - @Nullable - public final Item apiaristBackpack; - @Nullable - public final Item lepidopteristBackpack; - - public final Item minerBackpack; - public final Item minerBackpackT2; - public final Item diggerBackpack; - public final Item diggerBackpackT2; - public final Item foresterBackpack; - public final Item foresterBackpackT2; - public final Item hunterBackpack; - public final Item hunterBackpackT2; - public final Item adventurerBackpack; - public final Item adventurerBackpackT2; - public final Item builderBackpack; - public final Item builderBackpackT2; - - public ItemRegistryStorage() { - // CRATE - crate = registerItem(new ItemCrated(ItemStack.EMPTY, null), "crate"); - - // BACKPACKS - IBackpackInterface backpackInterface = BackpackManager.backpackInterface; - - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - apiaristBackpack = registerItem(backpackInterface.createNaturalistBackpack("apiarist", BeeManager.beeRoot), "apiarist_bag"); - apiaristBackpack.setCreativeTab(Tabs.tabApiculture); - } else { - apiaristBackpack = null; - } - - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { - lepidopteristBackpack = registerItem(backpackInterface.createNaturalistBackpack("lepidopterist", ButterflyManager.butterflyRoot), "lepidopterist_bag"); - lepidopteristBackpack.setCreativeTab(Tabs.tabLepidopterology); - } else { - lepidopteristBackpack = null; - } - - minerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.NORMAL), "miner_bag"); - minerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.WOVEN), "miner_bag_t2"); - - diggerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.NORMAL), "digger_bag"); - diggerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.WOVEN), "digger_bag_t2"); - - foresterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.NORMAL), "forester_bag"); - foresterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.WOVEN), "forester_bag_t2"); - - hunterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.NORMAL), "hunter_bag"); - hunterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.WOVEN), "hunter_bag_t2"); - - adventurerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.NORMAL), "adventurer_bag"); - adventurerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.WOVEN), "adventurer_bag_t2"); - - builderBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.NORMAL), "builder_bag"); - builderBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.WOVEN), "builder_bag_t2"); - } -} +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.storage.items; + +import javax.annotation.Nullable; + +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; + +import forestry.api.apiculture.BeeManager; +import forestry.api.core.ForestryAPI; +import forestry.api.core.Tabs; +import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.storage.BackpackManager; +import forestry.api.storage.EnumBackpackType; +import forestry.api.storage.IBackpackInterface; +import forestry.core.config.Constants; +import forestry.core.items.ItemRegistry; +import forestry.modules.ForestryModuleUids; + +public class ItemRegistryBackpacks extends ItemRegistry { + @Nullable + public final Item apiaristBackpack; + @Nullable + public final Item lepidopteristBackpack; + + public final Item minerBackpack; + public final Item minerBackpackT2; + public final Item diggerBackpack; + public final Item diggerBackpackT2; + public final Item foresterBackpack; + public final Item foresterBackpackT2; + public final Item hunterBackpack; + public final Item hunterBackpackT2; + public final Item adventurerBackpack; + public final Item adventurerBackpackT2; + public final Item builderBackpack; + public final Item builderBackpackT2; + + public ItemRegistryBackpacks() { + // BACKPACKS + IBackpackInterface backpackInterface = BackpackManager.backpackInterface; + + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { + apiaristBackpack = registerItem(backpackInterface.createNaturalistBackpack("apiarist", BeeManager.beeRoot), "apiarist_bag"); + apiaristBackpack.setCreativeTab(Tabs.tabApiculture); + } else { + apiaristBackpack = null; + } + + if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.LEPIDOPTEROLOGY))) { + lepidopteristBackpack = registerItem(backpackInterface.createNaturalistBackpack("lepidopterist", ButterflyManager.butterflyRoot), "lepidopterist_bag"); + lepidopteristBackpack.setCreativeTab(Tabs.tabLepidopterology); + } else { + lepidopteristBackpack = null; + } + + minerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.NORMAL), "miner_bag"); + minerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.WOVEN), "miner_bag_t2"); + + diggerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.NORMAL), "digger_bag"); + diggerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.WOVEN), "digger_bag_t2"); + + foresterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.NORMAL), "forester_bag"); + foresterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.WOVEN), "forester_bag_t2"); + + hunterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.NORMAL), "hunter_bag"); + hunterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.WOVEN), "hunter_bag_t2"); + + adventurerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.NORMAL), "adventurer_bag"); + adventurerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.WOVEN), "adventurer_bag_t2"); + + builderBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.NORMAL), "builder_bag"); + builderBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.WOVEN), "builder_bag_t2"); + } +} diff --git a/src/main/java/forestry/storage/items/ItemRegistryCrates.java b/src/main/java/forestry/storage/items/ItemRegistryCrates.java new file mode 100644 index 000000000..26e35a2fa --- /dev/null +++ b/src/main/java/forestry/storage/items/ItemRegistryCrates.java @@ -0,0 +1,14 @@ +package forestry.storage.items; + +import net.minecraft.item.ItemStack; + +import forestry.core.items.ItemRegistry; + +public class ItemRegistryCrates extends ItemRegistry { + public final ItemCrated crate; + + public ItemRegistryCrates() { + // CRATE + crate = registerItem(new ItemCrated(ItemStack.EMPTY, null), "crate"); + } +} diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/storage/models/ModelCrate.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/forestry/core/models/ModelCrate.java rename to src/main/java/forestry/storage/models/ModelCrate.java index 1a65bf39d..ad4257f81 --- a/src/main/java/forestry/core/models/ModelCrate.java +++ b/src/main/java/forestry/storage/models/ModelCrate.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.models; +package forestry.storage.models; import javax.annotation.Nullable; import javax.vecmath.Matrix4f; @@ -41,10 +41,14 @@ import net.minecraftforge.client.model.PerspectiveMapWrapper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.core.items.ItemCrated; +import forestry.core.models.BlankModel; +import forestry.core.models.DefaultTextureGetter; +import forestry.core.models.ModelManager; +import forestry.core.models.TRSRBakedModel; import forestry.core.utils.Log; import forestry.core.utils.ModelUtil; -import forestry.storage.PluginStorage; +import forestry.storage.ModuleCrates; +import forestry.storage.items.ItemCrated; @SideOnly(Side.CLIENT) public class ModelCrate extends BlankModel { @@ -110,7 +114,7 @@ public class ModelCrate extends BlankModel { if(itemName == null){ IBakedModel baseCrateModel = cache.get("base"); if(baseCrateModel == null){ - baseCrateModel = ModelUtil.getModel(new ItemStack(PluginStorage.getItems().crate, 1, 1)); + baseCrateModel = ModelUtil.getModel(new ItemStack(ModuleCrates.getItems().crate, 1, 1)); baseCrateModel = ForgeHooksClient.handleCameraTransforms(baseCrateModel, TransformType.GROUND, false); } Log.error("Failed to load the model of the create item: {}, please report this to the authors of forestry.", itemName); @@ -123,7 +127,7 @@ public class ModelCrate extends BlankModel { List list = new LinkedList<>(); IBakedModel baseCrateModel = cache.get("base"); if(baseCrateModel == null){ - baseCrateModel = ModelUtil.getModel(new ItemStack(PluginStorage.getItems().crate, 1, 1)); + baseCrateModel = ModelUtil.getModel(new ItemStack(ModuleCrates.getItems().crate, 1, 1)); baseCrateModel = ForgeHooksClient.handleCameraTransforms(baseCrateModel, TransformType.GROUND, false); } for (BakedQuad quad : baseCrateModel.getQuads(null, null, 0L)) { diff --git a/src/main/java/forestry/storage/proxy/ProxyStorageClient.java b/src/main/java/forestry/storage/proxy/ProxyStorageClient.java index 5c7086e81..70b5d8dfa 100644 --- a/src/main/java/forestry/storage/proxy/ProxyStorageClient.java +++ b/src/main/java/forestry/storage/proxy/ProxyStorageClient.java @@ -1,12 +1,14 @@ package forestry.storage.proxy; -import forestry.core.models.ModelCrate; -import forestry.core.models.ModelEntry; -import forestry.core.models.ModelManager; import net.minecraft.client.renderer.block.model.ModelResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.models.ModelEntry; +import forestry.core.models.ModelManager; +import forestry.storage.models.ModelCrate; + @SuppressWarnings("unused") @SideOnly(Side.CLIENT) public class ProxyStorageClient extends ProxyStorage { diff --git a/src/main/resources/assets/forestry/blockstates/database.json b/src/main/resources/assets/forestry/blockstates/database.json new file mode 100644 index 000000000..8bbdf8763 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/database.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "forestry:database" }, + "facing=east": { "model": "forestry:database", "y": 90 }, + "facing=south": { "model": "forestry:database", "y": 180 }, + "facing=west": { "model": "forestry:database", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/models/block/database.json b/src/main/resources/assets/forestry/models/block/database.json new file mode 100644 index 000000000..3a13ac05c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/database.json @@ -0,0 +1,66 @@ +{ + "parent": "block/block", + "textures": { + "particle": "forestry:blocks/database_top", + "side": "forestry:blocks/database_side", + "top": "forestry:blocks/database_top", + "bottom": "forestry:blocks/database_bottom", + "column": "forestry:blocks/database_side_column" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 4, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, + "north": { "uv": [ 0, 12, 16, 16 ], "texture": "#side" }, + "south": { "uv": [ 0, 12, 16, 16 ], "texture": "#side" }, + "west": { "uv": [ 0, 12, 16, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 12, 16, 16 ], "texture": "#side" } + } + }, + { + "from": [ 2, 4, 2 ], + "to": [ 14, 12, 14 ], + "faces": { + "north": { "uv": [ 2, 4, 14, 12 ], "texture": "#side" }, + "south": { "uv": [ 2, 4, 14, 12 ], "texture": "#side" }, + "west": { "uv": [ 2, 4, 14, 12 ], "texture": "#side" }, + "east": { "uv": [ 2, 4, 14, 12 ], "texture": "#side" } + } + }, + { + "from": [ 0, 12, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#side" }, + "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#side" }, + "west": { "uv": [ 0, 0, 16, 4 ], "texture": "#side" }, + "east": { "uv": [ 0, 0, 16, 4 ], "texture": "#side" } + } + }, + { + "from": [ 14, 4, 5 ], + "to": [ 14.5, 12, 11 ], + "faces": { + "north": { "uv": [ 5, 4, 6, 12 ], "texture": "#column" }, + "south": { "uv": [ 10, 4, 11, 12 ], "texture": "#column" }, + "west": { "uv": [ 5, 4, 11, 12 ], "texture": "#column" }, + "east": { "uv": [ 5, 4, 11, 12 ], "texture": "#column" } + } + }, + { + "from": [ 1.5, 4, 5 ], + "to": [ 2, 12, 11 ], + "faces": { + "north": { "uv": [ 5, 4, 6, 12 ], "texture": "#column" }, + "south": { "uv": [ 10, 4, 11, 12 ], "texture": "#column" }, + "west": { "uv": [ 5, 4, 11, 12 ], "texture": "#column" }, + "east": { "uv": [ 5, 4, 11, 12 ], "texture": "#column" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/database.json b/src/main/resources/assets/forestry/models/item/database.json new file mode 100644 index 000000000..570e5f14f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/database.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/database", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/textures/blocks/database_bottom.png b/src/main/resources/assets/forestry/textures/blocks/database_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..86dd874a92426541d0d6d39d6dd8d4a21f95c2fc GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtCm#=|*8hY*c0i#$o-U3d7N_q{-ph5!K*Y^IPsnGb zbN7ytfG|^jAG#c+X+5O}eSPZi$Pomc;?< t`U{O07j>w&-Ce{Lqt-0e`m1d2d+Q}hvwqK;J_qOz22WQ%mvv4FO#lPFb}#?{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/database_side.png b/src/main/resources/assets/forestry/textures/blocks/database_side.png new file mode 100644 index 0000000000000000000000000000000000000000..a21884acadddddf1b2155dc9c7ce7190952d64b0 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtCm#o>Z_GMuAmZA;M4eUH z;NGSm+(s#9#h-A0S|0hEd#Q8#x>&CT!QKijH>O?nJXHAh!MnZP_iAm{y{mP~3ZA}^ z*Y;Y*rO3+D-GbIKc+Th9-50qQi!SWn`P}9H$4wh#=KH5)?iXU{ z3EL_6ZJ9+w$h}XW{<*$Tu5Y~9bt-z(m1TO5>vpp}xK$$JS9g`ufBpPDwR1!pd{$Z; zw%8?YSyb@p!ri$CDhfPxY|mXSQQUt>L|(7plH(@(zRfod-Z|T89viW(*;3u_%${cV ipY2}-Uj5hqz`TWF!S0Y5EiZtcW$<+Mb6Mw<&;$S>_K*kw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/database_side_column.png b/src/main/resources/assets/forestry/textures/blocks/database_side_column.png new file mode 100644 index 0000000000000000000000000000000000000000..60a9afb522207eaebbb14c68e4dcad172fd5500a GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtmoS%z27gS29#F`^)5S5w;&gI?1Z&R?maQp2{uy(h zTHNus_Wy*3wdEqHg7{?-hPlPF~rjWOVokYI@aB-Qgr SXl^^uECx?kKbLh*2~7Z6JvO=k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/database_top.png b/src/main/resources/assets/forestry/textures/blocks/database_top.png new file mode 100644 index 0000000000000000000000000000000000000000..073bef8db544d5671363fd4167d41f941bcadc66 GIT binary patch literal 510 zcmVibd3isc=Xw8sX>(!PdF%85=-C4_MP@Rp@jWNPk0+xV z>UcyYyEH?$XA{vBIv;)J5@WR5T_TzSKenhS)zy6%<8btaRrVid?4f zOnt?qR@TYv2_d<7%p<+A~GSN-fH|dWY>_>{0L?LRzI5&6BSts zP##_)HzG-xYhEW&WGU!Db?fTKO9)9;S*M<^kX$#zJ@9X}%6h0Iaf$GUBpnW$3g^@& zs?@%UVx?s;bN~PV07*qoM6N<$g5`(W AJpcdz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/gui/buttons.png b/src/main/resources/assets/forestry/textures/gui/buttons.png index 6cf248f11d32ff1ea7ba172087a4f1ad6d0b4d6f..dc5ee1feeba2f6c88deff70725c9c5b6aca7eb25 100755 GIT binary patch delta 9355 zcmb_?Wl&wgv*)=Ny|`Pj1a}KA!3h%FgF}Ge798%y-Q6WY65Ksp+$}(`;BJ8g_a*6z0rJ>7l!R=8KG8Vw8uKxT?^(m*&8#ajRXAWm=fTmb+b|6cN9dK$iPk3s zFhwly8>GENRLxHw6em8b!um%xF%($xq*7iL{$Us1bvyiI4f&26>~Y3r)38{6Mn2PU)}6Nb zI!f~#!@o|y!ZnTzd!PS4loHzSxIZ#eYC$Jtuy!$svO1ZwkfyEafe;!Sm%`{PbJZ zo{zMl7%v%pt6$;?<_!`wFskyfvDecvERY!fHv2vY2qS_K0YW*-&k|3r!$f%{e(5Yy zSfe9UQ|n17rY`TPp|BO+l*eq>`&F#zH!Sq$dB0l^r+f`C4ZJCxLN$@0P$-vDqVMVo zn4p4!f@k*dHdmEJ2q^klmjox)k42i zuz+m2!&Hm6(La#Q+Gu5w^Dd&fA&042^B!Q3uE9Nm-jj z1Kw9Emk`)EE`baNoOSl{O#fIAb4v4A2uQe`XW^SdO^(xpR)2GUf&LPHDCt~^oXLRW z`!0idDPWa)jykO1sRi3&c!*B<|G z?*gjiSrOL20Mo->aPP|M8zDSoCpl!8w(umSPaplkyKNlKOR?sSI_1H$*R!9*eA;D` zFxysA`+oLfLN}Pzg=?Ca=Qiz(aZo~KjXvXEH zVg!bXB+yF}7p(>C!8tTQwF0ZE1>#&2qt^Lewk3|jvce0On=vztmLb2mxdj~EQ)agX0nI&{}-_?zM z#t{y`*b8v&4UuJ><{@cZ9f6ujX(1I9vmT;c>*#CbNFj*0+^HbK43@;-cju?J7L~&o zA$7mwCj!|Y#sgFo0!kdSDXSOe-WQ_P%Kd;ed^Yf*&LNOwgHjPRt<9#J4qqq$P`tSc2A5`;h^a~Ut*5J^(C(Q9 zwpmaGI!YhKxdyC!tST679#t!@^lY`lx*i^&WZC(vrVOYz!lk^h>$BZivYQ8Q^ZW|D zmuTakY9ZsszKxHi^dHcqN+p&TB*ao6Qc{1BM~Zw0J4Bx>L?rBxOBiivbnid z&(`G&w(R+*==|_W>n28`*?O{YH?2Q@TK#p(>tUKd4u%kvrBALGp|dFUWeD~l7~xx} zHU#xOGn0+09Wno;&V44g-c!0SMbC8nXpAR1beK!pg?K#TAjZ9oO+4Y?+c5k^p~EmN zeSut!Y4z`W3#*Oe2VyoVS#e^QRd>;9JPf^U>DuDY;#PT~TS_?HbN7D8Fjk^+iSR0I zltptp{85h-EUw;qadqUc0q6QB^-La6!m9zn*xou=#H=L{FJxTNz$G6Qaz6V3bz|b& z_rl6%F@>(BF{*Ew6XaWTq(oA%C)%rN+P8wix5;-n22cGKWqb+svk1s;LaH04D#t0K zj-2>*uk{1&zVT~XOtn^ib3?A-#K0C(+cQNec_Ket8s2xlrx7kZf_#_Y3Oy@?`VDjH z-V@Qqy|YMsmlOWFuS0&P59hTJ`I#o>cJYgRBuQL3j#rS$LQi%z*irC1>e36jmH>Ba zaJ}{v1zneg0ZO9(Hzciy_iUCzO&KX{+YQMcr9TP5n9XdSEv+t}Q3JFn==Cuvy8L9F zp7hqlznMK~#kM-t&E^sq{GOa&ht7U||5<8|#_Qk$RP{;tmm~fo6XY!!k`I%(D2;J7 zRcX|)#-g}P^ZP^onKVeYk#wstYLk4;{dA(WsktKj5o zz~#K^L(;rrUDlA>*tw}O+fsvTN@T;YvCO*GoH|XPL155=n`N7wi&|r-yxfV+mJB_` zp~-B!wLjV>D@8$P(fon$&tLSL>y7OmDk?GG8$9SuSSO{}OzOp7#ox3j{xipE#{M^d z2PUXCnzMbcxsOg|RFh1dFrj0o+iBRw{_@8h*MPGB<7V8GaP~Di+144=#cPoyvV-+q z4rBjHhCLhPbju>U#CaTC%$e`N^gD3=QbTGbR{fAebGn}J65-*Vd))$3&ucre#Jaj- zd1P}-B8>V!<^|vFrU9ahx^joqxEF@zFKyX^-pe-Hl1AxKjx}mD=JZIo@r-T%ew9~W9ZWv!a{iH>?fnlFgYlL0A3(V#^Y&;t zpvqNbSuvlIMKtCx5po<^|5YQDsMoeSl^R@8Yge7y^xY5t_jZQc0Dm(RKjibYpG2AobD1j$={ku0e0-s*c(J_?5pF z85tp%q$j`cw9r~oAA#lz+FWfN84ymvDL(7;y}QV^otJ--QrLICffGH>++ytLf|Zsx zx`{}M#cBvIhK|K8TlNx}rB(4q&1rw(M~Tg4x>8E+MMc9xj2dW&GLM&a3_XIKo}#;Q zJt#9>KRVl#m3i`*PSLv2A}dOXg0&y^x9-*V20JjOuz4n5!kPV&5g(D|BLP5!VeXLs zjvhAE`o$y(QguD3ILgk>F3HwQm86H&M}|(y<3qEA$(TeJ?V|lVhnyuc#Bxg7%{8HS zkR248-C>u7jt;f6X+~D~U`zdztMgrwio{bb@Dug{kuyV^Kgke=&%+%Wi0ztA+SC3G zG#Ees5tQHF&6|bT_y>U(yK&%l(=6>c;AVbo1z<-MJV$OA_977(C0Hfpvvd8^+U0JB z69+=!3i?_;qgb1ymeAKtj!1T$W(PM_eW4s|?dIw=#0}-12^q}|c$|H;XKk4diFC+# z5vq&G2B*gFb#f&GdQeGJ`Q{$|M1lgidVh)gl)qsQ4gD}FLR9f2G~pOAT`(*k zt8KoUJlOb0J9TWnHDfvr4qHfeoNwgQ$?A>;?L;!cP20^6TO@6X^dr3H4c$XA5>w3O z!l`_Q(4YnQIi!Y|fD6^<(JB9;b~6%#!lNf7 zU@j%y=%Mg%D(WPDq8Ovj-kRXb`t@I2c9#{SVELXOxQ9~+YvLcOqs5Dn@cHI@pv+N6 z$_sgaYb$#?^;w8i?6UZTb77!lR400p8A|XaJM^wG+y2Y5amFKNL+TimPBt3sZevZb z4Z=%Xw=r=K_iXW4F=`ASu_JP;Nf@#$P-(EUugFj`854{d0N;KP)LfHJ`+kI<#lUNg z%FQuVyJk}(LH&(=_lQt9oU~Ry$beUX0p0j53s5}0zp(HTOkKLYvt!9VG4^gkNkv6@ z0*YBbK+C?PnO*M^$`$a z1e}@ZmKNJ5FMkJjZ+A-v2Zw)8Y#~!Sbm;xof&5iH#@-tJM@Fk{a2@Jqm44|M3X@rF zg`^Q8J|h-Z9;OM?9%xFU*e>-m`89SOSA`OP7FU~Sqj?!gLQ%L02df6F`i!J+;V)n+ zC}w0W3Zs_5_T%G3Glf6Xcf<0(LTVa`uV@i^CEXE3`y|sf>234i*!oA?cIo9ZP@^8O zae|hb!&}o>_1>fR#U0hvgL~VIY@C`HMGZ;ly+@-*4yin2GE4fcEz;hWgDR;eNZA<) zi%hzQ=ZI4wzI33>M^~Vla1~QN3Cw3$IO+?cIYcoimS^!)KswiNODIP5U9l^V-wcex=SPgkH&Zmqi>U zH3>SJt%bX&Mz)AYARAl5Ll($j46&PDgRvY{jBmUl*GSix60rt%`fr0 z;@L(caY=dB(nTI7&eR2u7|NIrO<`^@z7&@TQqpXhdZDNMXO?=ok`{$;Y3?F~{7!6p zOX-Kez(^L+s>fH_^d!nJ`%vmvzk(9R*p`SwKrKvdg@6#+A5>7>(Gyd z+9J=M`Vua^&TMNgOxg);qsi75S`X3U#`2?AOT`ji)vX1A3`m{}ebDmpwn`gh@joBJ zK&3FS!IJZGMdYqld*W{8*G6>lFQS(U1{lK)wrNwD@-(UU$E$`t0cB^d1pGUetJ&)( zAG34w-c1;FxPNfCL=)R#tT$-kFz&?o&WvfZk6E27Qu(yq6G zEKsSyikXb)*;501bWlUd}6Y0y~^p_=;CHdEER zLkC^1pg5Vz-KC!K9KXbh(@u;(lwbYPI70EuH@9`VB~V9w_pCA~C}d!!O!do%;Z;Ht z+hO6jW&zGlOIw^KRaJG9>r?C{NF^6hEWf-^{9{}QUFV4dM*V;Qdm*#!{6#ifZs}SG z(qAaFHfGzdEGR?{QPw|8Z2@mxAy~>3`%ULnqw`?PNwaXJoLMT`-qp2p*Rth3YR86= zfPn162PA^2&OLugVzrZQN^b#yLu%WXo=9(vdN!TBWRM*?_%X!R8G#2Mb#%LxlyJCneA03V&quT)}N|d>blu%g6z&4Wg_)^HhOLJ%9O~`u# zI_eY(9pKU(T{7cG?54FP@W$$WfYCgmtXCUdz^F!40d8b4H$4l%S>=1?6!I(Ms1Q*r z+X@C;ybY8F$7mbSb^qfBl{Rv+iMhTB!UN$!Ayn-)N2uXii7;Y1W zUU|%X$d8sHXChR9GCF@TEzmn??+zoaiCQV@{#@ABkU~7Rsc*`2>Xz=#{;vD>3XvxF zRWRge=)@Q7IVH$(x*PGK@-6{v@^E>)ba;p;uF7I>SMFC`Q`6emdTXrBkNoT!x76(J zq)5T%ug=6XKdHm?w|xWboYOc*gjtuN0~>@dvCW`C7>zU~66XDgvb8Cl zJ9GZjW`|*B-mQI-vqb-@ofLGZA;nSB0+Vq)Tz(*liF5LJ=kj_voo72-eWaf*xb$(PW<)8)IX z1rXz|{;RoN8x2OWTPZctniu+Yli%V!+>>3mUZNKTUM7WfJFGn@eqburN}E-NbZrt%RqKk55sd`yE&&fQEgGy>v6LoeJzU{s@D1J%F=cq-j)C&<)T%ZTkAb1iq=E#A%w#j|_HUHLx^h;lp!_z*R8A3Bv^gnAq#IvXUC za;B2ZZBFp7g@N#*=A(NeuCU&ajwEgJ_0Tinf#W)D{?#6s>m>@tZ(>j8=I4aQ(q|kU zlcgSlxI6;y3hsg2CSb(-e4K*pJD{sVGZB$GFht7NYbWR%e!XB0wt7Q|40tb{ zQ`h(_95G=Vu6e$nv6Mw;wcBN~%5O=Cf5kMyvpgiar+N}B?;tjMEPxVdKL41rnNYGd z$+Ytq@<>4V3Ec-OgtR*RWGQ#Hu-uiOh!OR2i|IhaA;${l@vHmEl-^VL$vjGTZR^d7 z3;(UJ_(a`=4OBb^KwXlPi-sK$dk!1PYwx8h2wBbD6FDB<)8lAiILqNt4*Uu9Wt^z- zR}>T--d>0$|NE>$0`vUtikv&nhF8^k?3S6M{!wYBsz+_x;qqhhX0>Ke@6Ghfs&K zQX}s#2Ie?z?#@zx;qM4hueLU$cs5(*6y0r?DC&rxm2N+grLDzQ2qS`eUvpThSh#r- zB6(P)bxmgs7_C#?fl%}OEQf8qf*!zPN|MkVDjzz2tlr~B2Db+}yC zi)3Mka%gk^YMDSs%j4s1)yeX*Zf8^+rUJ*w%KN2jRD??Vm9_`aH-YcBk2{8xF8Gi= z6e_#Nv*orcKK`$Fw;euD=eWw{70Y_7_i69WZ!hSJ3z&YJDPuI%Ts|Hg2vzoRmNh{? zcx8#;%idL8{dPFm4h7EN+_ByvNIzB^+6O*qH5lh}@Ef&_Y?@EmUh#<;tTwmZ;-G7HU+5kmgq3;xPpYJqP9EJ6XBgGcHAOGVH8#j)UDfxt{&r2`g(lv8Jo2 zK=HJ5_yqy&K`-?#QD%B~L+rN+ygK1H4@tUtkioi%%)jAxe#bP+lx>`}MJO<+2NVwX z4?xE*ZNFMUV9FaFD8Y8<@HqS#gmOLd=Kho7tg6_ivdfz2vj6FV750kH6_hA;WavG1 zH&z}pFDdfeBu1W}`(c;W%wsb4+E&|1$Ca|cpOV*uZ72I5J?VL8DmO;mkA={uzAvq67D!V8Bz}e(CwdQTFdg8U zTWEkOu+uk?5J!?i`t^y8?%c1tE2O!L`vX?Yh|S|)Q$o$jdFWGCJOi48=`3BM(do9% z5$h>va=yr4&d>?5+d()IIl?pBlM9`lDW;^;hCF>G19DrF2{H{8xRR~g1G>O}Adk|C z))}u{l#A5&ubZE&fKw<;jt1#W;Wd?4L`_5l1U_aL1?k(Q6*r`&lY^j_8y(tk*caZBYDyJ_W%!kbigUeq`zh8EHM{EQM1bZfylEwEsM z{gh$hOc)$2QWMo%Ix>{5lwvk8jV^xT8n^xkb1{Zy`8$_hq8nVlKD`*GNHV4ecefe5 znnR{5Ubo37kZvE!U|N%4j~fkq8R$7#qVK-8BxRdB6V?ww!6HNy^eZY>7x|bSN`0oj z9_#$BRszoXBkAkNSEICHqeNh?p4{=-qKICVUZLm$`6XkWB+MiJAeX>2jiir%Mu&!) zn?<0JT8rTyB%KLxlC46z7~fE(qx=k>RUZ4|a}<)6{d`p;(F;%$oXsE>@+!z@`5MuM zrSv#H1yNkOW|7A^5A}sReY(~aN!c3b8R8SJao$kzSO9hLZx$DMp;Z(uu0rjw$tYy1 zBev;FfxNvfUcw!XQzW)}uM(Pi4Fs#i=^APWq^TFYqZ2RIjsBNhkW~dz-%>@V|KJLI zEbgBsh)O2I$z$Zl(IK-E5xmFIiS+^Y{C+1;#Z~R8i+yGTaBk+AIq-Ptm?XL3=L8iY z$}ddSGwf{8{5gk=*pZU9eQ{!O(&Lwt=$ubuJ3#XN3?!mrI67R(Kb4Jux`BFrD9xKZ z1*5<}3AvEvuZn9a7M5JfLU=-=q-oZYFuv!s;5@se39(5+97l=#SqVBu=cKf@nI)ha`R-_=ty@gQ9m#MAdqcuYO$qCVK4bJ> zB(NOIJ}}NyI@cp=(dteoZ}^u#DEcX_v}-8(^;GZ<0r~k3r60N7GyCryqx&;3mXv6D z6$=QHMZDQp)%=$eRPi$(}U2L4^PYc0Oly6F}p*h4PlW)ZA%>bc&{y1#U z!OczOGJVmPqlF)WbZZ9#11JJ><@=TGMx-~*(`P53{}RpV_C$MG2Ne~wdtwwCKEX!4#JCrJ z{y10Y7*ltMr2pF&Cn>ywpds8|A?!VXq1%t{E#ybU|DgdL6CxpZ2*ZB%!x$I-0WZDt zs1YWwMw3>k)^GvS_rEb`{x709Jx=4ra>2jBIv>9>^!wy`EvjOVvqVf-W6ze=gMmP+ zTni{Hm4BW?6((PLCUwEg2Fkz6C^3NoBUJUv3`zL1Pyj&K{8vmMa(zHvWH~!E=Eqy7DXZZ(GGDpgX=@;ZO-c&Lcmz{kJTCJeW={`LX>!JdOwjoCSOZggn*HX?@k*!dG6o z(gVo{hXb1vo-S^sE3eL`>8az;P*ftB#kaJ7-7R+dPj|B0NHnz`~T1afFZ^+vqah2)+GTPIY6&<4Njv~1wCc0 zuR&`b;lomrRw6vFH60UfKH|rR_1>;B>1&@5P!u)|W^7_Ja!ZB=Q9qJesc7%i$ z1e`8yZq4;r-8XtZb2v3Z1~)+uj!7(Kt613oMgurVX(OVY6hG--c2ZE*5;I}|oHox0 zSZjagSeo8=BaBPdNX&SD#BIl+>WK-2+Mb+FpqLC^Vs*wsFlJZQ=gvVrbspCj07+p- zPZbF6bWGuo2|)kx*=E8|k0>5*0E~r|^*n5N{PF+US;ds4V^)h$&@9ADDV6^J459yz ziSJQ3ptnzooaMlb&E5CTi6?|Bu~}IxAdxa~`UyVPFolq>arU3e2DP!1Xi7l!b_%j3 zyS-;kOS(n{f;~u8lE-|(7I-c~=%Z4@KNYqE$9M81s;x;E!XX`szFWZF(cJva=Z(7t z+}BVLv{SY!0R`bw{&5PyWJ_Z`0Y&_A`X((*;=?mzCJPJ8^!Xd7EP5?jESQpI(JwlH zJ7x4O*d#NhRvt)CiToJ*3P@29vk;P?Y)*-K%X633T} z;I-tOPr#Zc41T)@S`$p+=7E=KW;4(X0w|=_W&jR}46-$#`Qe=8l-5Mti`EYi>|!`V z7=mk4c0a)#z*BX~|g_P{*ISYS~ivV&?Y0j75M)aT) z!$^M1Z<|&abUz0$VDOr8!7Pll7|n@jacbc(I7##u26!fcV2vr#8Q=<#KCCt%qF9Rt zS`h$~Iz+lekY*>xf@{r&J4wrv9ZJl(2sqD^Q>R|Oj27eS>OSVJ01}JMEC_Up_b`jg z5HYk1OvH#0#^!&Kba?53Iyg`QG8iqQpzt_UgwRBUk~=Jnxe7p~Z~<#Kl)^w5(IRn% zwN4IkMduNV07-LB>E%9Zg+D(pg?GLc-wJ>&z<|Z9GGY$fbulE#eE?vspwVDtaUg)q zGdVydVM{I60BhBjerid^0T??R7)^SS1Cr@hlo4})PAq@;N&}@Zb9dOglo+E4I8W+h zeiCrL@|N93fMGn7&vYU>w;LfVe|qqQ@8S~_Fvei|A<~w_CosY=L2b#Pd?0`G+Ekzm z^@47r6p=K#PTkVj&XqgcIHhm12E2aIH+3B*1}-ol5J3M83z#he=A3%{_=G*@>+4cL zZ7c%FA@2gY&|k&P^y|p*>FUGNqPhd-9*!sMMuzT1F+VEjFN>&ps9fY+(9Q* zGCDGeAV?0fh`tUCbn|Js#l&(%fCPpS25bwQuQvkbrv+YLU#kh4>Cp4BN~(MQT=^e% z3+Pt&Qb3Qk0-h^~8Q=1!_QZmXz~%r%sSDJ>sB?d~k)|@H2rEVm%jg3bAb&#wV4X4$ zh8d&KqyP|O0CE~YzhkTDN?7;v3Q zW=c8_DF8VA$5FPoT%|Ce%%DDYMW421w2{OB2zu5BJVokFr3L`%g(5evWe8@bYq$MH zh4z1qyXP;LZGpK7P~or9Ct%&ajpDcbX?eo8M;!f25h`NvMWwP3*>dN0Kl>ao@W|sw z_Qa-wr>JzI1ZAY#FfWYhM95YNgcQ{j7@Wivm_<#Xs>0R)>^HX}VmCqRhWo50_#vIQ zk$c|2;`U9NKjy6fiU=d-dcUZ=XXNp&ul|1n#e1kXwo_G^#V{i1N`UkfJ77#HPy!f0 ztqevOzj#OcjxYm#Bq(r~K}sU9%!Re69FzIw9ZAnTdDRR98r$o&n0HEOtx&zW*9qPmxh5!(ZA{eH3DQU#75*uO;v#kJ~ z=bU`mqsN!u_x!0m(H^IH-z>Y<=;wb7u6L+?Z1Rgbl0c+LjBa`^EgylHJhBy2@1i-Q z;b(FnOo;su2`mO_=w9G&??tG0n|4q(09Y-A4oOYG6!n?iM-R8$xBPAa+OD0^X>c7* z*e)qSol2KFFI6U6#?L9aI3vS@#5P?|@C zSpa^DppN|71O7uiJ$OPtL<}auRFb$1fD^kcwk@ z8%b_M{RsgatjC?%9D*IYRpNgmsZzJ+ltX}g#==-1GCjsFa+*UHi4XM$J{X4I-^QX; z?wRx@z}}XCOC(iAHlH4g-5vl?b-&+VJbtBpQj&D$wtjbF|Gxeu_M*(0dj9y0CiJo_ zRw;V9+Qqv4djlZnynkS0Kwk2GADSrALM~Q_cf;0YVYknYJrVLbF0X&f;rVcQc{#lF zzgU`M$bCH29nWEh_x|Pi)8WMW84v_Z%2mv`@_q9vpKOYXw z6=_E19;)5>^73g-z?A{2%Y(MEby-xK_L-zM07#p^Ke1cigs8ZL;v_{96ds=9qMDV| zoInz!QFHYcz^LM8l<XIGgR9Ean8M zS~rEBhO0<1dNukDCy>}eMX4fDitTrX<~M(JB75a3D%x*sxdN~(g8@g4L6KGJ`!}1X_~Bhnti_{!fI4OVIOn1_3HlN47n}IXwIU}mO zYKsw#$2L=_3@T&LgOmhXHBw|i1BGxED>Mrl?dojE1j&gEpg&BQpgEW@=$5zW9g*9L zq=aI#0sy=*-~k$1skSWOvXHttvCqDpi^s-7%VQwrD)L7OWK*6Bsq`{Rc3exevF*xw zi&u+Q-nxJL8q*4atfLj^^`o!3M$#cR_x5l)2MdaowiszX+Y!3XC2$2`zu)5_rv3h5 z4}^B?d8GFz_Su+=Js#u@15koppzkaQZ$(M%jp>92A}YPn6VUwMR3ZY>-6$d|*Ez9R zuMR{?fIAgnIo6c4xE=W)G9i+vNciPy3$?vPVpo5!oQ?o!&N;sS9kl}i#=EUJ&QI*K zJ{N63-)o`~N!;s9&eh%PjeCZOTlsiXO@tb4L8>5&7}t+IM00-Y<}!SeL@4wc++bV$ z$s;L5niVH(9JpFEgw-cJ=0C4aX4**7l4OQ~{JM zn$)9~S_pAvWHPBnC;j*qx)N;Rv?35X!NCCuAVLZW$jX4%lF!du*+&hV&7c4Besg(o z`EIk>oY>=wkTE9iwXmN(=~UY8$w&W%fX;uTc)x&g4=uuIo|MQeUZVkK=MX5XyGTsA z1ZYlbnUa+_M)V|u0V?!VL6<=-H}`7D(whr$6N-^GzyA$ChhHML^{%{X)P(oeLt~+4 zfJdR3bF{2KmD$X_sVrs`rPbnu8-+qE6jH9$QJzj3RkCO;%4GV)c@ z(E|S-^7ud6e}4V7n|CMnS?Yvjd`5i5%u^^y7bQ#Y+2Xp)0l+d*gdHN1WZf$bQ*@M^07scrK|`2qVt6X>g#jR!)Rx7^a1@23cMV4st`_l9lWAz1!|i$qH~S}$^L7KEfJT?@<^5-VhYW3c zIeq52yA>Dmpv1=bETh-S^FQh+=6{qN6?6DUwx33Z-7(@Hg*r|~>2 z#qlrcRkj_s4MY21?bseIBd61(TN29>iGr^r#hJ889@?Mp1wbCf^;?HFEv_JNu{tyW zXa@iT9Yqm1qH}*pcdzDhNgGon9Yl1Zg_*Lh>^X>-IpW^+8hKUx1ie&t;*J#vriA;6pE=m=Sa5@|OCe#U0%?q0clMG3H+-80 zKWi3%{)3KopXX)z?;HU99fD`0%bwj6K~ko9;ieZRVX!ekG@GIs8?5^)M<#%GDI$B? zK+mj&tAKyfynZ(PMl+f0$?h9|v{umLrrS7}4YFX&D1{^_GliHObIzIguM`U{{Wpb> z8Gai_coOL)hRP^Ovld zMuk?XUByQ&V#DnmFNv4MndWiUtQmNcnjNz@fk}TqRRcRr9E0=Eo*9=NQ+@NE9J{{jzVF6Y^Y32P#-LUM0%*?;NUKg_+UkA`QB5{GM=ISD8JDt% z?leY}$Xw}x&cd>SGgP5rCLdZ8F{7H%wE!h0AZ{-})BBZHkW$@LINeM-&WQcPKaS(8`FAgCEHG z1GdI6rjV||DIXboY_Ti_W<`W?$`S;x)EIxOUm`Ltod=!SElOpJp2g}HqJ$T5Chsym zbI#G8&uwj`nuMIL(}$U1EvBu+5m|x-fdAX9Hg3>YFNorn@L0^Zl2W{UO3@Kf4*Bb+ z5hGczGTWe!#4o&+-7OaIkKwKvcXkqdd{p1V z6W7o2TmRE+*_w@$1?#L+bPZS#I;Vf)Mb>Rc0`jKhyk@zDEK|B5QIU6wvE>NK2ze=Z zl4Pz=#aOW8ao=;pQ$1#zZUjKRd0CjA=1^);v=W&Wa^-Iqyt-`q4EbWx@Sx?6h+J}3 z8+F0UGKsl!UY3;=C>ET3E$O00J_5*&RkfB_QrxavAjvNbFWF)#IYdRp4BvkM1&UbG zDc#)yfRYv}c+J2!cZ{nGOj;E(UsiGs;#hcSsh%9~mfjjKY@vDmNTI}1 zzx1hG!*nJ9x)6ERgM<*4#+zLLjhpUR7-xiDN!+SZuiNpGwwzLBFpIqu_1jhf%5h%R z)U#tI##GTn3gnh1N^TiEDuPeXm?VR{dcS7fc-8s-&lIW6duJw*FF1dXLq%i2=>`B^ z)W$x3jiN;{u`NMu{4B9xrlywV_chBnUrdNScWsf$v4$y~ZnoTVYdu?vjhSY$J@f88 z3SKvpn44!gb9=&wl#9rIQ}9~lQR0s`0PwOlZf!iD?=kBShr90WuV*YgPGc_{!$Ys% z4%^dkH@rEY#^HoN*y?{U=*LG8?5FeL9z(2mcav=5Gz!rB`|0iJbe<-;KAg`#Jz}Hp zkHhqC!mT$Go{=X`coXEt{;ul=oCTTg&>0zh3DkZ*pD?y|0{|~-yK|B&uQw8Q~yKPACBM`oI$9u8{fzY$TW=LwtIi*j>Fjf(749_8GQiV z-e`dg`cFb{xCaA(YkKI%>2!X4CpUoWa2(G9+`}}Tribou>>3|K!vnv^f4L!p6M$hD z2DSrqp2jzh;{9hRu`vBNzaAtZ61G4a1^k5LE9X!6UVs)6GSk--0TS}52h?N@S&05C zQ!!9r6OZ=Z2HSs?kcpDzmmo1B?l*YCk{nZHuVP38nQNzjhx97Rao|RRH>=6mh{}f0 zPci%*Kg9-SfSHs1VFSrp;IraTlDOm&j9_(Z13`aA5-=#HM^+&96b2_l-TYu&k7owwQUHH;cQ1Bf^kMm2%0h^!w+>0P#+Nhah&l8 z=mdXHbx|opx$TP~fYi2ViU3$w*%$D*d1(U!5R__d zG=F)glM=8LTe2@Fx((r~TKT?7J*%ZSdCPxt{O2PJ_&cksQoNWQl-N0WC2YPC@2oD3 z9@A|PimrP9)E>A1mF0@K1tl#FrF*G$=aG!EatVlO_i-@ocPOGx4d8L>l1O}Hf$Mse z_yz5=m$L1i?Y|8wdXW8~dX2o9!juTD6e#7$<0(}F94!D+7&3O=Ct?OJ1wa`^1$%$9 z;-pMqn~S}O%aV`3KO`XbcI9iR%xvqinvyuL`D`OV1W9P?9?Cl|%lKt< zwRjDEWP#KFjkWYZ*-BKqQH^UQ($D*~CK6?-ulkPU-GeC(eV0$gXby}oIQzv}nt(!B zw+cAlTYt}JfhN;u9(#FbC-*9|@Mh+})PX>e zQBcZIfWP>wd!WoY`S@yem8ixIs-P7!R;Q7jY7p7DWKcZ^u1=Yis#Y0e)JJAlfkt;P z6|SgPF<74wHYC*^CkX;999! zT*Wuc%ec|(5|`@Ia3VKX$hT^#VvBKy_%KVeQ!@rZr*&gxuUGjz#buWY#3dmly5=?82&rzg1SoSxvOb9#cC&gltmI;SVN>710-rgKtSo6bpTZ8|5V zwdtIc)}HrQ_?(p1u77{*+#wMF01U%G|7?=yA@Hv+p{yi_*Z`4}(u$mvR^+6#A}6I4 zITe}6smMf5MJ948GLch}iJXc|(M6`5*p5b^BXF%bYT48*YVM_mm0(I>O; zqBqu2WX3v*%veW}8S5xAV;x227(fA_08juZ02BZU00n@88~lIl+yMaq004rZ|F8Rz zv?ENu#RU`u6xd;Qm>p(^*W84T~AdJGf0|nv?2zQj*`5czG z16}08Vk(PbkhVx}o3RmTa)ZqKntkp5vVo8P2><{90000000000000000000000000 z00000002P$@HT(Iaa567wM8p;1GIl%MO5W3e*>I{ysN0ib;#*&fLi5xpQ0Am#uJ&^y+_ z;Q-6;708RnE3mFh4wG8sby+-Kfw@2Yd(0l+0@FAQ)d zc5Jk2JX$1e%1m2%UY*%RObQ3+%U-~ zmG_NhI39@5G9qLrC=y{C1`r@XPItU*mSDzuB*8sM%?RiSw12JWHlGZaal$jLA?h5? zB$;W6bZ&Iw3=T4Q1tp`B4bp!9HN zzOn76)3HT}FMFB7)FAd_AuGkKSP(H!WiR8w>qUJBH)dgK+{_^#=mhb?LIi7m%DYJ1 z-ZfJ{+hMl;Z&`4?h07GeP@6tCy_HqD$@LbLyFcyxBXECr+6@TK;P>ma24XOwx~ zc<|NrzJFuPDm_pj(HHKn|Lk5(B!%DugGytI#sPkQCmI?WO8L1g$T7#P97qK6>d9}6 z9j7=PoHW;DKxw_IkX3Bb_N-?dfzgf0OLOL}zmiNp>?t0;z+-MoN_0Shr*=Wi^gahD ztk6Vy+xQUn{;IVI&mb^zf#Lt-FPtse>i#XS=Nrwz#V2hf>Sey8R#akR0}e!h3bD-S z=wY?gj5|c9zN=&1DYxt}gdwpwx!l2u-9e%CRM%^eX+7pmV_XL+q9Wd}yJTRyq%~-O z=rp6IROA`mo_%O3fv+kqgUG2ro3sPe&?%c1s~}`f&8gAU*Tka8OB7UM($;C2d8DFt z%G$+8_u0|;;p@o6J#1YzhvW3Xvb(yyU2tPsheN5f(KN-7f{~TGgh(0LWJSV5`@~?% zOYVx8hlK1!O_GdM99T@;FUN|K?iK?t-<8yJ+#xM(9FH1!B8IC3^<(1~_ieemYm0xg z^`*I$oG(=LLo-{<8^?CNf_~4?X9_d&C3rV@* z7Ixhs29T52%J`IvM>7=Qnmo+MkJYQ}O#bqs0?13WzS02gyc&~Q$#=|i5E9opn%r%L z;jNSBvVd;EQ~;F(3>s;QiONj%fR;Q!J%Fi7hS_-1*q-1b>Saotdo1pleSue*{85|V z^il^sT@!OpK+dJ}MxNz|CIY1L7p7F6Wdzm=Dv!+ihqbUoGh%h#!Mg69GuBN>?@NyW z@2C*4jJ9Pn?OBb<9V&e@*Xw7|n z0S-yJOV}NAlot~L=xAuIzu*A5>f5M^ab2Km_v3JD@=0FvwBAbf|C=I%E$-d8W#8Uf aWV)R@ZLHGmbv&B_(&FyovckQhjq*f}%j^hZzI`_6m!z3<)g-Fx1B-#7lg zp1NA5S^xlDZ!foF06z0#K#E% zWfdkWP&38b$6fQSmNDXs?Lj49nF9bLc)Q^O(uWpCxd~=dJ2aQ4#M%qh1$x}xh&b%}b^ z&CfAObnVEIBZ9AkLqq51957#6DzCpHj|GvhdBajfx9np3o<2QXT3$Z4!Ja4`-)UBR z?1@*4b_bLBKqgCnBN8pDa5qI(L4od4GVSZ|aJ{y+HezBT*NX!~t-`S4Yy(j2&Zfy+ zQq+LX&0U@#h!HNpyP~J^3Vk8w7*Z28ga7bhjt9pXm<(cRw{C6A&(DVfjq3E+n3yw( zQA8pRU~SS7kB0SHpd2^?pgwjWWps118vwQco?rkA02IIh<#(Vz4EUAwuScoA!XKsn zGt75gs<+YY?dg1{Jo3svCt2HmmwfL}m``+DuOEY1}vT#TGX zMKnwBzO}3C0AEE)(YXA!i`)>P#Y`I0t376U)W>H#gku{_AdIEifQTzc{rr~h+r*Pd z;ecX50hDSa1O}!LQ4!?q6sSMo6eB=!nBi}lPRGcSus@+{4flt21t^NC39nmnRTes2 z-#z)b0D0@RG2kDv+KIl~*}2`p!J+T{`;(LUyM-eo&yT+;FE1xvyci0wj1vR`Ly6(Y zd}`3bCkdI`EPWwS=Cj98V4EMHP~Z-t)*y2tHGnLH3V2WUzrwiW~d4uKfk;w9xabbrP?|= zI@<1{IN94%V`5`>2s0NY%*lt#R>DJ$*_nK45C*D}8oITc#)CX;Z*RYyBNwrF&E;if zT9rEMa>k75nnHI7hH5m9``4*cmIu$T?Cwq%k7LCSbKE&?3{TEw0eg>6b--UW4mQ7x z&ddy7O`n(WqCA^uXmjC(vy6GO^!?#N=T`3Qs!N@eB%8-%5=y8@ienOo<2X(DUY5{JBnCK+xz}F z65dG&LBhiVknr;Y4K*khcCVfaPv_$;n0QzzROd9VD0*JNoW1jj?u8-inrwZRAcZ!h1#l{6q=KodU=|Y(>^WGSALo+q3ZR@ zO?f<4^lu>H9j`P0KkUEh0Wy@S>n7)JLRX#UKc`m_0Kay;XuGdQ>i4pc9|ZX1y(9q2 zWNT9P+2$+N#H_U;411`>NGTOL*Mym9`9iY{ILXdZrT$Al@=DF})J72=X0f@s`C;}f zTP8`8C}9+wKIQ2+!;X-e+t+oK0}WvtPr91BJ;q$CRM~`MBuTvCvYfSJcySFzrzYMh^1RCK$d!)cdZQZ7 zR2Y(IHg~Q|dJZ<(Y}Kch0yp>RK@a<0IE14^u;U1;9#|U)aa(YL+`Pf-lXBFqJIX zTELqg(&v>KOC=|iE71ofqJN0<^^0;xH|ho!731s+3YLq#DIB_>4f%@VU`%$=yU{d! zpb1`RUA(dy#Dw=PN=h2mS?isF=Q6BNYB|__kvA@ju1>s}#Tj^3JwEucd~0=nJuHnu zJ36M|K3irK73RV5vWQP}d6VJIfx$}dGeTOXIpH3?AAiMN`#`wx8`WBPu)tkg9%|kH zy?W2zp8XJqyP5Q;w6=0XjQH*;GqNSBqgf@kl`jU3Gist2h5`p8olo~17RQE#pHz;` z^%8eSXz`cT+}fg>^%%(J*G*|;M9)@vS^UF&E{_NysF4Iu;7+(N=u22#|L%~Z zdR#!xdDHHWAg5XIYoCr8xG~GwZ|~wTXA{;cl?og=4Q?8q!I1&9@V)3~jn-4@CE3a>aRq>j|Az z1Rf^N*G#~V9f+F^5Hl}eB)R-1+w}}7qJgz+gV`i>Z~BY(DSM@4*ELb-XZ3@ekDB*( L_jPN*M`Zm6J>a|4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/gui/database_screen.png b/src/main/resources/assets/forestry/textures/gui/database_screen.png new file mode 100644 index 0000000000000000000000000000000000000000..b7d00d7b1b816aa461e3bbc68a533df329c88cc2 GIT binary patch literal 1390 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5C#Tjh5(-sS0EP%$LPJBlyStAaJNEzoe~9cTIT`}PH3T@yRN{etV=M{s3ubV5b|VeMN%D4gVd!9$ z^#F1>3p^r=85sBufiR<}hF1enkiEpy*OmPtC$E5-WT>PD zv0*)*0WgOq+)v*9*;sy_^mWEBKa%Pr7>+FmImm@YqU{F5>0kT`dIwUu85kN&51d}m zD*%*HV(fY9VsWFsp>u*MQ2fJt);#Wngoe}e4`d$@kWu($lfYxoUl4o1g`)u|&mg?8 zLU>`6{3IqI8x9)w-Q(MBlcxX@oG-!(6~DpB#PHzLj?M|eAc2qj42y1a!?l4V6O>Yv zo`?YD92gp2+ZEhImHoha;N68}QFW)hEi4KK4nKCEwOu3kSLWgCYj+C`AAP+4-tv~@ zf!DfDQGxGx6t40ekawtDxpJ#}9dE#!wb9iqP)ES20O3=C4gUC;hv(A@ub>A7jY7#&U>?EnAo j_bS;bDxQ-tkd_tWq5g#?u}b=FAhSGO{an^LB{Ts5u0qI{ literal 0 HcmV?d00001