sync 2024/7/18

Author: way-zer

patches/client/0001-BUILD-build.gradle.kts-and-clear.patch

@@ -595,12 +595,6 @@ index 9bca8edb256e33ff341e5cae71c6b2922811a720..0cb5c6337c2d6a41243907d2c34c679b
 diff --git a/core/build.gradle b/core/build.gradle
 deleted file mode 100644
 index f7f291ef1ab71577313759a7e9fdfd3c1e0833dc..0000000000000000000000000000000000000000
---- a/core/build.gradle
-+++ /dev/null
-@@ -1,2 +0,0 @@
--sourceSets.main.java.srcDirs = ["src/", "$buildDir/generated/sources/annotationProcessor/java/main"]
--sourceSets.main.kotlin.srcDirs = ["src/"]
-\ No newline at end of file
 diff --git a/core/build.gradle.kts b/core/build.gradle.kts
 new file mode 100644
 index 0000000000000000000000000000000000000000..e2a6d4ede97677940bc6b73de42f6f5ff71fc0be

patches/client/0030-API-ui.Format.patch

@@ -18,7 +18,7 @@ way-zer <[email protected]> on 2024/6/14
 
 diff --git a/core/src/mindustryX/features/ui/Format.kt b/core/src/mindustryX/features/ui/Format.kt
 new file mode 100644
-index 0000000000000000000000000000000000000000..297ed9e0a20b04decf39f58419f8c9b6f9cc7fd8
+index 0000000000000000000000000000000000000000..0a61abc0d266f8c3ba93285b6a35eb85f9190f54
 --- /dev/null
 +++ b/core/src/mindustryX/features/ui/Format.kt
 @@ -0,0 +1,123 @@
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..297ed9e0a20b04decf39f58419f8c9b6
 +import kotlin.math.abs
 +
 +@Suppress("MemberVisibilityCanBePrivate")
