Merge pull request #542 from Shynixn/development

Merge changes to master --release

.github/workflows/main.yml

@@ -24,13 +24,6 @@ jobs:
         with:
           java-version: '8'
 
-      - name: Cache Forge Dependencies
-        id: cache-forge-dependencies
-        uses: actions/cache@v2
-        with:
-          path: /home/runner/.gradle/caches/minecraft
-          key: forge-dependencies
-
       - name: Cache Spigot Dependencies
         id: cache-spigot-dependencies
         uses: actions/cache@v2
@@ -86,17 +79,6 @@ jobs:
           asset_name: PetBlocks-Bukkit.jar
           asset_content_type: application/jar
 
-      - name: Upload Sponge Release to Github
-        if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: /home/runner/work/PetBlocks/PetBlocks/petblocks-sponge-plugin/build/libs/petblocks-sponge-plugin-${{ env.RELEASE_VERSION }}.jar
-          asset_name: PetBlocks-Sponge.jar
-          asset_content_type: application/jar
-
   Documentation:
     runs-on: ubuntu-latest
     if: "contains(github.ref, 'master')"
@@ -113,7 +95,7 @@ jobs:
       - name: Create JavaDocs
         uses: Shynixn/[email protected]
         with:
-          source-dirs: "petblocks-api/src/main/kotlin;petblocks-bukkit-api/src/main/kotlin;petblocks-sponge-api/src/main/kotlin"
+          source-dirs: "petblocks-api/src/main/kotlin;petblocks-bukkit-api/src/main/kotlin"
           target-dir: "docs/apidocs"
           doctype: "javaDocs"
           github-secret: ${{ secrets.GITHUB_TOKEN }}

settings.gradle.kts

@@ -17,7 +17,4 @@ include("petblocks-bukkit-plugin:petblocks-bukkit-nms-118R1")
 include("petblocks-bukkit-plugin:petblocks-bukkit-nms-118R2")
 include("petblocks-bukkit-plugin:petblocks-bukkit-nms-119R1")
 include("petblocks-core")
-include("petblocks-sponge-api")
-include("petblocks-sponge-plugin")
 include("petblocks-tools")
-include("petblocks-sponge-api")