From 678fc3b40c5341c7e6bdbde630dc7ab88545590e Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:13:15 +0800 Subject: [PATCH 01/39] Update build.yml --- .github/workflows/build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2c4927..9c8680d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,15 @@ jobs: with: msbuild-architecture: x64 + - name: Replace + shell: powershell + env: + client_id: ${{ secrets.client_id }} + x-api-key: ${{ secrets.x_api_key }} + run: | + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace '$client_id', | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers("x-api-key") = ""', '"Client.Headers("x-api-key") = ""' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace '$client_id', | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ matrix.configuration }} From 3c71a2cbf859fc99029f96f5ccfc81c80a09b2d0 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:21:43 +0800 Subject: [PATCH 02/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c8680d..f1b0347 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,8 +45,9 @@ jobs: x-api-key: ${{ secrets.x_api_key }} run: | (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace '$client_id', | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers("x-api-key") = ""', '"Client.Headers("x-api-key") = ""' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers("x-api-key") = ""', '"Client.Headers("x-api-key") = "${{ secrets.x_api_key }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace '$client_id', | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + - name: Build run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ matrix.configuration }} From 4747c3dc6847b44941a8442eefe41d53e4006716 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:27:27 +0800 Subject: [PATCH 03/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f1b0347..9c4ea06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,9 +44,9 @@ jobs: client_id: ${{ secrets.client_id }} x-api-key: ${{ secrets.x_api_key }} run: | - (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace '$client_id', | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Dim Client_id = ""', 'Dim Client_id = "${{ secrets.client_id }}"' | Out-File "Plain Craft Launcher 2\Modules\ModLaunch.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers("x-api-key") = ""', '"Client.Headers("x-api-key") = "${{ secrets.x_api_key }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace '$client_id', | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers("x-api-key") = ""', 'Request.Headers("x-api-key") = "${{ secrets.x_api_key }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ matrix.configuration }} From e0bd274e0dd1f5abb1c88352971391583f1e2246 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:58:19 +0800 Subject: [PATCH 04/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c4ea06..a10aa44 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,11 +40,8 @@ jobs: - name: Replace shell: powershell - env: - client_id: ${{ secrets.client_id }} - x-api-key: ${{ secrets.x_api_key }} run: | - (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Dim Client_id = ""', 'Dim Client_id = "${{ secrets.client_id }}"' | Out-File "Plain Craft Launcher 2\Modules\ModLaunch.vb" + (gc "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb") -replace 'Dim ClientId As String = ""', 'Dim ClientId As String = "${{ secrets.client_id }}"' | Out-File "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers("x-api-key") = ""', '"Client.Headers("x-api-key") = "${{ secrets.x_api_key }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers("x-api-key") = ""', 'Request.Headers("x-api-key") = "${{ secrets.x_api_key }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" From d49a8f87174672c7eea17ab5a6c090c4d2556826 Mon Sep 17 00:00:00 2001 From: allMagicNB <116283787+allMagicNB@users.noreply.github.com> Date: Thu, 11 Jul 2024 19:40:46 +0800 Subject: [PATCH 05/39] Fix & + .gitignore & + Headers("x-api-key") --- .github/workflows/build.yml | 6 +++--- .gitignore | 1 + Plain Craft Launcher 2/Modules/ModSecret.vb | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a10aa44..7562e07 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,9 +41,9 @@ jobs: - name: Replace shell: powershell run: | - (gc "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb") -replace 'Dim ClientId As String = ""', 'Dim ClientId As String = "${{ secrets.client_id }}"' | Out-File "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb" - (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers("x-api-key") = ""', '"Client.Headers("x-api-key") = "${{ secrets.x_api_key }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers("x-api-key") = ""', 'Request.Headers("x-api-key") = "${{ secrets.x_api_key }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb") -replace 'Dim ClientId As String = ""', 'Dim ClientId As String = "${{ secrets.CLIENT_ID }}"' | Out-File "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers\("x-api-key"\) = ""', 'Client.Headers("x-api-key") = "${{ secrets.X_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers\("x-api-key"\) = ""', 'Request.Headers("x-api-key") = "${{ secrets.X_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ matrix.configuration }} diff --git a/.gitignore b/.gitignore index 06b35b0..fbb3848 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ x86/ bld/ [Bb]in/ [Oo]bj/ +[Oo]utput/ [Ll]og/ # Visual Studio 2015/2017 cache/options directory diff --git a/Plain Craft Launcher 2/Modules/ModSecret.vb b/Plain Craft Launcher 2/Modules/ModSecret.vb index f6e0a36..63c4cdc 100644 --- a/Plain Craft Launcher 2/Modules/ModSecret.vb +++ b/Plain Craft Launcher 2/Modules/ModSecret.vb @@ -104,7 +104,8 @@ Friend Module ModSecret Client.Headers("User-Agent") = "PCL2/" & VersionStandardCode End If Client.Headers("Referer") = "http://" & VersionCode & ".pcl2.server/" - '如果你有 CurseForge API Key,请添加到 Headers 中,以恢复对 CurseForge 的访问 + '如果你有 CurseForge API Key,请添加到下面,以恢复对 CurseForge 的访问 + Client.Headers("x-api-key") = "" End Sub ''' ''' 设置 Headers 的 UA、Referer。 @@ -117,7 +118,8 @@ Friend Module ModSecret Request.UserAgent = "PCL2/" & VersionStandardCode End If Request.Referer = "http://" & VersionCode & ".pcl2.server/" - '如果你有 CurseForge API Key,请添加到 Headers 中,以恢复对 CurseForge 的访问 + '如果你有 CurseForge API Key,请添加到下面,以恢复对 CurseForge 的访问 + Request.Headers("x-api-key") = "" End Sub #End Region From 435805869635afe0f61f56d819f32b12e7577a47 Mon Sep 17 00:00:00 2001 From: allMagicNB <116283787+allMagicNB@users.noreply.github.com> Date: Thu, 11 Jul 2024 19:45:03 +0800 Subject: [PATCH 06/39] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E8=AF=AD=E6=B0=94?= =?UTF-8?q?=EF=BC=8C=E8=AE=A9=20=E2=80=9C=E5=BA=94=E8=AF=A5=E5=81=9A?= =?UTF-8?q?=E2=80=9D=20=E5=8F=98=E6=88=90=20=E2=80=9C=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=81=9A=E2=80=9D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/ModSecret.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/ModSecret.vb b/Plain Craft Launcher 2/Modules/ModSecret.vb index 63c4cdc..6be96b1 100644 --- a/Plain Craft Launcher 2/Modules/ModSecret.vb +++ b/Plain Craft Launcher 2/Modules/ModSecret.vb @@ -104,7 +104,7 @@ Friend Module ModSecret Client.Headers("User-Agent") = "PCL2/" & VersionStandardCode End If Client.Headers("Referer") = "http://" & VersionCode & ".pcl2.server/" - '如果你有 CurseForge API Key,请添加到下面,以恢复对 CurseForge 的访问 + '如果你有 CurseForge API Key,可以添加到下面,以恢复对 CurseForge 的访问 Client.Headers("x-api-key") = "" End Sub ''' @@ -118,7 +118,7 @@ Friend Module ModSecret Request.UserAgent = "PCL2/" & VersionStandardCode End If Request.Referer = "http://" & VersionCode & ".pcl2.server/" - '如果你有 CurseForge API Key,请添加到下面,以恢复对 CurseForge 的访问 + '如果你有 CurseForge API Key,可以添加到下面,以恢复对 CurseForge 的访问 Request.Headers("x-api-key") = "" End Sub From 2b55ed078ba2e194389ffab15c08af6c5b515704 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Thu, 11 Jul 2024 20:13:08 +0800 Subject: [PATCH 07/39] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index fbb3848..06b35b0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,6 @@ x86/ bld/ [Bb]in/ [Oo]bj/ -[Oo]utput/ [Ll]og/ # Visual Studio 2015/2017 cache/options directory From c860ad26e2ab928a4609ec265ad6a68784a92863 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Fri, 12 Jul 2024 13:11:49 +0800 Subject: [PATCH 08/39] [no ci]Update build.yml --- .github/workflows/build.yml | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7562e07..ffbaa28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,11 @@ on: - 'Plain Craft Launcher 2/**' - '.github/workflows/**' workflow_dispatch: + inputs: + Release: + description: 'Release' + required: true + type: boolean jobs: @@ -17,7 +22,7 @@ jobs: strategy: matrix: - configuration: [Debug, Release, Snapshot, BETA, ReleaseUpdate] + configuration: [Debug] runs-on: windows-latest @@ -53,3 +58,25 @@ jobs: with: name: ${{ matrix.configuration }} ${{ env.Describe }} path: Plain Craft Launcher 2\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe + + - name: Create Release + if: ${{ inputs.Release }} + id: create_release + uses: actions/create-release@latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ env.Describe }} + release_name: ${{ env.Describe }} + + - name: Upload Release Asset + if: ${{ inputs.Release }} + id: upload-release-asset + uses: actions/upload-release-asset@latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: Plain Craft Launcher 2\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe + asset_name: ${{ matrix.configuration }} ${{ env.Describe }}.exe + asset_content_type: application/octet-stream From a7a4838b96abb24159c5443aeab05a00d3f1e947 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Fri, 12 Jul 2024 13:22:28 +0800 Subject: [PATCH 09/39] [no ci]Update build.yml --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ffbaa28..ba35203 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,6 @@ on: inputs: Release: description: 'Release' - required: true type: boolean jobs: From d52a4ec0819a3cd6ae2eb6424f4c20e4921e0b3e Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Fri, 12 Jul 2024 13:41:59 +0800 Subject: [PATCH 10/39] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ba35203..57db857 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,5 +77,5 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: Plain Craft Launcher 2\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe - asset_name: ${{ matrix.configuration }} ${{ env.Describe }}.exe + asset_name: Plain Craft Launcher 2.exe asset_content_type: application/octet-stream From b10fc8c720e0f6475f7fa99faca76ca004f164f7 Mon Sep 17 00:00:00 2001 From: allMagicNB <116283787+allMagicNB@users.noreply.github.com> Date: Wed, 17 Jul 2024 14:56:33 +0800 Subject: [PATCH 11/39] Fix something --- .github/workflows/build.yml | 58 ++++++++++++++----------------------- 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57db857..e28eb14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,4 @@ name: Build - on: push: paths: @@ -11,71 +10,56 @@ on: - '.github/workflows/**' workflow_dispatch: inputs: - Release: + configuration: + description: 'Configuration' + default: 'Debug' + type: string + replace: + description: 'Replace' + default: true + type: boolean + release: description: 'Release' type: boolean jobs: - build: - - strategy: - matrix: - configuration: [Debug] - + name: Build runs-on: windows-latest - steps: - name: Checkout uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Set Describe shell: bash run: | - Describe=`git describe --tags --always` - echo "Describe=$Describe" >> $GITHUB_ENV - + describe=`git describe --tags --always` + echo "describe=$describe" >> $GITHUB_ENV - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v2 with: msbuild-architecture: x64 - - name: Replace + if: ${{ inputs.replace }} shell: powershell run: | (gc "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb") -replace 'Dim ClientId As String = ""', 'Dim ClientId As String = "${{ secrets.CLIENT_ID }}"' | Out-File "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers\("x-api-key"\) = ""', 'Client.Headers("x-api-key") = "${{ secrets.X_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers\("x-api-key"\) = ""', 'Request.Headers("x-api-key") = "${{ secrets.X_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - - name: Build - run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ matrix.configuration }} - + run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ inputs.configuration }} - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: - name: ${{ matrix.configuration }} ${{ env.Describe }} - path: Plain Craft Launcher 2\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe - - - name: Create Release + name: ${{ inputs.configuration }} ${{ env.describe }} + path: Plain Craft Launcher 2\obj\${{ inputs.configuration }}\Plain Craft Launcher 2.exe + - name: Release if: ${{ inputs.Release }} - id: create_release - uses: actions/create-release@latest + uses: softprops/action-gh-release@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ env.Describe }} - release_name: ${{ env.Describe }} - - - name: Upload Release Asset - if: ${{ inputs.Release }} - id: upload-release-asset - uses: actions/upload-release-asset@latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Plain Craft Launcher 2\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe - asset_name: Plain Craft Launcher 2.exe - asset_content_type: application/octet-stream + name: ${{ env.describe }} + tag_name: ${{ env.describe }} + files: Plain Craft Launcher 2\obj\${{ inputs.configuration }}\Plain Craft Launcher 2.exe \ No newline at end of file From d7e649c44e9b89ced6e705c97dcf655b743f845a Mon Sep 17 00:00:00 2001 From: allMagicNB <116283787+allMagicNB@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:00:23 +0800 Subject: [PATCH 12/39] Fix Replace --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e28eb14..087db48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,10 +14,6 @@ on: description: 'Configuration' default: 'Debug' type: string - replace: - description: 'Replace' - default: true - type: boolean release: description: 'Release' type: boolean @@ -41,7 +37,6 @@ jobs: with: msbuild-architecture: x64 - name: Replace - if: ${{ inputs.replace }} shell: powershell run: | (gc "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb") -replace 'Dim ClientId As String = ""', 'Dim ClientId As String = "${{ secrets.CLIENT_ID }}"' | Out-File "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb" From 2348d3c8f34fc6c08aee25c5d31a3aa9746b8839 Mon Sep 17 00:00:00 2001 From: allMagicNB <116283787+allMagicNB@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:13:15 +0800 Subject: [PATCH 13/39] + env --- .github/workflows/build.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 087db48..8aac8d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,10 +10,6 @@ on: - '.github/workflows/**' workflow_dispatch: inputs: - configuration: - description: 'Configuration' - default: 'Debug' - type: string release: description: 'Release' type: boolean @@ -22,6 +18,8 @@ jobs: build: name: Build runs-on: windows-latest + env: + configuration: Debug steps: - name: Checkout uses: actions/checkout@v4 @@ -43,12 +41,12 @@ jobs: (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers\("x-api-key"\) = ""', 'Client.Headers("x-api-key") = "${{ secrets.X_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers\("x-api-key"\) = ""', 'Request.Headers("x-api-key") = "${{ secrets.X_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build - run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ inputs.configuration }} + run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: - name: ${{ inputs.configuration }} ${{ env.describe }} - path: Plain Craft Launcher 2\obj\${{ inputs.configuration }}\Plain Craft Launcher 2.exe + name: ${{ env.configuration }} ${{ env.describe }} + path: Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe - name: Release if: ${{ inputs.Release }} uses: softprops/action-gh-release@v2 @@ -57,4 +55,4 @@ jobs: with: name: ${{ env.describe }} tag_name: ${{ env.describe }} - files: Plain Craft Launcher 2\obj\${{ inputs.configuration }}\Plain Craft Launcher 2.exe \ No newline at end of file + files: Plain Craft Launcher 2\obj\${{ env.configuration }}\Plain Craft Launcher 2.exe \ No newline at end of file From 83a5370badeb8374bedadac3d0543e995a471151 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Wed, 17 Jul 2024 16:45:26 +0800 Subject: [PATCH 14/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8aac8d7..d731dbf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,8 +45,8 @@ jobs: - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.configuration }} ${{ env.describe }} - path: Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe + name: ${{ env.configuration }} ${{ env.describe }}.zip + path: .\Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe - name: Release if: ${{ inputs.Release }} uses: softprops/action-gh-release@v2 @@ -55,4 +55,4 @@ jobs: with: name: ${{ env.describe }} tag_name: ${{ env.describe }} - files: Plain Craft Launcher 2\obj\${{ env.configuration }}\Plain Craft Launcher 2.exe \ No newline at end of file + files: .\Plain Craft Launcher 2\obj\${{ env.configuration }}\Plain Craft Launcher 2.exe \ No newline at end of file From 227ceccb8f9df9a2272d18e3db9c6ee3c2816f6d Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:22:31 +0800 Subject: [PATCH 15/39] - .zip --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d731dbf..b43d0cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.configuration }} ${{ env.describe }}.zip + name: ${{ env.configuration }} ${{ env.describe }} path: .\Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe - name: Release if: ${{ inputs.Release }} From cc18004c4100850e599bff9739c2c5ed9bf038bb Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:25:04 +0800 Subject: [PATCH 16/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b43d0cc..9df7b48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,8 @@ jobs: (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers\("x-api-key"\) = ""', 'Request.Headers("x-api-key") = "${{ secrets.X_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} + - name: dir + run: dir /s - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: From 15f82f100ca12976d1634d93f050dbe2bfedea3e Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:28:10 +0800 Subject: [PATCH 17/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9df7b48..e32bb2d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,6 @@ jobs: with: msbuild-architecture: x64 - name: Replace - shell: powershell run: | (gc "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb") -replace 'Dim ClientId As String = ""', 'Dim ClientId As String = "${{ secrets.CLIENT_ID }}"' | Out-File "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers\("x-api-key"\) = ""', 'Client.Headers("x-api-key") = "${{ secrets.X_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" @@ -43,6 +42,7 @@ jobs: - name: Build run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} - name: dir + shell: cmd run: dir /s - name: Upload a Build Artifact uses: actions/upload-artifact@v4 From fa9e1be4e21cbacbc7c53c343fec92ddbd796ad9 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Wed, 17 Jul 2024 19:43:38 +0800 Subject: [PATCH 18/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e32bb2d..fa42ac7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ env.configuration }} ${{ env.describe }} - path: .\Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe + path: ${{ GITHUB.WORKSPACE }}\Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe - name: Release if: ${{ inputs.Release }} uses: softprops/action-gh-release@v2 @@ -57,4 +57,4 @@ jobs: with: name: ${{ env.describe }} tag_name: ${{ env.describe }} - files: .\Plain Craft Launcher 2\obj\${{ env.configuration }}\Plain Craft Launcher 2.exe \ No newline at end of file + files: ${{ GITHUB.WORKSPACE }}\Plain Craft Launcher 2\obj\${{ env.configuration }}\Plain Craft Launcher 2.exe \ No newline at end of file From 1bd7b717d0176c90866d9a6ac90d915ea4ca7d56 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Wed, 17 Jul 2024 19:58:01 +0800 Subject: [PATCH 19/39] - dir --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa42ac7..1b27f7b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,9 +41,6 @@ jobs: (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers\("x-api-key"\) = ""', 'Request.Headers("x-api-key") = "${{ secrets.X_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} - - name: dir - shell: cmd - run: dir /s - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: @@ -57,4 +54,4 @@ jobs: with: name: ${{ env.describe }} tag_name: ${{ env.describe }} - files: ${{ GITHUB.WORKSPACE }}\Plain Craft Launcher 2\obj\${{ env.configuration }}\Plain Craft Launcher 2.exe \ No newline at end of file + files: ${{ GITHUB.WORKSPACE }}\Plain Craft Launcher 2\obj\${{ env.configuration }}\Plain Craft Launcher 2.exe From 7cf91d923ed36b0d0b4b4df0c623d864cda864ec Mon Sep 17 00:00:00 2001 From: allMagicNB <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 20 Jul 2024 17:55:36 +0800 Subject: [PATCH 20/39] del Release --- .github/workflows/build.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8aac8d7..5e59c87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,10 +9,6 @@ on: - 'Plain Craft Launcher 2/**' - '.github/workflows/**' workflow_dispatch: - inputs: - release: - description: 'Release' - type: boolean jobs: build: @@ -47,12 +43,3 @@ jobs: with: name: ${{ env.configuration }} ${{ env.describe }} path: Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe - - name: Release - if: ${{ inputs.Release }} - uses: softprops/action-gh-release@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - name: ${{ env.describe }} - tag_name: ${{ env.describe }} - files: Plain Craft Launcher 2\obj\${{ env.configuration }}\Plain Craft Launcher 2.exe \ No newline at end of file From 3f332fee8e2370bfa9ca1646195aa00168cfcebe Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 3 Aug 2024 20:00:48 +0800 Subject: [PATCH 21/39] X_API_KEY -> CURSEFORGE_API_KEY --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index feefb20..5e60ba4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,8 +33,8 @@ jobs: - name: Replace run: | (gc "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb") -replace 'Dim ClientId As String = ""', 'Dim ClientId As String = "${{ secrets.CLIENT_ID }}"' | Out-File "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb" - (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers\("x-api-key"\) = ""', 'Client.Headers("x-api-key") = "${{ secrets.X_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers\("x-api-key"\) = ""', 'Request.Headers("x-api-key") = "${{ secrets.X_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers\("x-api-key"\) = ""', 'Client.Headers("x-api-key") = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers\("x-api-key"\) = ""', 'Request.Headers("x-api-key") = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} - name: Upload a Build Artifact From b6a06f8d8d08b58303c964d48ef135b4c4b829d5 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Tue, 20 Aug 2024 11:13:04 +0800 Subject: [PATCH 22/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e60ba4..e0d20af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,9 +36,9 @@ jobs: (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers\("x-api-key"\) = ""', 'Client.Headers("x-api-key") = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers\("x-api-key"\) = ""', 'Request.Headers("x-api-key") = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build - run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} + run: dotnet build "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: name: ${{ env.configuration }} ${{ env.describe }} - path: ${{ GITHUB.WORKSPACE }}\Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe + path: ${{ GITHUB.WORKSPACE }}\Plain Craft Launcher 2\obj\Debug From 26c492b370d1a5d8ff5708465bc1840d6db53d12 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Tue, 20 Aug 2024 11:15:08 +0800 Subject: [PATCH 23/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0d20af..338c4a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers\("x-api-key"\) = ""', 'Client.Headers("x-api-key") = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers\("x-api-key"\) = ""', 'Request.Headers("x-api-key") = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build - run: dotnet build "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} + run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: From 2bdda5795ae2aa449df3048ea626cb85fe9a23ad Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Tue, 20 Aug 2024 11:23:25 +0800 Subject: [PATCH 24/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 338c4a9..5e60ba4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,4 +41,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ env.configuration }} ${{ env.describe }} - path: ${{ GITHUB.WORKSPACE }}\Plain Craft Launcher 2\obj\Debug + path: ${{ GITHUB.WORKSPACE }}\Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe From 5ea5dc3164f24c75babbd7343e951e2e4c42aa4f Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Tue, 27 Aug 2024 11:06:43 +0800 Subject: [PATCH 25/39] Fix Replace client_id --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e60ba4..2080818 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: msbuild-architecture: x64 - name: Replace run: | - (gc "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb") -replace 'Dim ClientId As String = ""', 'Dim ClientId As String = "${{ secrets.CLIENT_ID }}"' | Out-File "Plain Craft Launcher 2\Modules\Minecraft\ModLaunch.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Public Const OAuthClientId As String = ""', 'Public Const OAuthClientId As String = "${{ secrets.CLIENT_ID }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers\("x-api-key"\) = ""', 'Client.Headers("x-api-key") = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers\("x-api-key"\) = ""', 'Request.Headers("x-api-key") = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build From c917066e0bb1f3976f7cb94b554ebbb559977812 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 31 Aug 2024 00:40:21 +0800 Subject: [PATCH 26/39] + Const --- Plain Craft Launcher 2/Modules/ModSecret.vb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/ModSecret.vb b/Plain Craft Launcher 2/Modules/ModSecret.vb index 4ffc1de..f07ccb6 100644 --- a/Plain Craft Launcher 2/Modules/ModSecret.vb +++ b/Plain Craft Launcher 2/Modules/ModSecret.vb @@ -12,6 +12,8 @@ Friend Module ModSecret Public Const RegFolder As String = "PCLDebug" '用于微软登录的 ClientId Public Const OAuthClientId As String = "" + 'CurseForge API Key + Public Const CurseForgeAPIKey As String = "" Friend Sub SecretOnApplicationStart() '提升 UI 线程优先级 @@ -44,7 +46,7 @@ Friend Module ModSecret End If '开源版本提示 MyMsgBox($"该版本中无法使用以下特性: -- CurseForge API 调用:需要你自行申请 API Key,然后添加到 SecretHeadersSign 方法中 +- CurseForge API 调用:需要你自行申请 API Key,然后添加到 ModSecret.vb 的开头 - 正版登录:需要你自行申请 Client ID,然后添加到 ModSecret.vb 的开头 - 更新与联网通知:避免滥用隐患 - 主题切换:这是需要赞助解锁的纪念性质的功能,别让赞助者太伤心啦…… @@ -105,8 +107,7 @@ Friend Module ModSecret Client.Headers("User-Agent") = "PCL2/" & VersionStandardCode End If Client.Headers("Referer") = "http://" & VersionCode & ".pcl2.server/" - '如果你有 CurseForge API Key,可以添加到下面,以恢复对 CurseForge 的访问 - Client.Headers("x-api-key") = "" + Client.Headers("x-api-key") = CurseForgeAPIKey End Sub ''' ''' 设置 Headers 的 UA、Referer。 @@ -118,8 +119,7 @@ Friend Module ModSecret Request.UserAgent = "PCL2/" & VersionStandardCode End If Request.Referer = "http://" & VersionCode & ".pcl2.server/" - '如果你有 CurseForge API Key,可以添加到下面,以恢复对 CurseForge 的访问 - Request.Headers("x-api-key") = "" + Request.Headers("x-api-key") = CurseForgeAPIKey End Sub #End Region From 6b041cd540fd1f209fe73d50eb3259c25b9d8444 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 31 Aug 2024 00:42:45 +0800 Subject: [PATCH 27/39] Update .github/workflows/build.yml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2080818..f8f8ec6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,8 +33,7 @@ jobs: - name: Replace run: | (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Public Const OAuthClientId As String = ""', 'Public Const OAuthClientId As String = "${{ secrets.CLIENT_ID }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Client.Headers\("x-api-key"\) = ""', 'Client.Headers("x-api-key") = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Request.Headers\("x-api-key"\) = ""', 'Request.Headers("x-api-key") = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Public Const CurseForgeAPIKey As String = "", 'Public Const CurseForgeAPIKey As String = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} - name: Upload a Build Artifact From d390ce05d4c6e9286b8d5b365afdbc510d847cf1 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 31 Aug 2024 00:44:33 +0800 Subject: [PATCH 28/39] Update Plain Craft Launcher 2/Modules/ModSecret.vb --- Plain Craft Launcher 2/Modules/ModSecret.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Modules/ModSecret.vb b/Plain Craft Launcher 2/Modules/ModSecret.vb index f07ccb6..4677eb8 100644 --- a/Plain Craft Launcher 2/Modules/ModSecret.vb +++ b/Plain Craft Launcher 2/Modules/ModSecret.vb @@ -106,7 +106,7 @@ Friend Module ModSecret Else Client.Headers("User-Agent") = "PCL2/" & VersionStandardCode End If - Client.Headers("Referer") = "http://" & VersionCode & ".pcl2.server/" + Client.Headers("Referer") = "http://" & VersionCode & ".pcl2.open.server/" Client.Headers("x-api-key") = CurseForgeAPIKey End Sub ''' From 9ed5f04f174eba463fa74759c6d1a562daddd16c Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 31 Aug 2024 00:44:40 +0800 Subject: [PATCH 29/39] Update Plain Craft Launcher 2/Modules/ModSecret.vb --- Plain Craft Launcher 2/Modules/ModSecret.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Modules/ModSecret.vb b/Plain Craft Launcher 2/Modules/ModSecret.vb index 4677eb8..d0a62dc 100644 --- a/Plain Craft Launcher 2/Modules/ModSecret.vb +++ b/Plain Craft Launcher 2/Modules/ModSecret.vb @@ -118,7 +118,7 @@ Friend Module ModSecret Else Request.UserAgent = "PCL2/" & VersionStandardCode End If - Request.Referer = "http://" & VersionCode & ".pcl2.server/" + Request.Referer = "http://" & VersionCode & ".pcl2.open.server/" Request.Headers("x-api-key") = CurseForgeAPIKey End Sub From e32bc28510d2112aaff9ea4e80214648ced7a023 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 31 Aug 2024 00:46:15 +0800 Subject: [PATCH 30/39] =?UTF-8?q?=E6=BC=8F=E4=B8=AA=E5=8D=95=E5=BC=95?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f8f8ec6..859b414 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: - name: Replace run: | (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Public Const OAuthClientId As String = ""', 'Public Const OAuthClientId As String = "${{ secrets.CLIENT_ID }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Public Const CurseForgeAPIKey As String = "", 'Public Const CurseForgeAPIKey As String = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Public Const CurseForgeAPIKey As String = ""', 'Public Const CurseForgeAPIKey As String = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" - name: Build run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} - name: Upload a Build Artifact From 0d47b82c71e1568793aef0ad2001e82cf719a0b7 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 31 Aug 2024 17:02:16 +0800 Subject: [PATCH 31/39] + CommitHash --- Plain Craft Launcher 2/Modules/Base/ModBase.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb index f41e5b1..3ab9f31 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb @@ -13,6 +13,8 @@ Public Module ModBase '下列版本信息由更新器自动修改 Public Const VersionBaseName As String = "2.8.4" '不含分支前缀的显示用版本名 Public Const VersionStandardCode As String = "2.8.4." & VersionBranchCode '标准格式的四段式版本号 + 'CommitHash + Public Const CommitHash As String = "" #If BETA Then Public Const VersionCode As Integer = 332 'Release #Else From 9fb45610bfb3da1ae24c1fa9888fd2e418aa7cc8 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 31 Aug 2024 17:48:53 +0800 Subject: [PATCH 32/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Application.xaml.vb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Application.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Application.xaml.vb b/Plain Craft Launcher 2/Application.xaml.vb index 34fc417..3e3a09c 100644 --- a/Plain Craft Launcher 2/Application.xaml.vb +++ b/Plain Craft Launcher 2/Application.xaml.vb @@ -99,7 +99,7 @@ Public Class Application '日志初始化 LogStart() '添加日志 - Log($"[Start] 程序版本:{VersionDisplayName} ({VersionCode})") + Log($"[Start] 程序版本:{VersionDisplayName} ({VersionCode}){If(CommitHash <> "", ",Commit Hash:{CommitHash}", "")}) Log($"[Start] 识别码:{UniqueAddress}{If(ThemeCheckOne(9), ",已解锁反馈主题", "")}") Log($"[Start] 程序路径:{PathWithName}") Log($"[Start] 系统编码:{Encoding.Default} ({Encoding.Default.CodePage}, GBK={IsGBKEncoding})") From 58ad193581eaa2197e44f70cbe6d7961bebbafa9 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 31 Aug 2024 17:54:43 +0800 Subject: [PATCH 33/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Application.xaml.vb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Application.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Application.xaml.vb b/Plain Craft Launcher 2/Application.xaml.vb index 3e3a09c..cfe895d 100644 --- a/Plain Craft Launcher 2/Application.xaml.vb +++ b/Plain Craft Launcher 2/Application.xaml.vb @@ -99,7 +99,7 @@ Public Class Application '日志初始化 LogStart() '添加日志 - Log($"[Start] 程序版本:{VersionDisplayName} ({VersionCode}){If(CommitHash <> "", ",Commit Hash:{CommitHash}", "")}) + Log($"[Start] 程序版本:{VersionDisplayName} ({VersionCode}){If(CommitHash <> "", ",Commit Hash:{CommitHash}", "")}") Log($"[Start] 识别码:{UniqueAddress}{If(ThemeCheckOne(9), ",已解锁反馈主题", "")}") Log($"[Start] 程序路径:{PathWithName}") Log($"[Start] 系统编码:{Encoding.Default} ({Encoding.Default.CodePage}, GBK={IsGBKEncoding})") From 4d28be26104b131633284523672bc911c9e1e0b1 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 31 Aug 2024 17:55:06 +0800 Subject: [PATCH 34/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20ModBase.vb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Base/ModBase.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb index 3ab9f31..0a085f6 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb @@ -11,8 +11,8 @@ Public Module ModBase #Region "声明" '下列版本信息由更新器自动修改 - Public Const VersionBaseName As String = "2.8.4" '不含分支前缀的显示用版本名 - Public Const VersionStandardCode As String = "2.8.4." & VersionBranchCode '标准格式的四段式版本号 + Public Const VersionBaseName As String = "2.8.5" '不含分支前缀的显示用版本名 + Public Const VersionStandardCode As String = "2.8.5." & VersionBranchCode '标准格式的四段式版本号 'CommitHash Public Const CommitHash As String = "" #If BETA Then From ae503a6945e6137b3184f384116809ce8fb35f56 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 31 Aug 2024 18:16:08 +0800 Subject: [PATCH 35/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 859b414..beb3b9f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,10 +34,11 @@ jobs: run: | (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Public Const OAuthClientId As String = ""', 'Public Const OAuthClientId As String = "${{ secrets.CLIENT_ID }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Public Const CurseForgeAPIKey As String = ""', 'Public Const CurseForgeAPIKey As String = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" + (gc "Plain Craft Launcher 2\Modules\Base\ModBase.vb") -replace 'Public Const CommitHash As String = ""', 'Public Const CommitHash As String = "${{ github.sha }}"' | Out-File "Plain Craft Launcher 2\Modules\Base\ModBase.vb" - name: Build run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: name: ${{ env.configuration }} ${{ env.describe }} - path: ${{ GITHUB.WORKSPACE }}\Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe + path: Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe From 5bf3ce0105538e8b93a0ed0440d13a3c0a892a49 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 31 Aug 2024 18:26:47 +0800 Subject: [PATCH 36/39] Update Plain Craft Launcher 2/Application.xaml.vb --- Plain Craft Launcher 2/Application.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Application.xaml.vb b/Plain Craft Launcher 2/Application.xaml.vb index cfe895d..568af5a 100644 --- a/Plain Craft Launcher 2/Application.xaml.vb +++ b/Plain Craft Launcher 2/Application.xaml.vb @@ -99,7 +99,7 @@ Public Class Application '日志初始化 LogStart() '添加日志 - Log($"[Start] 程序版本:{VersionDisplayName} ({VersionCode}){If(CommitHash <> "", ",Commit Hash:{CommitHash}", "")}") + Log($"[Start] 程序版本:{VersionDisplayName} ({VersionCode}){If(CommitHash <> "", $",Commit Hash:{CommitHash}", "")}") Log($"[Start] 识别码:{UniqueAddress}{If(ThemeCheckOne(9), ",已解锁反馈主题", "")}") Log($"[Start] 程序路径:{PathWithName}") Log($"[Start] 系统编码:{Encoding.Default} ({Encoding.Default.CodePage}, GBK={IsGBKEncoding})") From b30ad60d997262bc524dfe1d24342e5b5d64ae94 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Tue, 3 Sep 2024 19:56:54 +0800 Subject: [PATCH 37/39] Update Plain Craft Launcher 2/Modules/Base/ModBase.vb --- Plain Craft Launcher 2/Modules/Base/ModBase.vb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb index 7d3a3e6..2bad9a6 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb @@ -13,8 +13,7 @@ Public Module ModBase '下列版本信息由更新器自动修改 Public Const VersionBaseName As String = "2.8.5" '不含分支前缀的显示用版本名 Public Const VersionStandardCode As String = "2.8.5." & VersionBranchCode '标准格式的四段式版本号 - 'CommitHash - Public Const CommitHash As String = "" + Public Const CommitHash As String = "" 'Commit Hash #If BETA Then Public Const VersionCode As Integer = 332 'Release #Else From e51f6f0a6674f98e380ea0cf1ece9a093bf0c5d8 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:02:17 +0800 Subject: [PATCH 38/39] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index beb3b9f..0fcfe6b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,4 +41,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ env.configuration }} ${{ env.describe }} - path: Plain Craft Launcher 2\obj\Debug\Plain Craft Launcher 2.exe + path: Plain Craft Launcher 2\obj\${{ env.configuration }}\Plain Craft Launcher 2.exe From 8e0368180cdadf6bb9b599a93699883db2fa8165 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Tue, 24 Sep 2024 05:40:12 +0800 Subject: [PATCH 39/39] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0fcfe6b..fa9c3a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,9 @@ jobs: build: name: Build runs-on: windows-latest - env: - configuration: Debug + strategy: + matrix: + configuration: [Debug, Release] steps: - name: Checkout uses: actions/checkout@v4 @@ -36,9 +37,9 @@ jobs: (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Public Const CurseForgeAPIKey As String = ""', 'Public Const CurseForgeAPIKey As String = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb" (gc "Plain Craft Launcher 2\Modules\Base\ModBase.vb") -replace 'Public Const CommitHash As String = ""', 'Public Const CommitHash As String = "${{ github.sha }}"' | Out-File "Plain Craft Launcher 2\Modules\Base\ModBase.vb" - name: Build - run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ env.configuration }} + run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ matrix.configuration }} - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.configuration }} ${{ env.describe }} - path: Plain Craft Launcher 2\obj\${{ env.configuration }}\Plain Craft Launcher 2.exe + name: ${{ matrix.configuration }} ${{ env.describe }} + path: Plain Craft Launcher 2\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe