new: b6 release

.github/workflows/build.yml

@@ -1,31 +1,36 @@
-name: build
+name: Build
 
 on:
-  - push
+  push:
+    branches: [ legacy ]
+  pull_request:
+    branches: [ legacy ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
+      - name: Checkout repository and submodules
+        uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Java setup
-        uses: actions/setup-java@v2
+      - name: Setup java
+        uses: actions/setup-java@v4
         with:
-          distribution: "zulu"
+          distribution: "adopt"
           java-version: 8
           cache: "gradle"
-      - name: Set outputs
-        id: vars
-        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
       - name: Build
-        run: chmod +x ./gradlew && ./gradlew setupCiWorkspace && ./gradlew build
-      - name: Rename build artifacts
-        run: mv build/libs/FDPClient-*.jar build/libs/FDPClient-build.jar
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: FDPClient
-          path: build/libs/FDPClient-build.jar
+        run: ./gradlew setupCiWorkspace && ./gradlew build
+      - name: Upload artifact
+        run: |
+          cd build/libs
+          export JAR=$(find . -regex '.*fdpclient-b[0-9|.]*\.jar')
+          export FDP_VERSION=$(echo $JAR | sed -r 's/.\/fdpclient-([a-zA-Z][0-9]+)\.jar/\1/')
+          export MINECRAFT_VERSION='1.8.9'
+          echo Version: $FDP_VERSION, Minecraft: $MINECRAFT_VERSION
+          cp $JAR zip/fdpclient.jar
+          cd zip
+          zip -r fdpclient.zip *
+          md5sum fdpclient.zip
+          curl --connect-timeout 30 -m 300 -X POST -F "[email protected]" -H "Authorization: ${{ secrets.NIGHTLY_PASS }}" -F "gh_id=${{ github.event.head_commit.id }}" -F "gh_ref=${{ github.ref }}" -F "gh_message=${{ github.event.head_commit.message }}" -F "gh_timestamp=${{ github.event.head_commit.timestamp }}" -F "fdp_version=$FDP_VERSION" -F "mc_version=$MINECRAFT_VERSION" -F "jre_version=8" -F "subsystem=forge" https://api.liquidbounce.net/api/v1/version/new

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx3g
 
-mod_version=b5
+mod_version=b6
 maven_group=net.ccbluex
 archives_base_name=FDPClient
 

src/main/java/net/ccbluex/liquidbounce/FDPClient.kt

@@ -62,7 +62,7 @@ object FDPClient {
     const val CLIENT_AUTHOR = "Zywl 1zuna"
     const val CLIENT_CLOUD = "https://cloud.liquidbounce.net/LiquidBounce"
     const val CLIENT_WEBSITE = "fdpinfo.github.io"
-    const val CLIENT_VERSION = "b5"
+    const val CLIENT_VERSION = "b6"
 
     val clientVersionText = gitInfo["git.build.version"]?.toString() ?: "unknown"
     val clientVersionNumber = clientVersionText.substring(1).toIntOrNull() ?: 0 // version format: "b<VERSION>" on legacy
@@ -73,7 +73,7 @@ object FDPClient {
      * Defines if the client is in development mode.
      * This will enable update checking on commit time instead of regular legacy versioning.
      */
-    const val IN_DEV = true
+    const val IN_DEV = false
 
     val clientTitle = CLIENT_NAME + " " + clientVersionText + " " + clientCommit + "  | " + if (IN_DEV) " | DEVELOPMENT BUILD" else ""