From 9f237a1a1fa532871e0912bb6c301e0bd5b6f7cc Mon Sep 17 00:00:00 2001
From: Alpha <dev@alpha93.kr>
Date: Fri, 26 Jan 2024 15:56:25 +0900
Subject: [PATCH] Fix package publishing (#85)

Signed-off-by: Alpha <dev@alpha93.kr>
---
 .github/workflows/release.yml | 25 ++++++++++++++++++++++---
 build.gradle.kts              |  2 +-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a10df9c..749acb6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,6 +22,12 @@ jobs:
     if: "!startsWith(github.event.commits[0].message, '[CI-Skip]')"
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Setup Variables
+        id: setup
+        env:
+          BRANCH: ${{ github.ref_name }}
+        run: echo "branch=${BRANCH##*/}" >> $GITHUB_OUTPUT
+    
       - name: Checkout repository
         uses: actions/checkout@v4
 
@@ -32,7 +38,15 @@ jobs:
         with:
           repository: PlazmaMC/Javadocs
           path: javadoc
-          ref: ${{ github.ref_name }}
+          ref: ${{ steps.setup.outputs.branch }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Checkout javadocs
+        uses: actions/checkout@v4
+        if: startsWith(github.ref_name, 'ver/') || startsWith(github.ref_name, 'dev/')
+        with:
+          repository: PlazmaMC/Javadocs
+          path: jdmain
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Validate Gradle Wrapper
@@ -65,16 +79,21 @@ jobs:
         if: startsWith(github.ref_name, 'ver/') || startsWith(github.ref_name, 'dev/')
         continue-on-error: true
         run: |
-          if [ ! -d "$DIRECTORY" ]; then
+          if [ ! -d "javadoc" ]; then
             mkdir javadoc
             cd javadoc
-            git init && git branch -m ${{ github.ref_name }}
+            git init && git branch -m ${{ steps.setup.outputs.branch }}
             git remote add origin https://github.com/PlazmaMC/Javadocs
           fi
           
           (cd Plazma-API/build/docs/javadoc && tar c .) | (cd javadoc && tar xf -)
           cd javadoc
           git add . && git commit -m "Update Javadocs"
+          git push -f
+
+          cd ../jdmain
+          git submodule update
+          git add . && git commit -m "Update Javadocs"
           git push
 
       - name: Publish Packages
diff --git a/build.gradle.kts b/build.gradle.kts
index f3c0cbe..c1819b4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -40,7 +40,7 @@ allprojects {
         repositories {
             maven {
                 name = "githubPackage"
-                url = uri("https://maven.pkg.github.com/PlazmaMC/Plazma")
+                url = uri("https://maven.pkg.github.com/PlazmaMC/PlazmaBukkit")
 
                 credentials {
                     username = System.getenv("GITHUB_USERNAME")