From ef90f2228b5afbfb037b89ef45c99038c5523b74 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 12 Aug 2017 19:38:04 -0700 Subject: [PATCH] Split "api" into one api module for every module --- all/build.gradle | 10 +++++----- api/build.gradle | 5 ----- botany-api/build.gradle | 5 +++++ .../src/main/java/binnie/botany/api/BotanyAPI.java | 0 .../java/binnie/botany/api/gardening/EnumAcidity.java | 0 .../botany/api/gardening/EnumFertiliserType.java | 0 .../java/binnie/botany/api/gardening/EnumMoisture.java | 0 .../java/binnie/botany/api/gardening/EnumSoilType.java | 0 .../java/binnie/botany/api/gardening/IBlockSoil.java | 0 .../binnie/botany/api/gardening/IGardeningManager.java | 0 .../java/binnie/botany/api/gardening/package-info.java | 0 .../botany/api/genetics/EnumFlowerChromosome.java | 0 .../binnie/botany/api/genetics/EnumFlowerColor.java | 0 .../binnie/botany/api/genetics/EnumFlowerStage.java | 0 .../binnie/botany/api/genetics/IAlleleFlowerColor.java | 0 .../botany/api/genetics/IAlleleFlowerEffect.java | 0 .../botany/api/genetics/IAlleleFlowerSpecies.java | 0 .../api/genetics/IAlleleFlowerSpeciesBuilder.java | 0 .../binnie/botany/api/genetics/IBotanistTracker.java | 0 .../java/binnie/botany/api/genetics/IColorMix.java | 0 .../main/java/binnie/botany/api/genetics/IFlower.java | 0 .../java/binnie/botany/api/genetics/IFlowerColor.java | 0 .../binnie/botany/api/genetics/IFlowerDefinition.java | 0 .../binnie/botany/api/genetics/IFlowerFactory.java | 0 .../java/binnie/botany/api/genetics/IFlowerGenome.java | 0 .../binnie/botany/api/genetics/IFlowerMutation.java | 0 .../botany/api/genetics/IFlowerMutationBuilder.java | 0 .../java/binnie/botany/api/genetics/IFlowerRoot.java | 0 .../java/binnie/botany/api/genetics/IFlowerType.java | 0 .../java/binnie/botany/api/genetics/package-info.java | 0 .../src/main/java/binnie/botany/api/package-info.java | 0 botany/build.gradle | 3 ++- build.gradle | 3 ++- core-api/build.gradle | 1 + .../src/main}/java/binnie/core/api/IBinnieRecipe.java | 0 .../main}/java/binnie/core/api/ICraftingManager.java | 0 .../java/binnie/core/api/block/BlockMetadata.java | 0 .../java/binnie/core/api/block/IBlockMetadata.java | 0 .../java/binnie/core/api/block/TileEntityMetadata.java | 0 .../java/binnie/core/api/genetics/IBreedingSystem.java | 0 .../java/binnie/core/api/genetics/IFieldKitPlugin.java | 0 .../src/main}/java/binnie/core/api/genetics/IGene.java | 0 .../java/binnie/core/api/genetics/IItemAnalysable.java | 0 .../src/main}/java/binnie/core/api/gui/Alignment.java | 0 .../src/main}/java/binnie/core/api/gui/IArea.java | 0 .../src/main}/java/binnie/core/api/gui/IBorder.java | 0 .../src/main}/java/binnie/core/api/gui/IPoint.java | 0 .../src/main}/java/binnie/core/api/gui/ITexture.java | 0 .../src/main}/java/binnie/core/api/package-info.java | 0 core/build.gradle | 4 ++++ extrabees-api/build.gradle | 5 +++++ .../main/java/binnie/extrabees/api/ExtraBeesAPI.java | 0 extrabees/build.gradle | 3 ++- extratrees-api/build.gradle | 5 +++++ .../java/binnie/extratrees/api/CarpentryManager.java | 0 .../binnie/extratrees/api/ICarpentryInterface.java | 0 .../src/main/java/binnie/extratrees/api/IDesign.java | 0 .../java/binnie/extratrees/api/IDesignCategory.java | 0 .../java/binnie/extratrees/api/IDesignMaterial.java | 0 .../main/java/binnie/extratrees/api/IDesignSystem.java | 0 .../src/main/java/binnie/extratrees/api/ILayout.java | 0 .../src/main/java/binnie/extratrees/api/IPattern.java | 0 .../main/java/binnie/extratrees/api/IToolHammer.java | 0 .../extratrees/api/carpentry/DesignerManager.java | 0 .../binnie/extratrees/api/carpentry/EnumPattern.java | 0 .../binnie/extratrees/api/carpentry/IBlockDesign.java | 0 .../api/carpentry/IBlockDesignProperties.java | 0 .../java/binnie/extratrees/api/carpentry/Layout.java | 0 .../main/java/binnie/extratrees/api/package-info.java | 0 .../api/recipes/ExtraTreesRecipeManager.java | 0 .../extratrees/api/recipes/IBreweryCrafting.java | 0 .../binnie/extratrees/api/recipes/IBreweryManager.java | 0 .../binnie/extratrees/api/recipes/IBreweryRecipe.java | 0 .../extratrees/api/recipes/IDistilleryManager.java | 0 .../extratrees/api/recipes/IDistilleryRecipe.java | 0 .../extratrees/api/recipes/IFruitPressManager.java | 0 .../extratrees/api/recipes/IFruitPressRecipe.java | 0 .../extratrees/api/recipes/ILumbermillManager.java | 0 .../extratrees/api/recipes/ILumbermillRecipe.java | 0 .../binnie/extratrees/api/recipes/package-info.java | 0 extratrees/build.gradle | 5 +++-- genetics-api/build.gradle | 5 +++++ .../main/java/binnie/genetics/api/IItemChargeable.java | 0 .../src/main/java/binnie/genetics/api/IItemSerum.java | 0 .../main/java/binnie/genetics/api/package-info.java | 0 genetics/build.gradle | 6 ++++-- settings.gradle | 2 +- 87 files changed, 44 insertions(+), 18 deletions(-) delete mode 100644 api/build.gradle create mode 100644 botany-api/build.gradle rename {api => botany-api}/src/main/java/binnie/botany/api/BotanyAPI.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/gardening/EnumAcidity.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/gardening/EnumFertiliserType.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/gardening/EnumMoisture.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/gardening/EnumSoilType.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/gardening/IBlockSoil.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/gardening/IGardeningManager.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/gardening/package-info.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IAlleleFlowerColor.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IAlleleFlowerEffect.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpecies.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpeciesBuilder.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IBotanistTracker.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IColorMix.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IFlower.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IFlowerColor.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IFlowerDefinition.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IFlowerFactory.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IFlowerGenome.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IFlowerMutation.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IFlowerMutationBuilder.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IFlowerRoot.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/IFlowerType.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/genetics/package-info.java (100%) rename {api => botany-api}/src/main/java/binnie/botany/api/package-info.java (100%) create mode 100644 core-api/build.gradle rename {core/src/api => core-api/src/main}/java/binnie/core/api/IBinnieRecipe.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/ICraftingManager.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/block/BlockMetadata.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/block/IBlockMetadata.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/block/TileEntityMetadata.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/genetics/IBreedingSystem.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/genetics/IFieldKitPlugin.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/genetics/IGene.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/genetics/IItemAnalysable.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/gui/Alignment.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/gui/IArea.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/gui/IBorder.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/gui/IPoint.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/gui/ITexture.java (100%) rename {core/src/api => core-api/src/main}/java/binnie/core/api/package-info.java (100%) create mode 100644 extrabees-api/build.gradle rename {api => extrabees-api}/src/main/java/binnie/extrabees/api/ExtraBeesAPI.java (100%) create mode 100644 extratrees-api/build.gradle rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/CarpentryManager.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/ICarpentryInterface.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/IDesign.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/IDesignCategory.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/IDesignMaterial.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/IDesignSystem.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/ILayout.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/IPattern.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/IToolHammer.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/carpentry/EnumPattern.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/carpentry/IBlockDesign.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/carpentry/IBlockDesignProperties.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/carpentry/Layout.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/package-info.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/recipes/IBreweryCrafting.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/recipes/IBreweryManager.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/recipes/IBreweryRecipe.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/recipes/ILumbermillManager.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/recipes/ILumbermillRecipe.java (100%) rename {api => extratrees-api}/src/main/java/binnie/extratrees/api/recipes/package-info.java (100%) create mode 100644 genetics-api/build.gradle rename {api => genetics-api}/src/main/java/binnie/genetics/api/IItemChargeable.java (100%) rename {api => genetics-api}/src/main/java/binnie/genetics/api/IItemSerum.java (100%) rename {api => genetics-api}/src/main/java/binnie/genetics/api/package-info.java (100%) diff --git a/all/build.gradle b/all/build.gradle index fbe448fd..43b3f8be 100644 --- a/all/build.gradle +++ b/all/build.gradle @@ -1,9 +1,9 @@ archivesBaseName = 'all-' + mcversion dependencies { - compile project(":botany") - compile project(":core") - compile project(":extrabees") - compile project(":extratrees") - compile project(":genetics") + runtimeOnly project(":botany") + runtimeOnly project(":core") + runtimeOnly project(":extrabees") + runtimeOnly project(":extratrees") + runtimeOnly project(":genetics") } diff --git a/api/build.gradle b/api/build.gradle deleted file mode 100644 index 73ab5b0c..00000000 --- a/api/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -archivesBaseName = 'api-' + mcversion - -dependencies { - compile project(":core").sourceSets.api.output -} diff --git a/botany-api/build.gradle b/botany-api/build.gradle new file mode 100644 index 00000000..8c0bd3a7 --- /dev/null +++ b/botany-api/build.gradle @@ -0,0 +1,5 @@ +archivesBaseName = 'botany-api-' + mcversion + +dependencies { + compile project(":core-api") +} diff --git a/api/src/main/java/binnie/botany/api/BotanyAPI.java b/botany-api/src/main/java/binnie/botany/api/BotanyAPI.java similarity index 100% rename from api/src/main/java/binnie/botany/api/BotanyAPI.java rename to botany-api/src/main/java/binnie/botany/api/BotanyAPI.java diff --git a/api/src/main/java/binnie/botany/api/gardening/EnumAcidity.java b/botany-api/src/main/java/binnie/botany/api/gardening/EnumAcidity.java similarity index 100% rename from api/src/main/java/binnie/botany/api/gardening/EnumAcidity.java rename to botany-api/src/main/java/binnie/botany/api/gardening/EnumAcidity.java diff --git a/api/src/main/java/binnie/botany/api/gardening/EnumFertiliserType.java b/botany-api/src/main/java/binnie/botany/api/gardening/EnumFertiliserType.java similarity index 100% rename from api/src/main/java/binnie/botany/api/gardening/EnumFertiliserType.java rename to botany-api/src/main/java/binnie/botany/api/gardening/EnumFertiliserType.java diff --git a/api/src/main/java/binnie/botany/api/gardening/EnumMoisture.java b/botany-api/src/main/java/binnie/botany/api/gardening/EnumMoisture.java similarity index 100% rename from api/src/main/java/binnie/botany/api/gardening/EnumMoisture.java rename to botany-api/src/main/java/binnie/botany/api/gardening/EnumMoisture.java diff --git a/api/src/main/java/binnie/botany/api/gardening/EnumSoilType.java b/botany-api/src/main/java/binnie/botany/api/gardening/EnumSoilType.java similarity index 100% rename from api/src/main/java/binnie/botany/api/gardening/EnumSoilType.java rename to botany-api/src/main/java/binnie/botany/api/gardening/EnumSoilType.java diff --git a/api/src/main/java/binnie/botany/api/gardening/IBlockSoil.java b/botany-api/src/main/java/binnie/botany/api/gardening/IBlockSoil.java similarity index 100% rename from api/src/main/java/binnie/botany/api/gardening/IBlockSoil.java rename to botany-api/src/main/java/binnie/botany/api/gardening/IBlockSoil.java diff --git a/api/src/main/java/binnie/botany/api/gardening/IGardeningManager.java b/botany-api/src/main/java/binnie/botany/api/gardening/IGardeningManager.java similarity index 100% rename from api/src/main/java/binnie/botany/api/gardening/IGardeningManager.java rename to botany-api/src/main/java/binnie/botany/api/gardening/IGardeningManager.java diff --git a/api/src/main/java/binnie/botany/api/gardening/package-info.java b/botany-api/src/main/java/binnie/botany/api/gardening/package-info.java similarity index 100% rename from api/src/main/java/binnie/botany/api/gardening/package-info.java rename to botany-api/src/main/java/binnie/botany/api/gardening/package-info.java diff --git a/api/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java b/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java rename to botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerChromosome.java diff --git a/api/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java b/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java rename to botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerColor.java diff --git a/api/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java b/botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java rename to botany-api/src/main/java/binnie/botany/api/genetics/EnumFlowerStage.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerColor.java b/botany-api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerColor.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerColor.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerColor.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerEffect.java b/botany-api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerEffect.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerEffect.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerEffect.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpecies.java b/botany-api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpecies.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpecies.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpecies.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpeciesBuilder.java b/botany-api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpeciesBuilder.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpeciesBuilder.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpeciesBuilder.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IBotanistTracker.java b/botany-api/src/main/java/binnie/botany/api/genetics/IBotanistTracker.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IBotanistTracker.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IBotanistTracker.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IColorMix.java b/botany-api/src/main/java/binnie/botany/api/genetics/IColorMix.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IColorMix.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IColorMix.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IFlower.java b/botany-api/src/main/java/binnie/botany/api/genetics/IFlower.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IFlower.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IFlower.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IFlowerColor.java b/botany-api/src/main/java/binnie/botany/api/genetics/IFlowerColor.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IFlowerColor.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IFlowerColor.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IFlowerDefinition.java b/botany-api/src/main/java/binnie/botany/api/genetics/IFlowerDefinition.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IFlowerDefinition.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IFlowerDefinition.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IFlowerFactory.java b/botany-api/src/main/java/binnie/botany/api/genetics/IFlowerFactory.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IFlowerFactory.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IFlowerFactory.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IFlowerGenome.java b/botany-api/src/main/java/binnie/botany/api/genetics/IFlowerGenome.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IFlowerGenome.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IFlowerGenome.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IFlowerMutation.java b/botany-api/src/main/java/binnie/botany/api/genetics/IFlowerMutation.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IFlowerMutation.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IFlowerMutation.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IFlowerMutationBuilder.java b/botany-api/src/main/java/binnie/botany/api/genetics/IFlowerMutationBuilder.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IFlowerMutationBuilder.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IFlowerMutationBuilder.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IFlowerRoot.java b/botany-api/src/main/java/binnie/botany/api/genetics/IFlowerRoot.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IFlowerRoot.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IFlowerRoot.java diff --git a/api/src/main/java/binnie/botany/api/genetics/IFlowerType.java b/botany-api/src/main/java/binnie/botany/api/genetics/IFlowerType.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/IFlowerType.java rename to botany-api/src/main/java/binnie/botany/api/genetics/IFlowerType.java diff --git a/api/src/main/java/binnie/botany/api/genetics/package-info.java b/botany-api/src/main/java/binnie/botany/api/genetics/package-info.java similarity index 100% rename from api/src/main/java/binnie/botany/api/genetics/package-info.java rename to botany-api/src/main/java/binnie/botany/api/genetics/package-info.java diff --git a/api/src/main/java/binnie/botany/api/package-info.java b/botany-api/src/main/java/binnie/botany/api/package-info.java similarity index 100% rename from api/src/main/java/binnie/botany/api/package-info.java rename to botany-api/src/main/java/binnie/botany/api/package-info.java diff --git a/botany/build.gradle b/botany/build.gradle index de51b64f..6b6adeda 100644 --- a/botany/build.gradle +++ b/botany/build.gradle @@ -1,8 +1,9 @@ archivesBaseName = 'botany-' + mcversion dependencies { - compile project(":api") compile project(":core") + compile project(":botany-api") + compile project(":extratrees-api") // TODO: remove compile project(":extratrees") diff --git a/build.gradle b/build.gradle index 41432cd5..fb21d33a 100644 --- a/build.gradle +++ b/build.gradle @@ -98,7 +98,8 @@ allprojects { } } -def mainProjects = [':api', ':botany', ':core', ':extrabees', ':extratrees', ':genetics'].collect{ subproject -> project(subproject) } +def mainProjects = [':core', ':core-api', ':botany', ':botany-api', ':extrabees', 'extrabees-api', ':extratrees', 'extratrees-api', ':genetics', 'genetics-api'] + .collect{ subproject -> project(subproject) } mainProjects.each { subproject -> evaluationDependsOn( subproject.path ) } jar.dependsOn mainProjects.tasks['classes'] jar { diff --git a/core-api/build.gradle b/core-api/build.gradle new file mode 100644 index 00000000..034caec0 --- /dev/null +++ b/core-api/build.gradle @@ -0,0 +1 @@ +archivesBaseName = 'core-api-' + mcversion diff --git a/core/src/api/java/binnie/core/api/IBinnieRecipe.java b/core-api/src/main/java/binnie/core/api/IBinnieRecipe.java similarity index 100% rename from core/src/api/java/binnie/core/api/IBinnieRecipe.java rename to core-api/src/main/java/binnie/core/api/IBinnieRecipe.java diff --git a/core/src/api/java/binnie/core/api/ICraftingManager.java b/core-api/src/main/java/binnie/core/api/ICraftingManager.java similarity index 100% rename from core/src/api/java/binnie/core/api/ICraftingManager.java rename to core-api/src/main/java/binnie/core/api/ICraftingManager.java diff --git a/core/src/api/java/binnie/core/api/block/BlockMetadata.java b/core-api/src/main/java/binnie/core/api/block/BlockMetadata.java similarity index 100% rename from core/src/api/java/binnie/core/api/block/BlockMetadata.java rename to core-api/src/main/java/binnie/core/api/block/BlockMetadata.java diff --git a/core/src/api/java/binnie/core/api/block/IBlockMetadata.java b/core-api/src/main/java/binnie/core/api/block/IBlockMetadata.java similarity index 100% rename from core/src/api/java/binnie/core/api/block/IBlockMetadata.java rename to core-api/src/main/java/binnie/core/api/block/IBlockMetadata.java diff --git a/core/src/api/java/binnie/core/api/block/TileEntityMetadata.java b/core-api/src/main/java/binnie/core/api/block/TileEntityMetadata.java similarity index 100% rename from core/src/api/java/binnie/core/api/block/TileEntityMetadata.java rename to core-api/src/main/java/binnie/core/api/block/TileEntityMetadata.java diff --git a/core/src/api/java/binnie/core/api/genetics/IBreedingSystem.java b/core-api/src/main/java/binnie/core/api/genetics/IBreedingSystem.java similarity index 100% rename from core/src/api/java/binnie/core/api/genetics/IBreedingSystem.java rename to core-api/src/main/java/binnie/core/api/genetics/IBreedingSystem.java diff --git a/core/src/api/java/binnie/core/api/genetics/IFieldKitPlugin.java b/core-api/src/main/java/binnie/core/api/genetics/IFieldKitPlugin.java similarity index 100% rename from core/src/api/java/binnie/core/api/genetics/IFieldKitPlugin.java rename to core-api/src/main/java/binnie/core/api/genetics/IFieldKitPlugin.java diff --git a/core/src/api/java/binnie/core/api/genetics/IGene.java b/core-api/src/main/java/binnie/core/api/genetics/IGene.java similarity index 100% rename from core/src/api/java/binnie/core/api/genetics/IGene.java rename to core-api/src/main/java/binnie/core/api/genetics/IGene.java diff --git a/core/src/api/java/binnie/core/api/genetics/IItemAnalysable.java b/core-api/src/main/java/binnie/core/api/genetics/IItemAnalysable.java similarity index 100% rename from core/src/api/java/binnie/core/api/genetics/IItemAnalysable.java rename to core-api/src/main/java/binnie/core/api/genetics/IItemAnalysable.java diff --git a/core/src/api/java/binnie/core/api/gui/Alignment.java b/core-api/src/main/java/binnie/core/api/gui/Alignment.java similarity index 100% rename from core/src/api/java/binnie/core/api/gui/Alignment.java rename to core-api/src/main/java/binnie/core/api/gui/Alignment.java diff --git a/core/src/api/java/binnie/core/api/gui/IArea.java b/core-api/src/main/java/binnie/core/api/gui/IArea.java similarity index 100% rename from core/src/api/java/binnie/core/api/gui/IArea.java rename to core-api/src/main/java/binnie/core/api/gui/IArea.java diff --git a/core/src/api/java/binnie/core/api/gui/IBorder.java b/core-api/src/main/java/binnie/core/api/gui/IBorder.java similarity index 100% rename from core/src/api/java/binnie/core/api/gui/IBorder.java rename to core-api/src/main/java/binnie/core/api/gui/IBorder.java diff --git a/core/src/api/java/binnie/core/api/gui/IPoint.java b/core-api/src/main/java/binnie/core/api/gui/IPoint.java similarity index 100% rename from core/src/api/java/binnie/core/api/gui/IPoint.java rename to core-api/src/main/java/binnie/core/api/gui/IPoint.java diff --git a/core/src/api/java/binnie/core/api/gui/ITexture.java b/core-api/src/main/java/binnie/core/api/gui/ITexture.java similarity index 100% rename from core/src/api/java/binnie/core/api/gui/ITexture.java rename to core-api/src/main/java/binnie/core/api/gui/ITexture.java diff --git a/core/src/api/java/binnie/core/api/package-info.java b/core-api/src/main/java/binnie/core/api/package-info.java similarity index 100% rename from core/src/api/java/binnie/core/api/package-info.java rename to core-api/src/main/java/binnie/core/api/package-info.java diff --git a/core/build.gradle b/core/build.gradle index b92334f7..787dcb53 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1 +1,5 @@ archivesBaseName = 'core-' + mcversion + +dependencies { + compile project(":core-api") +} diff --git a/extrabees-api/build.gradle b/extrabees-api/build.gradle new file mode 100644 index 00000000..3ea09f62 --- /dev/null +++ b/extrabees-api/build.gradle @@ -0,0 +1,5 @@ +archivesBaseName = 'extrabees-api-' + mcversion + +dependencies { + compile project(":core-api") +} diff --git a/api/src/main/java/binnie/extrabees/api/ExtraBeesAPI.java b/extrabees-api/src/main/java/binnie/extrabees/api/ExtraBeesAPI.java similarity index 100% rename from api/src/main/java/binnie/extrabees/api/ExtraBeesAPI.java rename to extrabees-api/src/main/java/binnie/extrabees/api/ExtraBeesAPI.java diff --git a/extrabees/build.gradle b/extrabees/build.gradle index 3b04871c..8502a5d0 100644 --- a/extrabees/build.gradle +++ b/extrabees/build.gradle @@ -1,6 +1,7 @@ archivesBaseName = 'extrabees-' + mcversion dependencies { - compile project(":api") compile project(":core") + compile project(":core-api") + compile project(":extrabees-api") } diff --git a/extratrees-api/build.gradle b/extratrees-api/build.gradle new file mode 100644 index 00000000..69425b98 --- /dev/null +++ b/extratrees-api/build.gradle @@ -0,0 +1,5 @@ +archivesBaseName = 'extratrees-api-' + mcversion + +dependencies { + compile project(":core-api") +} diff --git a/api/src/main/java/binnie/extratrees/api/CarpentryManager.java b/extratrees-api/src/main/java/binnie/extratrees/api/CarpentryManager.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/CarpentryManager.java rename to extratrees-api/src/main/java/binnie/extratrees/api/CarpentryManager.java diff --git a/api/src/main/java/binnie/extratrees/api/ICarpentryInterface.java b/extratrees-api/src/main/java/binnie/extratrees/api/ICarpentryInterface.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/ICarpentryInterface.java rename to extratrees-api/src/main/java/binnie/extratrees/api/ICarpentryInterface.java diff --git a/api/src/main/java/binnie/extratrees/api/IDesign.java b/extratrees-api/src/main/java/binnie/extratrees/api/IDesign.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/IDesign.java rename to extratrees-api/src/main/java/binnie/extratrees/api/IDesign.java diff --git a/api/src/main/java/binnie/extratrees/api/IDesignCategory.java b/extratrees-api/src/main/java/binnie/extratrees/api/IDesignCategory.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/IDesignCategory.java rename to extratrees-api/src/main/java/binnie/extratrees/api/IDesignCategory.java diff --git a/api/src/main/java/binnie/extratrees/api/IDesignMaterial.java b/extratrees-api/src/main/java/binnie/extratrees/api/IDesignMaterial.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/IDesignMaterial.java rename to extratrees-api/src/main/java/binnie/extratrees/api/IDesignMaterial.java diff --git a/api/src/main/java/binnie/extratrees/api/IDesignSystem.java b/extratrees-api/src/main/java/binnie/extratrees/api/IDesignSystem.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/IDesignSystem.java rename to extratrees-api/src/main/java/binnie/extratrees/api/IDesignSystem.java diff --git a/api/src/main/java/binnie/extratrees/api/ILayout.java b/extratrees-api/src/main/java/binnie/extratrees/api/ILayout.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/ILayout.java rename to extratrees-api/src/main/java/binnie/extratrees/api/ILayout.java diff --git a/api/src/main/java/binnie/extratrees/api/IPattern.java b/extratrees-api/src/main/java/binnie/extratrees/api/IPattern.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/IPattern.java rename to extratrees-api/src/main/java/binnie/extratrees/api/IPattern.java diff --git a/api/src/main/java/binnie/extratrees/api/IToolHammer.java b/extratrees-api/src/main/java/binnie/extratrees/api/IToolHammer.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/IToolHammer.java rename to extratrees-api/src/main/java/binnie/extratrees/api/IToolHammer.java diff --git a/api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java b/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java rename to extratrees-api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java diff --git a/api/src/main/java/binnie/extratrees/api/carpentry/EnumPattern.java b/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/EnumPattern.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/carpentry/EnumPattern.java rename to extratrees-api/src/main/java/binnie/extratrees/api/carpentry/EnumPattern.java diff --git a/api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesign.java b/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesign.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesign.java rename to extratrees-api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesign.java diff --git a/api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesignProperties.java b/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesignProperties.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesignProperties.java rename to extratrees-api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesignProperties.java diff --git a/api/src/main/java/binnie/extratrees/api/carpentry/Layout.java b/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/Layout.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/carpentry/Layout.java rename to extratrees-api/src/main/java/binnie/extratrees/api/carpentry/Layout.java diff --git a/api/src/main/java/binnie/extratrees/api/package-info.java b/extratrees-api/src/main/java/binnie/extratrees/api/package-info.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/package-info.java rename to extratrees-api/src/main/java/binnie/extratrees/api/package-info.java diff --git a/api/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java b/extratrees-api/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java rename to extratrees-api/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java diff --git a/api/src/main/java/binnie/extratrees/api/recipes/IBreweryCrafting.java b/extratrees-api/src/main/java/binnie/extratrees/api/recipes/IBreweryCrafting.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/recipes/IBreweryCrafting.java rename to extratrees-api/src/main/java/binnie/extratrees/api/recipes/IBreweryCrafting.java diff --git a/api/src/main/java/binnie/extratrees/api/recipes/IBreweryManager.java b/extratrees-api/src/main/java/binnie/extratrees/api/recipes/IBreweryManager.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/recipes/IBreweryManager.java rename to extratrees-api/src/main/java/binnie/extratrees/api/recipes/IBreweryManager.java diff --git a/api/src/main/java/binnie/extratrees/api/recipes/IBreweryRecipe.java b/extratrees-api/src/main/java/binnie/extratrees/api/recipes/IBreweryRecipe.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/recipes/IBreweryRecipe.java rename to extratrees-api/src/main/java/binnie/extratrees/api/recipes/IBreweryRecipe.java diff --git a/api/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java b/extratrees-api/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java rename to extratrees-api/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java diff --git a/api/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java b/extratrees-api/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java rename to extratrees-api/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java diff --git a/api/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java b/extratrees-api/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java rename to extratrees-api/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java diff --git a/api/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java b/extratrees-api/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java rename to extratrees-api/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java diff --git a/api/src/main/java/binnie/extratrees/api/recipes/ILumbermillManager.java b/extratrees-api/src/main/java/binnie/extratrees/api/recipes/ILumbermillManager.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/recipes/ILumbermillManager.java rename to extratrees-api/src/main/java/binnie/extratrees/api/recipes/ILumbermillManager.java diff --git a/api/src/main/java/binnie/extratrees/api/recipes/ILumbermillRecipe.java b/extratrees-api/src/main/java/binnie/extratrees/api/recipes/ILumbermillRecipe.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/recipes/ILumbermillRecipe.java rename to extratrees-api/src/main/java/binnie/extratrees/api/recipes/ILumbermillRecipe.java diff --git a/api/src/main/java/binnie/extratrees/api/recipes/package-info.java b/extratrees-api/src/main/java/binnie/extratrees/api/recipes/package-info.java similarity index 100% rename from api/src/main/java/binnie/extratrees/api/recipes/package-info.java rename to extratrees-api/src/main/java/binnie/extratrees/api/recipes/package-info.java diff --git a/extratrees/build.gradle b/extratrees/build.gradle index 890b2e2b..293413d1 100644 --- a/extratrees/build.gradle +++ b/extratrees/build.gradle @@ -1,7 +1,8 @@ archivesBaseName = 'extratrees-' + mcversion dependencies { - compile project(":api") compile project(":core") - compile project(":core_api") + compile project(":core-api") + compile project(":extratrees-api") + compile project(":botany-api") } diff --git a/genetics-api/build.gradle b/genetics-api/build.gradle new file mode 100644 index 00000000..401eba43 --- /dev/null +++ b/genetics-api/build.gradle @@ -0,0 +1,5 @@ +archivesBaseName = 'genetics-api-' + mcversion + +dependencies { + compile project(":core-api") +} diff --git a/api/src/main/java/binnie/genetics/api/IItemChargeable.java b/genetics-api/src/main/java/binnie/genetics/api/IItemChargeable.java similarity index 100% rename from api/src/main/java/binnie/genetics/api/IItemChargeable.java rename to genetics-api/src/main/java/binnie/genetics/api/IItemChargeable.java diff --git a/api/src/main/java/binnie/genetics/api/IItemSerum.java b/genetics-api/src/main/java/binnie/genetics/api/IItemSerum.java similarity index 100% rename from api/src/main/java/binnie/genetics/api/IItemSerum.java rename to genetics-api/src/main/java/binnie/genetics/api/IItemSerum.java diff --git a/api/src/main/java/binnie/genetics/api/package-info.java b/genetics-api/src/main/java/binnie/genetics/api/package-info.java similarity index 100% rename from api/src/main/java/binnie/genetics/api/package-info.java rename to genetics-api/src/main/java/binnie/genetics/api/package-info.java diff --git a/genetics/build.gradle b/genetics/build.gradle index 93a5b66f..8e36e9d0 100644 --- a/genetics/build.gradle +++ b/genetics/build.gradle @@ -1,10 +1,12 @@ archivesBaseName = 'genetics-' + mcversion dependencies { - compile project(":api") compile project(":core") + compile project(":genetics-api") - // TODO: remove these + // TODO: remove these, they should add on to genetics instead compile project(":botany") + compile project(":botany-api") + compile project(":extrabees-api") compile project(":extratrees") } diff --git a/settings.gradle b/settings.gradle index b4fbc9d9..d47bed7b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ rootProject.name = 'binnie-mods-' + mcversion -include ':all', ':api', ':core', ':core_api', ':botany', ':extrabees', ':extratrees', ':genetics' \ No newline at end of file +include ':all', ':core', ':core-api', ':botany', ':botany-api', ':extrabees', 'extrabees-api', ':extratrees', 'extratrees-api', ':genetics', 'genetics-api'