Merge pull request #9 from 17TheWord/dev

Dev
17TheWord · Sep 10, 2024 · 116e08d · 116e08d
2 parents 5286ab2 + 3aff762
commit 116e08d
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 5 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -7,7 +7,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        ##请补全标题并填写下方内容
+        ## 请补全标题并填写下方内容
 
   - type: input
     id: run-env

diff --git a/.github/ISSUE_TEMPLATE/version_feature.yml b/.github/ISSUE_TEMPLATE/version_feature.yml
@@ -0,0 +1,43 @@
+name: 新增版本支持
+description: 希望支持某个版本
+title: "[Version Support]添加对 XXX 服务端，XXX 版本的支持"
+assignees: 17TheWord
+labels: [ "version support" ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## 请补全标题
+
+  - type: input
+    id: server-type
+    attributes:
+      label: 服务端类型
+      description: |
+        请输入服务端类型，如：
+        - Spigot
+        - Forge
+        - Fabric
+        - Velocity
+      placeholder: Spigot
+
+  - type: input
+    id: server-version
+    attributes:
+      label: 服务端版本
+      description: |
+        请输入服务端版本，如：
+        - 1.20.1
+        - 1.20.5
+  - type: textarea
+    id: other-description
+    attributes:
+      label: 其他补充
+      render: plain text
+      description: |
+        如果有其他补充，请填写在这里。
+        
+        例如：
+        - 是否需要修改配置文件？
+        - 是否有服务端官方文档链接？
+        - ...
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,11 +58,45 @@ jobs:
           ./gradlew clean build
           cd ../..
 
+      - name: Set Version Type
+        id: set-version-type
+        shell: pwsh
+        run: |
+          if ($env:GITHUB_REF -eq 'refs/heads/main') {
+            echo "VERSION_TYPE=release" | Out-File -Append -Encoding utf8 -FilePath $env:GITHUB_ENV
+          } else {
+            echo "VERSION_TYPE=beta" | Out-File -Append -Encoding utf8 -FilePath $env:GITHUB_ENV
+          }
+
+      - name: Set Game Version
+        id: set-game-version
+        shell: pwsh
+        run: |
+          if ("${{ matrix.config.mc-loader }}" -eq 'velocity') {
+          echo "game_version=1.20.1" | Out-File -Append -Encoding utf8 -FilePath $env:GITHUB_ENV
+          } else {
+          echo "game_version=${{ matrix.config.mc-version }}" | Out-File -Append -Encoding utf8 -FilePath $env:GITHUB_ENV
+          }
+
+      - uses: Kir-Antipov/[email protected]
+        with:
+          modrinth-id: rVJvtYoX
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          curseforge-id: 1084495
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+
+          name: QueQiao-${{ matrix.config.mc-loader }}+${{ matrix.config.mc-version }}-${{ env.MOD_VERSION }}
+          version: ${{ env.MOD_VERSION }}
+          version-type: ${{ env.VERSION_TYPE }}
+          loaders: ${{ matrix.config.mc-loader }}
+          game-versions: ${{ env.game_version }}
+          files: QueQiao-jar/${{ env.MOD_VERSION }}/QueQiao-${{ matrix.config.mc-loader }}+${{ matrix.config.mc-version }}-${{ env.MOD_VERSION }}.jar
+
       - uses: actions/upload-artifact@v4
         with:
           name: QueQiao-${{ matrix.config.mc-loader }}+${{ matrix.config.mc-version }}-${{ env.MOD_VERSION }}.jar
           path: QueQiao-jar/${{ env.MOD_VERSION }}/QueQiao-${{ matrix.config.mc-loader }}+${{ matrix.config.mc-version }}-${{ env.MOD_VERSION }}.jar
 
-      - name: Upload to Release
-        if: ${{ github.event_name == 'push' }}
-        run: gh release upload v${{ env.MOD_VERSION }} QueQiao-jar/${{ env.MOD_VERSION }}/QueQiao-${{ matrix.config.mc-loader }}+${{ matrix.config.mc-version }}-${{ env.MOD_VERSION }}.jar
+#      - name: Upload to Release
+#        if: ${{ github.event_name == 'push' }}
+#        run: gh release upload v${{ env.MOD_VERSION }} QueQiao-jar/${{ env.MOD_VERSION }}/QueQiao-${{ matrix.config.mc-loader }}+${{ matrix.config.mc-version }}-${{ env.MOD_VERSION }}.jar
diff --git a/README.md b/README.md
@@ -38,6 +38,10 @@
 <p align="center">
   <a href="https://github.com/17TheWord/QueQiao/wiki">📖Docs</a>
   ·
+  <a href="https://modrinth.com/plugin/queqiao">⬇️Modrinth</a>
+  ·
+  <a href="https://www.curseforge.com/minecraft/mc-mods/queqiao">⬇️CurseForge</a>
+  ·
   <a href="https://github.com/17TheWord/QueQiao/issues">🐛Submit Suggestion/Bug</a>
 </p>
 
@@ -83,6 +87,12 @@
       ```
 5. 开始游戏，加入服务器
 
+## 帮助与下载
+
+- 前往 [`Wiki`](https://github.com/17TheWord/QueQiao/wiki) 查看文档
+- 前往 [`Modrinth`](https://modrinth.com/plugin/queqiao/versions) 下载
+- 前往 [`CurseForge`](https://www.curseforge.com/minecraft/mc-mods/queqiao) 下载
+
 ## 对接
 
 - [`@17TheWord/nonebot-adapter-minecraft`](https://github.com/17TheWord/nonebot-adapter-minecraft)：`NoneBot2` 适配器，与本模组连接

diff --git a/README_EN.md b/README_EN.md
@@ -38,6 +38,10 @@
 <p align="center">
   <a href="https://github.com/17TheWord/QueQiao/wiki">📖Docs</a>
   ·
+  <a href="https://modrinth.com/plugin/queqiao">⬇️Modrinth</a>
+  ·
+  <a href="https://www.curseforge.com/minecraft/mc-mods/queqiao">⬇️CurseForge</a>
+  ·
   <a href="https://github.com/17TheWord/QueQiao/issues">🐛Submit Suggestion/Bug</a>
 </p>
 
@@ -82,6 +86,12 @@
       ```
 5. Start the game and join the server.
 
+## Help and Download
+
+- Go [`Docs`](https://github.com/17TheWord/QueQiao/wiki) for help
+- GO [`Modrinth`](https://modrinth.com/plugin/queqiao/versions) for download
+- Go [`CurseForge`](https://www.curseforge.com/minecraft/mc-mods/queqiao/files) for download
+
 ## Integration
 
 - [`@17TheWord/nonebot-adapter-minecraft`](https://github.com/17TheWord/nonebot-adapter-minecraft): `NoneBot2` adapter, connects to this mod

diff --git a/...y/origin/build/generated/sources/templates/com/github/theword/queqiao/BuildConstants.java b/...y/origin/build/generated/sources/templates/com/github/theword/queqiao/BuildConstants.java
@@ -3,5 +3,5 @@
 // The constants are replaced before compilation
 public class BuildConstants {
 
-    public static final String VERSION = "0.0.1";
+    public static final String VERSION = "0.0.4";
 }