From e188f7392cdcd41ab58ae0693e2a0598ab6540cf Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Thu, 26 Jun 2025 16:01:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=85=81=E8=AE=B8=E4=B8=BA?= =?UTF-8?q?=E5=8D=95=E4=B8=AA=E7=89=88=E6=9C=AC=E5=85=B3=E9=97=AD=20Mod=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb | 2 +- Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb | 3 ++- .../Pages/PageVersion/PageVersionMod.xaml | 4 +++- .../Pages/PageVersion/PageVersionMod.xaml.vb | 10 ++++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb index bb9b3d5..58e5401 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb @@ -688,7 +688,7 @@ Finished: ''' Public ReadOnly Property CanUpdate As Boolean Get - Return Not Setup.Get("UiHiddenFunctionModUpdate") AndAlso ChangelogUrls.Any() + Return Not Setup.Get("UiHiddenFunctionModUpdate") AndAlso Setup.Get("VersionCanModUpdate", Version:=PageVersionLeft.Version) AndAlso ChangelogUrls.Any() End Get End Property diff --git a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb index 28fcd3d..0c3aa8a 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb @@ -194,7 +194,8 @@ {"VersionServerNide", New SetupEntry("", Source:=SetupSource.Version)}, {"VersionServerAuthRegister", New SetupEntry("", Source:=SetupSource.Version)}, {"VersionServerAuthName", New SetupEntry("", Source:=SetupSource.Version)}, - {"VersionServerAuthServer", New SetupEntry("", Source:=SetupSource.Version)} + {"VersionServerAuthServer", New SetupEntry("", Source:=SetupSource.Version)}, + {"VersionCanModUpdate", New SetupEntry(True, Source:=SetupSource.Version)} } #Region "基础" diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml index ab0a725..0629e2f 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml @@ -17,12 +17,14 @@ + - + + diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb index 184e924..18da076 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb @@ -22,6 +22,7 @@ For Each Btn As MyRadioButton In PanFilter.Children Btn.LabText.Margin = New Thickness(-2, 0, 8, 0) Next + BtnManageModUpdate.Text = If(Setup.Get("VersionCanModUpdate", Version:=PageVersionLeft.Version), "禁用 Mod 更新", "启用 Mod 更新") #If DEBUG Then BtnManageCheck.Visibility = Visibility.Visible @@ -384,6 +385,15 @@ Install: PageComp.TargetVersion = PageVersionLeft.Version '将当前版本设置为筛选器 FrmMain.PageChange(FormMain.PageType.Download, FormMain.PageSubType.DownloadMod) End Sub + + ''' + ''' 禁用/启用 Mod 更新 + ''' + Private Sub BtnManageModUpdate_Click(sender As Object, e As MouseButtonEventArgs) Handles BtnManageModUpdate.Click + Setup.Set("VersionCanModUpdate", Not Setup.Get("VersionCanModUpdate", Version:=PageVersionLeft.Version), Version:=PageVersionLeft.Version) + BtnManageModUpdate.Text = If(Setup.Get("VersionCanModUpdate", Version:=PageVersionLeft.Version), "禁用 Mod 更新", "启用 Mod 更新") + RefreshBars() + End Sub #End Region From c708aca3fb72c245773930db9c7d8328bb085e19 Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Fri, 27 Jun 2025 09:32:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=88=B0=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E5=90=AF=E5=8A=A8=E9=80=89=E9=A1=B9=E9=87=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb | 2 +- Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb | 4 ++-- .../Pages/PageVersion/PageVersionMod.xaml | 4 +--- .../Pages/PageVersion/PageVersionMod.xaml.vb | 10 ---------- .../Pages/PageVersion/PageVersionSetup.xaml | 2 ++ .../Pages/PageVersion/PageVersionSetup.xaml.vb | 4 +++- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb index 58e5401..6c597ae 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb @@ -688,7 +688,7 @@ Finished: ''' Public ReadOnly Property CanUpdate As Boolean Get - Return Not Setup.Get("UiHiddenFunctionModUpdate") AndAlso Setup.Get("VersionCanModUpdate", Version:=PageVersionLeft.Version) AndAlso ChangelogUrls.Any() + Return Not Setup.Get("UiHiddenFunctionModUpdate") AndAlso Not Setup.Get("VersionAdvanceDisableModUpdate", Version:=PageVersionLeft.Version) AndAlso ChangelogUrls.Any() End Get End Property diff --git a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb index 0c3aa8a..cc9afb3 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb @@ -181,6 +181,7 @@ {"VersionAdvanceRun", New SetupEntry("", Source:=SetupSource.Version)}, {"VersionAdvanceRunWait", New SetupEntry(True, Source:=SetupSource.Version)}, {"VersionAdvanceDisableJLW", New SetupEntry(False, Source:=SetupSource.Version)}, + {"VersionAdvanceDisableModUpdate", New SetupEntry(False, Source:=SetupSource.Version)}, {"VersionRamType", New SetupEntry(2, Source:=SetupSource.Version)}, {"VersionRamCustom", New SetupEntry(15, Source:=SetupSource.Version)}, {"VersionRamOptimize", New SetupEntry(0, Source:=SetupSource.Version)}, @@ -194,8 +195,7 @@ {"VersionServerNide", New SetupEntry("", Source:=SetupSource.Version)}, {"VersionServerAuthRegister", New SetupEntry("", Source:=SetupSource.Version)}, {"VersionServerAuthName", New SetupEntry("", Source:=SetupSource.Version)}, - {"VersionServerAuthServer", New SetupEntry("", Source:=SetupSource.Version)}, - {"VersionCanModUpdate", New SetupEntry(True, Source:=SetupSource.Version)} + {"VersionServerAuthServer", New SetupEntry("", Source:=SetupSource.Version)} } #Region "基础" diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml index 0629e2f..ab0a725 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml @@ -17,14 +17,12 @@ - - - + diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb index 18da076..184e924 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb @@ -22,7 +22,6 @@ For Each Btn As MyRadioButton In PanFilter.Children Btn.LabText.Margin = New Thickness(-2, 0, 8, 0) Next - BtnManageModUpdate.Text = If(Setup.Get("VersionCanModUpdate", Version:=PageVersionLeft.Version), "禁用 Mod 更新", "启用 Mod 更新") #If DEBUG Then BtnManageCheck.Visibility = Visibility.Visible @@ -385,15 +384,6 @@ Install: PageComp.TargetVersion = PageVersionLeft.Version '将当前版本设置为筛选器 FrmMain.PageChange(FormMain.PageType.Download, FormMain.PageSubType.DownloadMod) End Sub - - ''' - ''' 禁用/启用 Mod 更新 - ''' - Private Sub BtnManageModUpdate_Click(sender As Object, e As MouseButtonEventArgs) Handles BtnManageModUpdate.Click - Setup.Set("VersionCanModUpdate", Not Setup.Get("VersionCanModUpdate", Version:=PageVersionLeft.Version), Version:=PageVersionLeft.Version) - BtnManageModUpdate.Text = If(Setup.Get("VersionCanModUpdate", Version:=PageVersionLeft.Version), "禁用 Mod 更新", "启用 Mod 更新") - RefreshBars() - End Sub #End Region diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml index dc55cae..fb50eca 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml @@ -219,6 +219,8 @@ + diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb index a11595b..87ddec6 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb @@ -61,6 +61,7 @@ CheckAdvanceAssetsV2.Checked = Setup.Get("VersionAdvanceAssetsV2", Version:=PageVersionLeft.Version) CheckAdvanceJava.Checked = Setup.Get("VersionAdvanceJava", Version:=PageVersionLeft.Version) CheckAdvanceDisableJLW.Checked = Setup.Get("VersionAdvanceDisableJLW", Version:=PageVersionLeft.Version) + CheckAdvanceDisableModUpdate.Checked = Setup.Get("VersionAdvanceDisableModUpdate", Version:=PageVersionLeft.Version) Catch ex As Exception Log(ex, "重载版本独立设置时出错", LogLevel.Feedback) @@ -91,6 +92,7 @@ Setup.Reset("VersionAdvanceRun", Version:=PageVersionLeft.Version) Setup.Reset("VersionAdvanceRunWait", Version:=PageVersionLeft.Version) Setup.Reset("VersionAdvanceDisableJLW", Version:=PageVersionLeft.Version) + Setup.Reset("VersionAdvanceDisableModUpdate", Version:=PageVersionLeft.Version) Setup.Reset("VersionArgumentJavaSelect", Version:=PageVersionLeft.Version) JavaSearchLoader.Start(IsForceRestart:=True) @@ -125,7 +127,7 @@ Private Shared Sub CheckBoxLikeComboChange(sender As MyComboBox, e As Object) Handles ComboArgumentIndieV2.SelectionChanged If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.SelectedIndex = 0, Version:=PageVersionLeft.Version) End Sub - Private Shared Sub CheckBoxChange(sender As MyCheckBox, e As Object) Handles CheckAdvanceRunWait.Change, CheckAdvanceAssetsV2.Change, CheckAdvanceJava.Change, CheckAdvanceDisableJLW.Change + Private Shared Sub CheckBoxChange(sender As MyCheckBox, e As Object) Handles CheckAdvanceRunWait.Change, CheckAdvanceAssetsV2.Change, CheckAdvanceJava.Change, CheckAdvanceDisableJLW.Change, CheckAdvanceDisableModUpdate.Change If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.Checked, Version:=PageVersionLeft.Version) End Sub