Merge branch 'ver/1.16.5' of github.com:YatopiaMC/Yatopia into stagin…

…g/1.16.5
YatopiaMC · Mar 22, 2021 · 5e0ce3d · 5e0ce3d
2 parents 6c76e8a + fea0b56
commit 5e0ce3d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -75,12 +75,12 @@ jobs:
 
     - name: Build Yatopia
       run: |
-        ./gradlew clean build yatoclip
+        ./gradlew clean build paperclip
         
     - name: Upload Artifact
       if: github.ref != 'refs/heads/ver/1.16.4'
       uses: actions/upload-artifact@v2
       with:
         name: Yatopia-${{ matrix.java }}
-        path: yatopia-1.16.5-yatoclip.jar
+        path: yatopia-1.16.5-paperclip.jar
 
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -51,12 +51,12 @@ pipeline {
                 ) {
                     withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) {
                         sh '''
-                        ./gradlew clean build yatoclip publish
+                        ./gradlew clean build paperclip publish
                         mkdir -p "./target"
                         basedir=$(pwd)
                         paperworkdir="$basedir/Paper/work"
                         mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
-                        cp "yatopia-$mcver-yatoclip.jar" "./target/yatopia-$mcver-yatoclip-b$BUILD_NUMBER.jar"
+                        cp "yatopia-$mcver-paperclip.jar" "./target/yatopia-$mcver-paperclip-b$BUILD_NUMBER.jar"
                         '''
                     }
                 }

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Run the following commands in the root directory:
 ./gradlew initGitSubmodules
 ./gradlew setupUpstream
 ./gradlew applyPatches
-./gradlew yatoclip
+./gradlew paperclip
 ```