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] 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