[pull] main from CFPAOrg:main

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: I18n自动汉化更新模组问题
     url: https://github.com/CFPAOrg/I18nUpdateMod3/issues/new

.github/boring-cyborg.yml

@@ -19,23 +19,35 @@ labelPRBasedOnFilePath:
     1.20.x:
         - "projects/1.20/**"
         - "projects/1.20-fabric/**"
+
+    1.21.x:
+        - "projects/1.21/**"
+        - "projects/1.21-fabric/**"
 
     Forge:
         - "projects/1.12.2/**"
         - "projects/1.16/**"
         - "projects/1.18/**"
         - "projects/1.19/**"
+
+    (Neo)Forge:
         - "projects/1.20/**"
+        - "projects/1.21/**"
 
     Fabric:
         - "projects/1.16-fabric/**"
         - "projects/1.18-fabric/**"
       # - "projects/1.19-fabric/**"
         - "projects/1.20-fabric/**"
+        - "projects/1.21-fabric/**"
 
     Patchouli:
         - "projects/**/patchouli_books/**"
 
+    GuideME:
+        - "projects/**/guides/**"
+        - "projects/**/ae2guide/**"
+
     source:
         - "src/**"
 
@@ -81,8 +93,9 @@ labelerFlags:
 firstPRWelcomeComment: |
     你好贡献者，欢迎贡献本项目。请阅读 CLA Assistant 给出的《贡献者许可协议》并决定是否签署，若不签署，我们将无法接收你的贡献。
     你已成功发送你在 CFPA 仓库的第一个 Pull Request！请在几分钟之后观察 CFPA-Bot 给出的内容，看是否存在报错。
-    **请注意！**如果存在错误，**不要**关闭 Pull Request，几乎所有可能出现的错误都能在不关闭 Pull Request 的情况下解决。如果频繁新建/关闭 Pull Request，你可能遭到封禁。
+    **请注意！** 如果存在错误，**不要**关闭 Pull Request，几乎所有可能出现的错误都能在不关闭 Pull Request 的情况下解决。如果频繁新建/关闭 Pull Request，你可能遭到封禁。
     确认无误后请耐心等待审阅，并在审阅人提出意见给出答复或修改内容。
+    若要提交多个模组，请新建一个基于 upstream/main 的分支，再向新分支提交其他模组的翻译，并发送 Pull Request。
     如需快速联系，请[加 QQ 群](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=b1iBq79z3h1OtJpEl8gstrhlu_oYlyl6&authKey=LgDPZAJSg2uFKjiMylQkkef9tAfTja8W4rBd5KkN6aSsYKpWKFbSqrM9GY7AoHJ7&noverify=0&group_code=630943368)：630943368
 
 # Comment to be posted to congratulate user on their first merged PR

.github/workflows/packer.yml

@@ -4,126 +4,104 @@ on:
   workflow_dispatch:
   push:
     branches: [ main ]
-    paths: 
+    paths:
       - 'src/**'
       - 'config/packer/**'
       - 'projects/**'
+      - '.github/workflows/packer.yml'
 
 
-
 jobs:
   build-packer:
-    if: github.repository == 'CFPAOrg/Minecraft-Mod-Language-Package'
     name: Build / Cache Packer
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-        with: 
+        with:
           fetch-depth: 1
           sparse-checkout: src
 
       # 缓存程序。一方面，在不同job之间需要这么做；另一方面，大约可以改善运行时间？
       # actions/cache的逻辑会在job末尾缓存打包程序；如果不命中，就自行构造程序。
       - name: Cache Packer
         id: cache-packer
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
           path: |
-            Packer.exe
-            git2-*.dll
+            build/Packer.exe
+            build/git2-*.dll
           lookup-only: true
 
       # 构造程序
       - name: Build Packer if not cached
         if: steps.cache-packer.outputs.cache-hit != 'true'