-+data class Format @JvmOverloads constructor(private var decimal: Int = 2, private var fixDecimals: Boolean = false) {
++data class Format @JvmOverloads constructor(var decimal: Int = 2, var fixDecimals: Boolean = false) {
 +    /**以固定的有效位数输出*/
 +    fun fixedPrecision(v: Float): String {
 +        val exponent = Mathf.floor(Mathf.log(10f, abs(v)))

patches/client/0036-BUILD-workflows.patch

@@ -89,200 +89,9 @@ index 0000000000000000000000000000000000000000..0cd3e1cb4f412b11074f75396882876a
 diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
 deleted file mode 100644
 index 224a753d655956445b2f885b0ea7ace56de4bbd5..0000000000000000000000000000000000000000
---- a/.github/workflows/deployment.yml
-+++ /dev/null
-@@ -1,93 +0,0 @@
--name: Deployment
--
--on:
--  push:
--    tags:
--      - 'v*'
--
--permissions: {}
--jobs:
--  deploy:
--    permissions:
--      contents: write # for release creation (svenstaro/upload-release-action)
--
--    runs-on: ubuntu-latest
--
--    steps:
--    - uses: actions/checkout@v2
--    - name: Set up JDK 17
--      uses: actions/setup-java@v1
--      with:
--        java-version: 17
--    - name: Set env
--      run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
--    - name: Add Arc release
--      run: |
--        git config --global user.email "[email protected]"
--        git config --global user.name "Github Actions"
--        git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
--        cd ../Arc
--        git tag ${RELEASE_VERSION}
--        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${RELEASE_VERSION};
--        cd ../Mindustry
--    - name: Update JITpack repo
--      run: |
--        cd ../
--        cp -r ./Mindustry ./MindustryJitpack
--        cd MindustryJitpack
--        git config --global user.name "Github Actions"
--        git config --global user.email "[email protected]"
--        git clone --depth 1 https://github.com/Anuken/MindustryJitpack.git
--        rm -rf .git
--        cp -r ./MindustryJitpack/.git ./.git
--        rm -rf MindustryJitpack
--        rm -rf .github
--        rm README.md
--        git add .
--        git commit --allow-empty -m "Updating"
--        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
--        git tag ${RELEASE_VERSION}
--        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
--        cd ../Mindustry
--    - name: Create artifacts
--      run: |
--        ./gradlew desktop:dist server:dist core:mergedJavadoc -Pbuildversion=${RELEASE_VERSION:1}
--    - name: Update docs
--      run: |
--        cd ../
--        git config --global user.email "[email protected]"
--        git config --global user.name "Github Actions"
--        git clone --depth=1 https://github.com/MindustryGame/docs.git
--        cd docs
--        find . -maxdepth 1 ! -name ".git" ! -name . -exec rm -r {} \;
--        cd ../
--        cp -a Mindustry/core/build/javadoc/. docs/
--        cd docs
--        git add .
--        git commit --allow-empty -m "Update ${RELEASE_VERSION:1}"
--        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs
--        cd ../Mindustry
--    - name: Update F-Droid build string
--      run: |
--        git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
--        cd ../MindustryBuilds
--        echo "Updating version to ${RELEASE_VERSION:1}"
--        BNUM=$(($GITHUB_RUN_NUMBER + 1000))
--        echo versionName=7-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${BNUM} > version_fdroid.txt
--        git add .
--        git commit -m "Updating to build ${RELEASE_VERSION:1}"
--        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds
--        cd ../Mindustry
--    - name: Upload client artifacts
--      uses: svenstaro/upload-release-action@v2
--      with:
--        repo_token: ${{ secrets.GITHUB_TOKEN }}
--        file: desktop/build/libs/Mindustry.jar
--        tag: ${{ github.ref }}
--    - name: Upload server artifacts
--      uses: svenstaro/upload-release-action@v2
--      with:
--        repo_token: ${{ secrets.GITHUB_TOKEN }}
--        file: server/build/libs/server-release.jar
--        tag: ${{ github.ref }}
--
 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
 deleted file mode 100644
 index eb2dcff192d52a8515331a2f058e86c65c0ae98b..0000000000000000000000000000000000000000
---- a/.github/workflows/pr.yml
-+++ /dev/null
-@@ -1,28 +0,0 @@
--name: Pull Request Tests
--
--on: [pull_request, workflow_dispatch]
--
--permissions:
--  contents: read # to fetch code (actions/checkout)
--
--jobs:
--  testPR:
--    runs-on: ubuntu-latest
--
--    steps:
--    - uses: actions/checkout@v2
--    - name: Set up JDK 17
--      uses: actions/setup-java@v1
--      with:
--        java-version: 17
--    - name: Setup Gradle
--      uses: gradle/gradle-build-action@v2
--    - name: Run unit tests
--      run: ./gradlew tests:test --stacktrace --rerun
--    - name: Run unit tests and build JAR
--      run: ./gradlew desktop:dist
--    - name: Upload desktop JAR for testing
--      uses: actions/upload-artifact@v2
--      with:
--        name: Desktop JAR (zipped)
--        path: desktop/build/libs/Mindustry.jar
 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
 deleted file mode 100644
 index cd593a6dfdf55b4e70e548ab1d96f64d5354056d..0000000000000000000000000000000000000000
---- a/.github/workflows/push.yml
-+++ /dev/null
-@@ -1,61 +0,0 @@
--name: Tests
--
--on: [push, workflow_dispatch]
--
--permissions: {}
--jobs:
--  runPush:
--    permissions:
--      contents: write # for Update bundles
--
--    runs-on: ubuntu-latest
--
--    steps:
--    - uses: actions/checkout@v2
--    - name: Trigger BE build
--      if: ${{ github.repository == 'Anuken/Mindustry' }}
--      run: |
--        git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
--        cd ../MindustryBuilds
--        BNUM=$(($GITHUB_RUN_NUMBER + 20000))
--        git tag ${BNUM}
--        git config --global user.name "Github Actions"
--        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds ${BNUM}
--    - name: Set up JDK 17
--      uses: actions/setup-java@v1
--      with:
--        java-version: 17
--    - name: Setup Gradle
--      uses: gradle/gradle-build-action@v2
--    - name: Update bundles
--      if: ${{ github.repository == 'Anuken/Mindustry' }}
--      run: |
--        ./gradlew updateBundles
--
--        if [ -n "$(git status --porcelain)" ]; then
--          git config --global user.name "Github Actions"
--          git config --global user.email "[email protected]"
--          git add core/assets/bundles/*
--          git commit -m "Automatic bundle update"
--          git push
--        fi
--    - name: Update JITpack repo
--      if: ${{ github.repository == 'Anuken/Mindustry' }}
--      run: |
--        git config --global user.name "Github Actions"
--        git config --global user.email "[email protected]"
--        cd ../
--        cp -r ./Mindustry ./MindustryJitpack
--        cd MindustryJitpack
--        git clone --depth 1 https://github.com/Anuken/MindustryJitpack.git
--        rm -rf .git
--        cp -r ./MindustryJitpack/.git ./.git
--        rm -rf MindustryJitpack
--        rm -rf .github
--        rm README.md
--        git add .
--        git commit --allow-empty -m "Updating"
--        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
--        cd ../Mindustry
--    - name: Run unit tests
--      run: ./gradlew tests:test --rerun --stacktrace