From 70a2f28073d3e361320b84b9f0e7cba08e71e924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Mon, 2 Jun 2025 13:27:23 +0800 Subject: [PATCH] =?UTF-8?q?revert:=20=E9=94=99=E8=AF=AF=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2.sln | 16 +- Plain Craft Launcher 2/App.config | 66 +++--- .../My Project/Resources.Designer.vb | 204 +++++------------- .../Plain Craft Launcher 2.vbproj | 55 +---- 4 files changed, 92 insertions(+), 249 deletions(-) diff --git a/Plain Craft Launcher 2.sln b/Plain Craft Launcher 2.sln index 40c68b7..e48dc61 100644 --- a/Plain Craft Launcher 2.sln +++ b/Plain Craft Launcher 2.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32616.157 @@ -8,31 +8,19 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Beta|Any CPU = Beta|Any CPU - Beta|x64 = Beta|x64 Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 ReleaseUpdate|Any CPU = ReleaseUpdate|Any CPU - ReleaseUpdate|x64 = ReleaseUpdate|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Beta|Any CPU.ActiveCfg = BETA|Any CPU {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Beta|Any CPU.Build.0 = BETA|Any CPU - {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Beta|x64.ActiveCfg = BETA|x64 - {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Beta|x64.Build.0 = BETA|x64 {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Debug|x64.ActiveCfg = Debug|x64 - {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Debug|x64.Build.0 = Debug|x64 {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Release|Any CPU.ActiveCfg = Release|Any CPU {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Release|Any CPU.Build.0 = Release|Any CPU - {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Release|x64.ActiveCfg = Release|x64 - {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.Release|x64.Build.0 = Release|x64 {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.ReleaseUpdate|Any CPU.ActiveCfg = ReleaseUpdate|Any CPU {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.ReleaseUpdate|Any CPU.Build.0 = ReleaseUpdate|Any CPU - {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.ReleaseUpdate|x64.ActiveCfg = ReleaseUpdate|x64 - {4499F2D2-18EF-4238-B1F0-7BD547AFF925}.ReleaseUpdate|x64.Build.0 = ReleaseUpdate|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -46,4 +34,4 @@ Global GlobalSection(Performance) = preSolution HasPerformanceSessions = true EndGlobalSection -EndGlobal +EndGlobal \ No newline at end of file diff --git a/Plain Craft Launcher 2/App.config b/Plain Craft Launcher 2/App.config index 0f0f321..e9bc7c7 100644 --- a/Plain Craft Launcher 2/App.config +++ b/Plain Craft Launcher 2/App.config @@ -1,35 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Plain Craft Launcher 2/My Project/Resources.Designer.vb b/Plain Craft Launcher 2/My Project/Resources.Designer.vb index 81e998d..02b1744 100644 --- a/Plain Craft Launcher 2/My Project/Resources.Designer.vb +++ b/Plain Craft Launcher 2/My Project/Resources.Designer.vb @@ -1,4 +1,4 @@ -'------------------------------------------------------------------------------ +'------------------------------------------------------------------------------ ' ' 此代码由工具生成。 ' 运行时版本:4.0.30319.42000 @@ -11,163 +11,61 @@ Option Strict On Option Explicit On -Imports System -Namespace My.Resources + + _ +Partial Friend NotInheritable Class MySettings + Inherits Global.System.Configuration.ApplicationSettingsBase - '此类是由 StronglyTypedResourceBuilder - '类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - '若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen - '(以 /str 作为命令选项)，或重新生成 VS 项目。 - ''' - ''' 一个强类型的资源类，用于查找本地化的字符串等。 - ''' - _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - ''' - ''' 返回此类使用的缓存的 ResourceManager 实例。 - ''' - _ - Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager - Get - If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("PCL.Resources", GetType(Resources).Assembly) - resourceMan = temp + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "My.Settings 自动保存功能" +#If _MyType = "WindowsForms" Then + Private Shared addedHandler As Boolean + + Private Shared addedHandlerLockObject As New Object + + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub +#End If +#End Region + + Public Shared ReadOnly Property [Default]() As MySettings + Get + +#If _MyType = "WindowsForms" Then + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock End If - Return resourceMan - End Get - End Property +#End If + Return defaultInstance + End Get + End Property +End Class + +Namespace My + + _ + Friend Module MySettingsProperty - ''' - ''' 重写当前线程的 CurrentUICulture 属性，对 - ''' 使用此强类型资源类的所有资源查找执行重写。 - ''' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo + _ + Friend ReadOnly Property Settings() As Global.PCL.MySettings Get - Return resourceCulture - End Get - Set - resourceCulture = value - End Set - End Property - - ''' - ''' 查找 System.Byte[] 类型的本地化资源。 - ''' - Friend ReadOnly Property Custom() As Byte() - Get - Dim obj As Object = ResourceManager.GetObject("Custom", resourceCulture) - Return CType(obj,Byte()) - End Get - End Property - - ''' - ''' 查找 System.Byte[] 类型的本地化资源。 - ''' - Friend ReadOnly Property Dialogs() As Byte() - Get - Dim obj As Object = ResourceManager.GetObject("Dialogs", resourceCulture) - Return CType(obj,Byte()) - End Get - End Property - - ''' - ''' 查找 System.Byte[] 类型的本地化资源。 - ''' - Friend ReadOnly Property ForgeInstaller() As Byte() - Get - Dim obj As Object = ResourceManager.GetObject("ForgeInstaller", resourceCulture) - Return CType(obj,Byte()) - End Get - End Property - - ''' - ''' 查找 System.Byte[] 类型的本地化资源。 - ''' - Friend ReadOnly Property Help() As Byte() - Get - Dim obj As Object = ResourceManager.GetObject("Help", resourceCulture) - Return CType(obj,Byte()) - End Get - End Property - - ''' - ''' 查找 System.Byte[] 类型的本地化资源。 - ''' - Friend ReadOnly Property Imazen_WebP() As Byte() - Get - Dim obj As Object = ResourceManager.GetObject("Imazen_WebP", resourceCulture) - Return CType(obj,Byte()) - End Get - End Property - - ''' - ''' 查找 System.Byte[] 类型的本地化资源。 - ''' - Friend ReadOnly Property JavaWrapper() As Byte() - Get - Dim obj As Object = ResourceManager.GetObject("JavaWrapper", resourceCulture) - Return CType(obj,Byte()) - End Get - End Property - - ''' - ''' 查找 System.Byte[] 类型的本地化资源。 - ''' - Friend ReadOnly Property Json() As Byte() - Get - Dim obj As Object = ResourceManager.GetObject("Json", resourceCulture) - Return CType(obj,Byte()) - End Get - End Property - - ''' - ''' 查找 System.Byte[] 类型的本地化资源。 - ''' - Friend ReadOnly Property libwebp64() As Byte() - Get - Dim obj As Object = ResourceManager.GetObject("libwebp64", resourceCulture) - Return CType(obj,Byte()) - End Get - End Property - - ''' - ''' 查找 System.Byte[] 类型的本地化资源。 - ''' - Friend ReadOnly Property ModData() As Byte() - Get - Dim obj As Object = ResourceManager.GetObject("ModData", resourceCulture) - Return CType(obj,Byte()) - End Get - End Property - - ''' - ''' 查找 System.Byte[] 类型的本地化资源。 - ''' - Friend ReadOnly Property NAudio() As Byte() - Get - Dim obj As Object = ResourceManager.GetObject("NAudio", resourceCulture) - Return CType(obj,Byte()) - End Get - End Property - - ''' - ''' 查找 System.Byte[] 类型的本地化资源。 - ''' - Friend ReadOnly Property Transformer() As Byte() - Get - Dim obj As Object = ResourceManager.GetObject("Transformer", resourceCulture) - Return CType(obj,Byte()) + Return Global.PCL.MySettings.Default End Get End Property End Module -End Namespace +End Namespace \ No newline at end of file diff --git a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj index 9b2d8d8..8d3a3e6 100644 --- a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj +++ b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj @@ -139,56 +139,6 @@ BasicDesignGuidelineRules.ruleset false - - true - bin\x64\Debug\ - Plain Craft Launcher 2.xml - 1 - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314 - full - x64 - MinimumRecommendedRules.ruleset - - - bin\x64\Release\ - RELEASE - Plain Craft Launcher 2.xml - true - 1 - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314 - x64 - BasicDesignGuidelineRules.ruleset - - - bin\x64\Snapshot\ - SNAPSHOT - Plain Craft Launcher 2.xml - true - 1 - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314 - x64 - BasicDesignGuidelineRules.ruleset - - - bin\x64\BETA\ - BETA - Plain Craft Launcher 2.xml - true - 1 - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314 - x64 - BasicDesignGuidelineRules.ruleset - - - bin\x64\ReleaseUpdate\ - RELEASE,BY_UPDATE - Plain Craft Launcher 2.xml - true - 1 - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314 - x64 - BasicDesignGuidelineRules.ruleset - False @@ -245,6 +195,9 @@ MyIconTextButton.xaml + + + @@ -548,6 +501,7 @@ FormMain.xaml Code + MSBuild:Compile Designer @@ -995,6 +949,7 @@ +