From 28d9a1f3a821333fd79fee2f0ae1407715d88a38 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Tue, 7 May 2024 09:04:40 -0400
Subject: [PATCH] [ci skip] Update API publish work

---
 .github/workflows/build-1206.yml  | 17 ++++++++---------
 README.md                         |  4 ++--
 build.gradle.kts                  |  6 +++---
 gradle.properties                 |  2 +-
 patches/server/0001-Rebrand.patch |  6 +++---
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-1206.yml b/.github/workflows/build-1206.yml
index 067a3275..3c0c1305 100644
--- a/.github/workflows/build-1206.yml
+++ b/.github/workflows/build-1206.yml
@@ -36,15 +36,14 @@ jobs:
           mv build/libs/leaf-paperclip-1.20.6-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.20.6-mojmap.jar
           mv build/libs/leaf-paperclip-1.20.6-R0.1-SNAPSHOT-reobf.jar ./leaf-1.20.6-reobf.jar
 
-      - name: Publish API
-        if: github.event_name != 'pull_request'
-        run: |
-          echo "GITHUB_USERNAME=Leaf" >> $GITHUB_ENV
-          export GITHUB_USERNAME=Leaf
-          echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
-          export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-          ./gradlew :leaf-api:publish
-          ./gradlew publishDevBundlePublicationToLeafRepository -PpublishDevBundle=true
+#      - name: Publish API
+#        if: github.event_name != 'pull_request'
+#        run: |
+#          ./gradlew :leaf-api:publish
+#          ./gradlew publishDevBundlePublicationToLeafRepository -PpublishDevBundle=true
+#        env:
+#          ORG_GRADLE_PROJECT_leafUsername: ${{ secrets.REPO_USER }}
+#          ORG_GRADLE_PROJECT_leafPassword: ${{ secrets.REPO_PASSWORD }}
 
       - name: Upload Leaf
         uses: actions/upload-artifact@main
diff --git a/README.md b/README.md
index 6a844f5c..b5e00a29 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ Building a Paperclip JAR for distribution:
 ### Maven
 ```xml
 <dependency>
-    <groupId>org.dreeam.leaf</groupId>
+    <groupId>cn.dreeam.leaf</groupId>
     <artifactId>leaf-api</artifactId>
     <version>1.20.6-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
@@ -56,7 +56,7 @@ Building a Paperclip JAR for distribution:
 ### Gradle
 ```kotlin
 dependencies {
-    compileOnly("org.dreeam.leaf:leaf-api:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("cn.dreeam.leaf:leaf-api:1.20.6-R0.1-SNAPSHOT")
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
index f5f786e4..eb5c674d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -86,7 +86,7 @@ paperweight {
 }
 
 tasks.generateDevelopmentBundle {
-    apiCoordinates = "org.dreeam.leaf:leaf-api"
+    apiCoordinates = "cn.dreeam.leaf:leaf-api"
     mojangApiCoordinates = "io.papermc.paper:paper-mojangapi"
     libraryRepositories.set(
         listOf(
@@ -113,8 +113,8 @@ allprojects {
                 name = "leaf"
                 url = uri("https://maven.pkg.github.com/Winds-Studio/Leaf")
 
-                credentials.username = System.getenv("GITHUB_USERNAME")
-                credentials.password = System.getenv("GITHUB_TOKEN")
+                credentials.username = System.getenv("REPO_PASSWORD")
+                credentials.password = System.getenv("REPO_USER")
             }
 
             publications {
diff --git a/gradle.properties b/gradle.properties
index b262ef8b..9291071a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-group = org.dreeam.leaf
+group = cn.dreeam.leaf
 version = 1.20.6-R0.1-SNAPSHOT
 
 galeCommit = 593d73f96816716e0ef7c017140b914bf0c93279
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index afc76d08..b17a3e30 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -101,7 +101,7 @@ index a77d650fd3b58cc883f284e1d2e41459ae0a77cd..ff4603d4749afdd3ff388c4b5d02ae66
              while (this.getRunningThread().isAlive()) {
                  this.getRunningThread().stop();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e1c8b5a9f8d8056ff687b65fa2e571579bd6beb4..1231a1e2106a75417d1da9dc3e1488704b91a3f1 100644
+index 4a9e867bb2589fd48940dee89c5ddc9abb58be55..5f9cc88fbb05e587e022160b392e58a88b7d6fea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -271,7 +271,7 @@ import javax.annotation.Nullable; // Paper
@@ -127,7 +127,7 @@ index 79192e3a0f27d48f35c0378b58e587212ed2c305..006adb2adb27c497ede69f87e78bc3e3
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 0b5979723bb30f9011ac64c36d894aa41713ec9b..17e3ee3a73a2347e9f0baa0ed1640a3b0e75ed16 100644
+index 0b5979723bb30f9011ac64c36d894aa41713ec9b..e220f5601f6b92b7b280ce8ebe64117d30192b0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
@@ -135,7 +135,7 @@ index 0b5979723bb30f9011ac64c36d894aa41713ec9b..17e3ee3a73a2347e9f0baa0ed1640a3b
          String result = "Unknown-Version";
  
 -        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.galemc.gale/gale-api/pom.properties"); // Gale - branding changes
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.dreeam.leaf/leaf-api/pom.properties"); // Gale - branding changes // Leaf
++        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/cn.dreeam.leaf/leaf-api/pom.properties"); // Gale - branding changes // Leaf
          Properties properties = new Properties();
  
          if (stream != null) {