-        run: dotnet publish .\src\Packer\Packer.csproj -o ./ -r win-x64 -p:PublishSingleFile=true
-
-  # build-uploader:
-  #   if: github.repository == 'CFPAOrg/Minecraft-Mod-Language-Package'
-  #   name: Build / Cache Uploader
-  #   runs-on: windows-latest
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #       with: 
-  #         fetch-depth: 1
-  #         sparse-checkout: src
-
-  #     # 缓存程序。一方面，在不同job之间需要这么做；另一方面，大约可以改善运行时间？
-  #     # actions/cache的逻辑会在job末尾缓存打包程序；如果不命中，就自行构造程序。
-  #     - name: Cache Uploader
-  #       id: cache-uploader
-  #       uses: actions/cache@v3
-  #       with:
-  #         key: ${{ runner.os }}-Uploader-${{ hashFiles('src/Uploader/**') }}
-  #         path: Uploader.exe
-  #         lookup-only: true
-
-  #     # 构造程序
-  #     - name: Build Uploader if not cached
-  #       if: steps.cache-uploader.outputs.cache-hit != 'true'
-  #       run: dotnet publish .\src\Uploader\Uploader.csproj -o ./ -r win-x64 -p:PublishSingeFile=true
-
-  initialize-release:
+        # dotnet/sdk#51806 Console Projects fail to compile with <ArtifactsPath>$(MSBuildThisFileDirectory)
+        run: dotnet publish .\src\Packer\Packer.csproj -o ./build -r win-x64
+
+  build-uploader:
     if: github.repository == 'CFPAOrg/Minecraft-Mod-Language-Package'
-    name: Initialize Release
+    name: Build / Cache Uploader
     runs-on: windows-latest
     steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+          sparse-checkout: src
 
-      - name: Create timestamp
-        id: create_timestamp
-        run: echo "::set-output name=timestamp::$(date '+%Y%m%d%H%M%s')"
-        shell: bash
-
-        # Create the release: https://github.com/actions/create-release
-      - name: Create release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # 缓存程序。一方面，在不同job之间需要这么做；另一方面，大约可以改善运行时间？
+      # actions/cache的逻辑会在job末尾缓存打包程序；如果不命中，就自行构造程序。
+      - name: Cache Uploader
+        id: cache-uploader
+        uses: actions/cache@v4
         with:
-          tag_name: Snapshot-${{ steps.create_timestamp.outputs.timestamp }}
-          release_name: 汉化资源包-Snapshot-${{ steps.create_timestamp.outputs.timestamp }}
-          draft: false
-          prerelease: false
-    outputs:
-      upload-url: ${{ steps.create_release.outputs.upload_url }}
+          key: ${{ runner.os }}-Uploader-${{ hashFiles('src/Uploader/**') }}
+          path: build/Uploader.exe
+          lookup-only: true
 
+      # 构造程序
+      - name: Build Uploader if not cached
+        if: steps.cache-uploader.outputs.cache-hit != 'true'
+        # dotnet/sdk#51806 Console Projects fail to compile with <ArtifactsPath>$(MSBuildThisFileDirectory)
+        run: dotnet publish .\src\Uploader\Uploader.csproj -o ./build -r win-x64
 
   pack:
-    if: github.repository == 'CFPAOrg/Minecraft-Mod-Language-Package'
     name: Pack Resources and Upload Artifacts/Releases
-    needs: [ build-packer, initialize-release ] # 显然，需要存在打包程序，才能打包。
+    needs: [ build-packer ]
     strategy:
-      fail-fast: false # 把正常的文件先打包了，避免一处错误阻塞整个仓库。
+      fail-fast: false
       matrix:
         # 版本列表。将对这里的每个版本判断，按需打包。
         # 如需添加新版本，在这里添加即可。
-        version: [ "1.12.2", "1.16", "1.16-fabric", "1.18", "1.18-fabric", "1.19", "1.20", "1.20-fabric" ]
+        version: [ "1.12.2", "1.16", "1.16-fabric", "1.18", "1.18-fabric", "1.19", "1.20", "1.20-fabric", "1.21", "1.21-fabric" ]
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 20 # 显然，需要有提交历史才能比较提交。20这个数是任意的。
-      
+
       # 由于Github的限制，这里需要重新拉取打包程序。
       - name: Restore Packer
         id: cache-restore
-        # https://github.com/actions/cache/issues/1265#issuecomment-1819612829 `fail-on-cache-miss` for restore action not failing the workflow
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v4
         with:
-          key: ${{ runner.os }}-Packer-${{ hashFiles('source/Packer/**') }}
+          key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
           path: |
-            Packer.exe
-            git2-*.dll
-          fail-on-cache-miss: true # 前一步理应构造过的。如果不命中，肯定有问题，不如直接挂掉。
+            build/Packer.exe
+            build/git2-*.dll
+          fail-on-cache-miss: true # 应由前序保证
+
+      # dotnet/sdk#51806 Console Projects fail to compile with <ArtifactsPath>$(MSBuildThisFileDirectory)
+      - run: mv ./build/* .
+        shell: bash
 
       - name: Check changed path on ${{ matrix.version }}
         uses: MarceloPrado/has-changed-path@v1.0
         id: check-changes
         with:
           # 判断位置：该版本文件、该版本配置、代码
           paths: > 
+            .github/workflows/packer.yml
             projects/${{ matrix.version }}
             config/packer/${{ matrix.version }}.json
             src/**
@@ -136,48 +114,54 @@ jobs:
 
       # Artifact 上传内容：每个版本一个压缩包，包含了资源包和md5校验文件
       - name: Upload Artifact for ${{ matrix.version }}
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v4
         with:
-          name: Minecraft-Mod-Language-Package-${{ matrix.version }}
+          name: Minecraft-Mod-Language-Modpack-${{ matrix.version }}
           path: |
-            Minecraft-Mod-Language-Package-${{ matrix.version }}.zip
+            Minecraft-Mod-Language-Modpack-${{ matrix.version }}.zip
             ${{ matrix.version }}.md5
         if: steps.check-changes.outputs.changed == 'true' || github.event_name == 'workflow_dispatch'
 
-      # Upload release asset: https://github.com/actions/upload-release-asset
-      - name: Update release asset for ${{ matrix.version }}
-        id: upload-release-asset
-        if: steps.check-changes.outputs.changed == 'true' ||  github.event_name == 'workflow_dispatch'
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.initialize-release.outputs.upload-url }}
-          asset_path: Minecraft-Mod-Language-Package-${{ matrix.version }}.zip
-          asset_name: Minecraft-Mod-Language-Package-${{ matrix.version }}.zip
-          asset_content_type: application/zip
-
-
   upload:
+    concurrency: 
+      group: packer-upload
+      cancel-in-progress: false
     if: github.repository == 'CFPAOrg/Minecraft-Mod-Language-Package'
-    name: Upload Resource Packs to Remote Server
-    needs: [ pack ] # 显然，需要打包完成，并且存在上传程序，才可以上传给分发服务器
+    name: Upload Resource Packs to Various places
+    needs: [ pack, build-uploader ]
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
-        with: 
+      - uses: actions/checkout@v4 # 计算 cache key 需要
+        with:
           fetch-depth: 1
           sparse-checkout: src
+      - name: Restore Uploader
+        id: cache-restore
+        uses: actions/cache/restore@v4
+        with:
+          key: ${{ runner.os }}-Uploader-${{ hashFiles('src/Uploader/**') }}
+          path: |
+            build/Uploader.exe
+          fail-on-cache-miss: true # 应由前序保证
+
+      # dotnet/sdk#51806 Console Projects fail to compile with <ArtifactsPath>$(MSBuildThisFileDirectory)
+      - run: mv ./build/* .
+        shell: bash
 
-      # 构造程序
-      - name: Build Uploader
-        run: dotnet publish .\src\Uploader\Uploader.csproj -o ./ -r win-x64 -p:PublishSingeFile=true
-
       # 还原artifact（资源包）
       - name: Restore Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts/
 
+      # feat: UTC 20:00~21:00 取消上传（避开远程服务器的4:00-4:10）
+      - name: Fail at inappropriate time
+        run: if [ `date -u +%H` -eq 20 ]; then exit -1; fi
+        shell: bash
+
       - name: Run Uploader
-        run: .\Uploader --host="${{ secrets.SSH_IP }}" --name="${{ secrets.SSH_USER }}" --password="${{ secrets.SSH_PWD }}"
+        run: .\Uploader --host="${{ secrets.SSH_IP }}" --name="${{ secrets.SSH_USER }}" --password="${{ secrets.SSH_PWD }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SHA: ${{ github.sha }}
+          REPO_ID: ${{ github.repository_id }}