Merge branch 'main' into main
This commit is contained in:
@@ -838,16 +838,16 @@ Public Module ModBase
|
|||||||
'确保目录存在
|
'确保目录存在
|
||||||
Directory.CreateDirectory(GetPathFromFullPath(FilePath))
|
Directory.CreateDirectory(GetPathFromFullPath(FilePath))
|
||||||
'写入文件
|
'写入文件
|
||||||
If File.Exists(FilePath) Then
|
If Append Then
|
||||||
'如果文件存在,刷新目前文件
|
'追加目前文件
|
||||||
Using writer As New StreamWriter(FilePath, Append, If(Encoding, GetEncoding(ReadFileBytes(FilePath))))
|
Using writer As New StreamWriter(FilePath, True, If(Encoding, GetEncoding(ReadFileBytes(FilePath))))
|
||||||
writer.Write(Text)
|
writer.Write(Text)
|
||||||
writer.Flush()
|
writer.Flush()
|
||||||
writer.Close()
|
writer.Close()
|
||||||
End Using
|
End Using
|
||||||
Else
|
Else
|
||||||
'如果文件不存在,则新建并写入
|
'直接写入字节集
|
||||||
File.WriteAllText(FilePath, Text, If(Encoding, New UTF8Encoding(False)))
|
File.WriteAllBytes(FilePath, If(Encoding Is Nothing, Encoding.UTF8.GetBytes(Text), Encoding.GetBytes(Text)))
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
''' <summary>
|
''' <summary>
|
||||||
|
|||||||
@@ -1363,14 +1363,15 @@ Retry:
|
|||||||
McLaunchLog("开始获取 Minecraft 启动参数")
|
McLaunchLog("开始获取 Minecraft 启动参数")
|
||||||
'获取基准字符串与参数信息
|
'获取基准字符串与参数信息
|
||||||
Dim Arguments As String
|
Dim Arguments As String
|
||||||
|
Arguments = If(McLaunchJavaSelected.VersionCode > 8, "-Dfile.encoding=UTF-8 -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 ", Nothing) '#4700
|
||||||
If McVersionCurrent.JsonObject("arguments") IsNot Nothing AndAlso McVersionCurrent.JsonObject("arguments")("jvm") IsNot Nothing Then
|
If McVersionCurrent.JsonObject("arguments") IsNot Nothing AndAlso McVersionCurrent.JsonObject("arguments")("jvm") IsNot Nothing Then
|
||||||
McLaunchLog("获取新版 JVM 参数")
|
McLaunchLog("获取新版 JVM 参数")
|
||||||
Arguments = McLaunchArgumentsJvmNew(McVersionCurrent)
|
Arguments += McLaunchArgumentsJvmNew(McVersionCurrent)
|
||||||
McLaunchLog("新版 JVM 参数获取成功:")
|
McLaunchLog("新版 JVM 参数获取成功:")
|
||||||
McLaunchLog(Arguments)
|
McLaunchLog(Arguments)
|
||||||
Else
|
Else
|
||||||
McLaunchLog("获取旧版 JVM 参数")
|
McLaunchLog("获取旧版 JVM 参数")
|
||||||
Arguments = McLaunchArgumentsJvmOld(McVersionCurrent)
|
Arguments += McLaunchArgumentsJvmOld(McVersionCurrent)
|
||||||
McLaunchLog("旧版 JVM 参数获取成功:")
|
McLaunchLog("旧版 JVM 参数获取成功:")
|
||||||
McLaunchLog(Arguments)
|
McLaunchLog(Arguments)
|
||||||
End If
|
End If
|
||||||
@@ -1467,9 +1468,10 @@ Retry:
|
|||||||
|
|
||||||
'添加 Java Wrapper 作为主 Jar
|
'添加 Java Wrapper 作为主 Jar
|
||||||
If McLaunchJavaSelected.VersionCode >= 9 Then DataList.Add("--add-exports cpw.mods.bootstraplauncher/cpw.mods.bootstraplauncher=ALL-UNNAMED")
|
If McLaunchJavaSelected.VersionCode >= 9 Then DataList.Add("--add-exports cpw.mods.bootstraplauncher/cpw.mods.bootstraplauncher=ALL-UNNAMED")
|
||||||
DataList.Add("-Doolloo.jlw.tmpdir=""" & PathPure.TrimEnd("\") & """")
|
If Setup.Get("VersionAdvanceUseLaunchWrapperV2", Version) AndAlso Setup.Get("LaunchAdvanceUseLaunchWrapper") Then
|
||||||
DataList.Add("-jar """ & ExtractJavaWrapper() & """")
|
DataList.Add("-Doolloo.jlw.tmpdir=""" & PathPure.TrimEnd("\") & """")
|
||||||
|
DataList.Add("-jar """ & ExtractJavaWrapper() & """")
|
||||||
|
End If
|
||||||
'添加 MainClass
|
'添加 MainClass
|
||||||
If Version.JsonObject("mainClass") Is Nothing Then
|
If Version.JsonObject("mainClass") Is Nothing Then
|
||||||
Throw New Exception("版本 json 中没有 mainClass 项!")
|
Throw New Exception("版本 json 中没有 mainClass 项!")
|
||||||
@@ -1534,9 +1536,10 @@ NextVersion:
|
|||||||
|
|
||||||
'添加 Java Wrapper 作为主 Jar
|
'添加 Java Wrapper 作为主 Jar
|
||||||
If McLaunchJavaSelected.VersionCode >= 9 Then DataList.Add("--add-exports cpw.mods.bootstraplauncher/cpw.mods.bootstraplauncher=ALL-UNNAMED")
|
If McLaunchJavaSelected.VersionCode >= 9 Then DataList.Add("--add-exports cpw.mods.bootstraplauncher/cpw.mods.bootstraplauncher=ALL-UNNAMED")
|
||||||
DataList.Add("-Doolloo.jlw.tmpdir=""" & PathPure.TrimEnd("\") & """")
|
If Setup.Get("VersionAdvanceUseLaunchWrapperV2", Version) AndAlso Setup.Get("LaunchAdvanceUseLaunchWrapper") Then
|
||||||
DataList.Add("-jar """ & ExtractJavaWrapper() & """")
|
DataList.Add("-Doolloo.jlw.tmpdir=""" & PathPure.TrimEnd("\") & """")
|
||||||
|
DataList.Add("-jar """ & ExtractJavaWrapper() & """")
|
||||||
|
End If
|
||||||
'将 "-XXX" 与后面 "XXX" 合并到一起
|
'将 "-XXX" 与后面 "XXX" 合并到一起
|
||||||
'如果不合并,会导致 Forge 1.17 启动无效,它有两个 --add-exports,进一步导致其中一个在后面被去重
|
'如果不合并,会导致 Forge 1.17 启动无效,它有两个 --add-exports,进一步导致其中一个在后面被去重
|
||||||
Dim DeDuplicateDataList As New List(Of String)
|
Dim DeDuplicateDataList As New List(Of String)
|
||||||
@@ -2096,6 +2099,7 @@ IgnoreCustomSkin:
|
|||||||
'输出 bat
|
'输出 bat
|
||||||
Try
|
Try
|
||||||
Dim CmdString As String =
|
Dim CmdString As String =
|
||||||
|
$"{If(McLaunchJavaSelected.VersionCode > 8, "chcp 65001>nul" & vbCrLf, Nothing)}" &
|
||||||
"@echo off" & vbCrLf &
|
"@echo off" & vbCrLf &
|
||||||
"title 启动 - " & McVersionCurrent.Name & vbCrLf &
|
"title 启动 - " & McVersionCurrent.Name & vbCrLf &
|
||||||
"echo 游戏正在启动,请稍候。" & vbCrLf &
|
"echo 游戏正在启动,请稍候。" & vbCrLf &
|
||||||
@@ -2188,8 +2192,8 @@ IgnoreCustomSkin:
|
|||||||
StartInfo.EnvironmentVariables("Path") = Join(Paths.Distinct.ToList, ";")
|
StartInfo.EnvironmentVariables("Path") = Join(Paths.Distinct.ToList, ";")
|
||||||
|
|
||||||
'设置其他参数
|
'设置其他参数
|
||||||
StartInfo.StandardErrorEncoding = Encoding.UTF8
|
StartInfo.StandardErrorEncoding = If(McLaunchJavaSelected.VersionCode > 8, Encoding.UTF8, Nothing)
|
||||||
StartInfo.StandardOutputEncoding = Encoding.UTF8
|
StartInfo.StandardOutputEncoding = If(McLaunchJavaSelected.VersionCode > 8, Encoding.UTF8, Nothing)
|
||||||
StartInfo.WorkingDirectory = ShortenPath(McVersionCurrent.PathIndie)
|
StartInfo.WorkingDirectory = ShortenPath(McVersionCurrent.PathIndie)
|
||||||
StartInfo.UseShellExecute = False
|
StartInfo.UseShellExecute = False
|
||||||
StartInfo.RedirectStandardOutput = True
|
StartInfo.RedirectStandardOutput = True
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
Public Module ModMusic
|
Imports NAudio.CoreAudioApi
|
||||||
|
Imports NAudio.CoreAudioApi.Interfaces
|
||||||
|
|
||||||
|
Public Module ModMusic
|
||||||
|
|
||||||
#Region "播放列表"
|
#Region "播放列表"
|
||||||
|
|
||||||
@@ -66,44 +69,44 @@
|
|||||||
''' </summary>
|
''' </summary>
|
||||||
Private Sub MusicRefreshUI()
|
Private Sub MusicRefreshUI()
|
||||||
RunInUi(
|
RunInUi(
|
||||||
Sub()
|
Sub()
|
||||||
Try
|
Try
|
||||||
|
|
||||||
If Not MusicAllList.Any() Then
|
If Not MusicAllList.Any() Then
|
||||||
'无背景音乐
|
'无背景音乐
|
||||||
FrmMain.BtnExtraMusic.Show = False
|
FrmMain.BtnExtraMusic.Show = False
|
||||||
Else
|
|
||||||
'有背景音乐
|
|
||||||
FrmMain.BtnExtraMusic.Show = True
|
|
||||||
Dim ToolTipText As String
|
|
||||||
If MusicState = MusicStates.Pause Then
|
|
||||||
FrmMain.BtnExtraMusic.Logo = Logo.IconPlay
|
|
||||||
FrmMain.BtnExtraMusic.LogoScale = 0.8
|
|
||||||
ToolTipText = "已暂停:" & GetFileNameWithoutExtentionFromPath(MusicCurrent)
|
|
||||||
If MusicAllList.Count > 1 Then
|
|
||||||
ToolTipText += vbCrLf & "左键恢复播放,右键播放下一曲。"
|
|
||||||
Else
|
|
||||||
ToolTipText += vbCrLf & "左键恢复播放,右键重新从头播放。"
|
|
||||||
End If
|
|
||||||
Else
|
Else
|
||||||
FrmMain.BtnExtraMusic.Logo = Logo.IconMusic
|
'有背景音乐
|
||||||
FrmMain.BtnExtraMusic.LogoScale = 1
|
FrmMain.BtnExtraMusic.Show = True
|
||||||
ToolTipText = "正在播放:" & GetFileNameWithoutExtentionFromPath(MusicCurrent)
|
Dim ToolTipText As String
|
||||||
If MusicAllList.Count > 1 Then
|
If MusicState = MusicStates.Pause Then
|
||||||
ToolTipText += vbCrLf & "左键暂停,右键播放下一曲。"
|
FrmMain.BtnExtraMusic.Logo = Logo.IconPlay
|
||||||
|
FrmMain.BtnExtraMusic.LogoScale = 0.8
|
||||||
|
ToolTipText = "已暂停:" & GetFileNameWithoutExtentionFromPath(MusicCurrent)
|
||||||
|
If MusicAllList.Count > 1 Then
|
||||||
|
ToolTipText += vbCrLf & "左键恢复播放,右键播放下一曲。"
|
||||||
|
Else
|
||||||
|
ToolTipText += vbCrLf & "左键恢复播放,右键重新从头播放。"
|
||||||
|
End If
|
||||||
Else
|
Else
|
||||||
ToolTipText += vbCrLf & "左键暂停,右键重新从头播放。"
|
FrmMain.BtnExtraMusic.Logo = Logo.IconMusic
|
||||||
|
FrmMain.BtnExtraMusic.LogoScale = 1
|
||||||
|
ToolTipText = "正在播放:" & GetFileNameWithoutExtentionFromPath(MusicCurrent)
|
||||||
|
If MusicAllList.Count > 1 Then
|
||||||
|
ToolTipText += vbCrLf & "左键暂停,右键播放下一曲。"
|
||||||
|
Else
|
||||||
|
ToolTipText += vbCrLf & "左键暂停,右键重新从头播放。"
|
||||||
|
End If
|
||||||
End If
|
End If
|
||||||
|
FrmMain.BtnExtraMusic.ToolTip = ToolTipText
|
||||||
|
ToolTipService.SetVerticalOffset(FrmMain.BtnExtraMusic, If(ToolTipText.Contains(vbLf), 10, 16))
|
||||||
End If
|
End If
|
||||||
FrmMain.BtnExtraMusic.ToolTip = ToolTipText
|
If FrmSetupUI IsNot Nothing Then FrmSetupUI.MusicRefreshUI()
|
||||||
ToolTipService.SetVerticalOffset(FrmMain.BtnExtraMusic, If(ToolTipText.Contains(vbLf), 10, 16))
|
|
||||||
End If
|
|
||||||
If FrmSetupUI IsNot Nothing Then FrmSetupUI.MusicRefreshUI()
|
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
Log(ex, "刷新背景音乐 UI 失败", LogLevel.Feedback)
|
Log(ex, "刷新背景音乐 UI 失败", LogLevel.Feedback)
|
||||||
End Try
|
End Try
|
||||||
End Sub)
|
End Sub)
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
''' <summary>
|
''' <summary>
|
||||||
@@ -223,11 +226,11 @@
|
|||||||
Public Function MusicPause() As Boolean
|
Public Function MusicPause() As Boolean
|
||||||
If MusicState = MusicStates.Play Then
|
If MusicState = MusicStates.Play Then
|
||||||
RunInThread(
|
RunInThread(
|
||||||
Sub()
|
Sub()
|
||||||
Log("[Music] 已暂停播放")
|
Log("[Music] 已暂停播放")
|
||||||
MusicNAudio?.Pause()
|
MusicNAudio?.Pause()
|
||||||
MusicRefreshUI()
|
MusicRefreshUI()
|
||||||
End Sub)
|
End Sub)
|
||||||
Return True
|
Return True
|
||||||
Else
|
Else
|
||||||
Log($"[Music] 无需暂停播放,当前状态为 {MusicState}")
|
Log($"[Music] 无需暂停播放,当前状态为 {MusicState}")
|
||||||
@@ -243,11 +246,11 @@
|
|||||||
Return False
|
Return False
|
||||||
Else
|
Else
|
||||||
RunInThread(
|
RunInThread(
|
||||||
Sub()
|
Sub()
|
||||||
Log("[Music] 已恢复播放")
|
Log("[Music] 已恢复播放")
|
||||||
MusicNAudio?.Play()
|
MusicNAudio?.Play()
|
||||||
MusicRefreshUI()
|
MusicRefreshUI()
|
||||||
End Sub)
|
End Sub)
|
||||||
Return True
|
Return True
|
||||||
End If
|
End If
|
||||||
End Function
|
End Function
|
||||||
@@ -255,7 +258,7 @@
|
|||||||
#End Region
|
#End Region
|
||||||
|
|
||||||
''' <summary>
|
''' <summary>
|
||||||
''' 当前正在播放的 NAudio.Wave.WaveOut。
|
''' 当前正在播放的 NAudio.Wave.WaveOutEvent。
|
||||||
''' </summary>
|
''' </summary>
|
||||||
Public MusicNAudio = Nothing
|
Public MusicNAudio = Nothing
|
||||||
''' <summary>
|
''' <summary>
|
||||||
@@ -267,12 +270,13 @@
|
|||||||
''' 在 MusicUuid 不变的前提下,持续播放某地址的音乐,且在播放结束后随机播放下一曲。
|
''' 在 MusicUuid 不变的前提下,持续播放某地址的音乐,且在播放结束后随机播放下一曲。
|
||||||
''' </summary>
|
''' </summary>
|
||||||
Private Sub MusicLoop(Optional IsFirstLoad As Boolean = False)
|
Private Sub MusicLoop(Optional IsFirstLoad As Boolean = False)
|
||||||
Dim CurrentWave As NAudio.Wave.WaveOut = Nothing
|
Dim CurrentWave As NAudio.Wave.WaveOutEvent = Nothing
|
||||||
Dim Reader As NAudio.Wave.WaveStream = Nothing
|
Dim Reader As NAudio.Wave.WaveStream = Nothing
|
||||||
Try
|
Try
|
||||||
'开始播放
|
'开始播放
|
||||||
CurrentWave = New NAudio.Wave.WaveOut()
|
CurrentWave = New NAudio.Wave.WaveOutEvent()
|
||||||
MusicNAudio = CurrentWave
|
MusicNAudio = CurrentWave
|
||||||
|
CurrentWave.DeviceNumber = -1
|
||||||
Reader = New NAudio.Wave.AudioFileReader(MusicCurrent)
|
Reader = New NAudio.Wave.AudioFileReader(MusicCurrent)
|
||||||
CurrentWave.Init(Reader)
|
CurrentWave.Init(Reader)
|
||||||
CurrentWave.Play()
|
CurrentWave.Play()
|
||||||
@@ -303,7 +307,7 @@
|
|||||||
If ex.Message.Contains("Got a frame at sample rate") OrElse ex.Message.Contains("does not support changes to") Then
|
If ex.Message.Contains("Got a frame at sample rate") OrElse ex.Message.Contains("does not support changes to") Then
|
||||||
Hint("播放音乐失败(" & GetFileNameFromPath(MusicCurrent) & "):PCL 不支持播放音频属性在中途发生变化的音乐", HintType.Critical)
|
Hint("播放音乐失败(" & GetFileNameFromPath(MusicCurrent) & "):PCL 不支持播放音频属性在中途发生变化的音乐", HintType.Critical)
|
||||||
ElseIf Not (MusicCurrent.EndsWithF(".wav", True) OrElse MusicCurrent.EndsWithF(".mp3", True) OrElse MusicCurrent.EndsWithF(".flac", True)) OrElse
|
ElseIf Not (MusicCurrent.EndsWithF(".wav", True) OrElse MusicCurrent.EndsWithF(".mp3", True) OrElse MusicCurrent.EndsWithF(".flac", True)) OrElse
|
||||||
ex.Message.Contains("0xC00D36C4") Then '#5096:不支持给定的 URL 的字节流类型。 (异常来自 HRESULT:0xC00D36C4)
|
ex.Message.Contains("0xC00D36C4") Then '#5096:不支持给定的 URL 的字节流类型。 (异常来自 HRESULT:0xC00D36C4)
|
||||||
Hint("播放音乐失败(" & GetFileNameFromPath(MusicCurrent) & "):PCL 可能不支持此音乐格式,请将格式转换为 .wav、.mp3 或 .flac 后再试", HintType.Critical)
|
Hint("播放音乐失败(" & GetFileNameFromPath(MusicCurrent) & "):PCL 可能不支持此音乐格式,请将格式转换为 .wav、.mp3 或 .flac 后再试", HintType.Critical)
|
||||||
Else
|
Else
|
||||||
Log(ex, "播放音乐失败(" & GetFileNameFromPath(MusicCurrent) & ")", LogLevel.Hint)
|
Log(ex, "播放音乐失败(" & GetFileNameFromPath(MusicCurrent) & ")", LogLevel.Hint)
|
||||||
|
|||||||
@@ -2087,8 +2087,8 @@ Retry:
|
|||||||
'判断 OptiFine 是否作为 Mod 进行下载
|
'判断 OptiFine 是否作为 Mod 进行下载
|
||||||
Dim MinecraftCode As Integer = If(Request.MinecraftName.Contains("."), Val(Request.MinecraftName.Split(".")(1)), 0)
|
Dim MinecraftCode As Integer = If(Request.MinecraftName.Contains("."), Val(Request.MinecraftName.Split(".")(1)), 0)
|
||||||
Dim OptiFineAsMod As Boolean = Request.OptiFineEntry IsNot Nothing AndAlso '1. 选择了 OptiFine
|
Dim OptiFineAsMod As Boolean = Request.OptiFineEntry IsNot Nothing AndAlso '1. 选择了 OptiFine
|
||||||
(Request.FabricVersion IsNot Nothing OrElse '2. 选择了 Fabric...
|
Request.FabricVersion IsNot Nothing OrElse '2. 选择了 Mod 加载器
|
||||||
(Request.ForgeEntry IsNot Nothing AndAlso MinecraftCode >= 14 AndAlso MinecraftCode <= 15)) '...或者 Forge 1.14~15(#4134)
|
Request.ForgeEntry IsNot Nothing
|
||||||
Dim ModsFolder As String = New McVersion(OutputFolder).GetPathIndie(True) & "mods\"
|
Dim ModsFolder As String = New McVersion(OutputFolder).GetPathIndie(True) & "mods\"
|
||||||
|
|
||||||
If OptiFineAsMod Then
|
If OptiFineAsMod Then
|
||||||
|
|||||||
@@ -102,6 +102,7 @@
|
|||||||
{"LaunchAdvanceRun", New SetupEntry("")},
|
{"LaunchAdvanceRun", New SetupEntry("")},
|
||||||
{"LaunchAdvanceRunWait", New SetupEntry(True)},
|
{"LaunchAdvanceRunWait", New SetupEntry(True)},
|
||||||
{"LaunchAdvanceAssets", New SetupEntry(False)},
|
{"LaunchAdvanceAssets", New SetupEntry(False)},
|
||||||
|
{"LaunchAdvanceUseLaunchWrapper", New SetupEntry(True)},
|
||||||
{"LaunchAdvanceJava", New SetupEntry(False)},
|
{"LaunchAdvanceJava", New SetupEntry(False)},
|
||||||
{"LaunchGraphicSetup", New SetupEntry(False)},
|
{"LaunchGraphicSetup", New SetupEntry(False)},
|
||||||
{"LaunchRamType", New SetupEntry(0)},
|
{"LaunchRamType", New SetupEntry(0)},
|
||||||
@@ -172,6 +173,7 @@
|
|||||||
{"VersionAdvanceGame", New SetupEntry("", Source:=SetupSource.Version)},
|
{"VersionAdvanceGame", New SetupEntry("", Source:=SetupSource.Version)},
|
||||||
{"VersionAdvanceAssets", New SetupEntry(0, Source:=SetupSource.Version)},
|
{"VersionAdvanceAssets", New SetupEntry(0, Source:=SetupSource.Version)},
|
||||||
{"VersionAdvanceAssetsV2", New SetupEntry(False, Source:=SetupSource.Version)},
|
{"VersionAdvanceAssetsV2", New SetupEntry(False, Source:=SetupSource.Version)},
|
||||||
|
{"VersionAdvanceUseLaunchWrapperV2", New SetupEntry(True, Source:=SetupSource.Version)},
|
||||||
{"VersionAdvanceJava", New SetupEntry(False, Source:=SetupSource.Version)},
|
{"VersionAdvanceJava", New SetupEntry(False, Source:=SetupSource.Version)},
|
||||||
{"VersionAdvanceRun", New SetupEntry("", Source:=SetupSource.Version)},
|
{"VersionAdvanceRun", New SetupEntry("", Source:=SetupSource.Version)},
|
||||||
{"VersionAdvanceRunWait", New SetupEntry(True, Source:=SetupSource.Version)},
|
{"VersionAdvanceRunWait", New SetupEntry(True, Source:=SetupSource.Version)},
|
||||||
|
|||||||
@@ -259,6 +259,8 @@
|
|||||||
ToolTip="警告:强烈推荐在版本设置中关闭特定版本的警告,而不是在这里关闭所有版本的警告!
如果在设置中手动选择了与当前版本不兼容的 Java,则自动跳过兼容性警告弹窗,强制使用手动选择的 Java。" />
|
ToolTip="警告:强烈推荐在版本设置中关闭特定版本的警告,而不是在这里关闭所有版本的警告!
如果在设置中手动选择了与当前版本不兼容的 Java,则自动跳过兼容性警告弹窗,强制使用手动选择的 Java。" />
|
||||||
<local:MyCheckBox Text="关闭文件校验" x:Name="CheckAdvanceAssets" Tag="LaunchAdvanceAssets"
|
<local:MyCheckBox Text="关闭文件校验" x:Name="CheckAdvanceAssets" Tag="LaunchAdvanceAssets"
|
||||||
ToolTip="警告:强烈推荐在版本设置中关闭特定版本的校验,而不是在这里关闭所有版本的校验!
完全不更改 assets;不校验 libraries、第三方登录库与版本主 jar 文件是否被修改。
如果你没有修改相关文件,请勿勾选此项。" />
|
ToolTip="警告:强烈推荐在版本设置中关闭特定版本的校验,而不是在这里关闭所有版本的校验!
完全不更改 assets;不校验 libraries、第三方登录库与版本主 jar 文件是否被修改。
如果你没有修改相关文件,请勿勾选此项。" />
|
||||||
|
<local:MyCheckBox Text="使用 JLW" x:Name="CheckAdvanceUseLaunchWrapper" Tag="LaunchAdvanceUseLaunchWrapper" Margin="50,0,0,0"
|
||||||
|
ToolTip="警告:强烈推荐在版本设置中设置特定版本是否使用 JLW,而不是在这里设置全部版本是否使用 JLW!
在启动时额外加载 JLW 来处理中文目录。
如果服务器没有使用反作弊,请勿取消勾选此项。" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</local:MyCard>
|
</local:MyCard>
|
||||||
|
|||||||
@@ -55,6 +55,7 @@
|
|||||||
CheckAdvanceRunWait.Checked = Setup.Get("LaunchAdvanceRunWait")
|
CheckAdvanceRunWait.Checked = Setup.Get("LaunchAdvanceRunWait")
|
||||||
CheckAdvanceAssets.Checked = Setup.Get("LaunchAdvanceAssets")
|
CheckAdvanceAssets.Checked = Setup.Get("LaunchAdvanceAssets")
|
||||||
CheckAdvanceJava.Checked = Setup.Get("LaunchAdvanceJava")
|
CheckAdvanceJava.Checked = Setup.Get("LaunchAdvanceJava")
|
||||||
|
CheckAdvanceUseLaunchWrapper.Checked = Setup.Get("LaunchAdvanceUseLaunchWrapper")
|
||||||
|
|
||||||
Catch ex As NullReferenceException
|
Catch ex As NullReferenceException
|
||||||
Log(ex, "启动设置项存在异常,已被自动重置", LogLevel.Msgbox)
|
Log(ex, "启动设置项存在异常,已被自动重置", LogLevel.Msgbox)
|
||||||
@@ -81,6 +82,7 @@
|
|||||||
Setup.Reset("LaunchSkinType")
|
Setup.Reset("LaunchSkinType")
|
||||||
Setup.Reset("LaunchSkinID")
|
Setup.Reset("LaunchSkinID")
|
||||||
Setup.Reset("LaunchAdvanceJvm")
|
Setup.Reset("LaunchAdvanceJvm")
|
||||||
|
Setup.Reset("LaunchAdvanceUseLaunchWrapper")
|
||||||
Setup.Reset("LaunchAdvanceGame")
|
Setup.Reset("LaunchAdvanceGame")
|
||||||
Setup.Reset("LaunchAdvanceJava")
|
Setup.Reset("LaunchAdvanceJava")
|
||||||
Setup.Reset("LaunchAdvanceAssets")
|
Setup.Reset("LaunchAdvanceAssets")
|
||||||
@@ -114,7 +116,7 @@
|
|||||||
Private Shared Sub ComboChange(sender As MyComboBox, e As Object) Handles ComboArgumentIndie.SelectionChanged, ComboArgumentVisibie.SelectionChanged, ComboArgumentWindowType.SelectionChanged, ComboArgumentPriority.SelectionChanged
|
Private Shared Sub ComboChange(sender As MyComboBox, e As Object) Handles ComboArgumentIndie.SelectionChanged, ComboArgumentVisibie.SelectionChanged, ComboArgumentWindowType.SelectionChanged, ComboArgumentPriority.SelectionChanged
|
||||||
If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.SelectedIndex)
|
If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.SelectedIndex)
|
||||||
End Sub
|
End Sub
|
||||||
Private Shared Sub CheckBoxChange(sender As MyCheckBox, e As Object) Handles CheckAdvanceAssets.Change, CheckAdvanceJava.Change, CheckAdvanceRunWait.Change, CheckArgumentRam.Change, CheckAdvanceGraphicSetup.Change
|
Private Shared Sub CheckBoxChange(sender As MyCheckBox, e As Object) Handles CheckAdvanceAssets.Change, CheckAdvanceJava.Change, CheckAdvanceRunWait.Change, CheckArgumentRam.Change, CheckAdvanceUseLaunchWrapper.Change, CheckAdvanceGraphicSetup.Change
|
||||||
If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.Checked)
|
If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.Checked)
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -215,7 +217,7 @@
|
|||||||
End If
|
End If
|
||||||
'设置文本
|
'设置文本
|
||||||
LabRamGame.Text = If(RamGame = Math.Floor(RamGame), RamGame & ".0", RamGame) & " GB" &
|
LabRamGame.Text = If(RamGame = Math.Floor(RamGame), RamGame & ".0", RamGame) & " GB" &
|
||||||
If(RamGame <> RamGameActual, " (可用 " & If(RamGameActual = Math.Floor(RamGameActual), RamGameActual & ".0", RamGameActual) & " GB)", "")
|
If(Math.Abs(RamGame - RamGameActual) > 0.05, " (可用 " & If(RamGameActual = Math.Floor(RamGameActual), RamGameActual & ".0", RamGameActual) & " GB)", "")
|
||||||
LabRamUsed.Text = If(RamUsed = Math.Floor(RamUsed), RamUsed & ".0", RamUsed) & " GB"
|
LabRamUsed.Text = If(RamUsed = Math.Floor(RamUsed), RamUsed & ".0", RamUsed) & " GB"
|
||||||
LabRamTotal.Text = " / " & If(RamTotal = Math.Floor(RamTotal), RamTotal & ".0", RamTotal) & " GB"
|
LabRamTotal.Text = " / " & If(RamTotal = Math.Floor(RamTotal), RamTotal & ".0", RamTotal) & " GB"
|
||||||
LabRamWarn.Visibility = If(RamGame = 1 AndAlso Not JavaIs64Bit() AndAlso Not Is32BitSystem AndAlso JavaList.Any, Visibility.Visible, Visibility.Collapsed)
|
LabRamWarn.Visibility = If(RamGame = 1 AndAlso Not JavaIs64Bit() AndAlso Not Is32BitSystem AndAlso JavaList.Any, Visibility.Visible, Visibility.Collapsed)
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ Public Class PageVersionExport
|
|||||||
TextExportName.HintText = PageVersionLeft.Version.Name
|
TextExportName.HintText = PageVersionLeft.Version.Name
|
||||||
TextExportVersion.Text = ""
|
TextExportVersion.Text = ""
|
||||||
TextExportVersion.HintText = "1.0.0"
|
TextExportVersion.HintText = "1.0.0"
|
||||||
|
CheckAdvancedModrinth.Checked = False
|
||||||
GetExportOption(CheckOptionsBasic).Description = PageVersionLeft.Version.GetDefaultDescription()
|
GetExportOption(CheckOptionsBasic).Description = PageVersionLeft.Version.GetDefaultDescription()
|
||||||
ResetConfigOverrides()
|
ResetConfigOverrides()
|
||||||
ReloadAllSubOptions()
|
ReloadAllSubOptions()
|
||||||
|
|||||||
@@ -221,6 +221,8 @@
|
|||||||
ToolTip="如果在设置中手动选择了与当前版本不兼容的 Java,则自动跳过兼容性警告弹窗,强制使用手动选择的 Java。" />
|
ToolTip="如果在设置中手动选择了与当前版本不兼容的 Java,则自动跳过兼容性警告弹窗,强制使用手动选择的 Java。" />
|
||||||
<local:MyCheckBox Text="关闭文件校验" x:Name="CheckAdvanceAssetsV2" Tag="VersionAdvanceAssetsV2"
|
<local:MyCheckBox Text="关闭文件校验" x:Name="CheckAdvanceAssetsV2" Tag="VersionAdvanceAssetsV2"
|
||||||
ToolTip="完全不更改 assets;不校验 libraries、第三方登录库与版本主 jar 文件是否被修改。
如果你没有修改相关文件,请勿勾选此项。" />
|
ToolTip="完全不更改 assets;不校验 libraries、第三方登录库与版本主 jar 文件是否被修改。
如果你没有修改相关文件,请勿勾选此项。" />
|
||||||
|
<local:MyCheckBox Text="使用 JLW" x:Name="CheckAdvanceUseLaunchWrapperV2" Tag="VersionAdvanceUseLaunchWrapperV2" Margin="50,0,0,0"
|
||||||
|
ToolTip="在启动时额外加载 JLW 来处理中文目录。
如果服务器没有使用反作弊,请勿取消勾选此项。" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</local:MyCard>
|
</local:MyCard>
|
||||||
|
|||||||
@@ -74,6 +74,7 @@
|
|||||||
Setup.Set("VersionAdvanceAssetsV2", True, Version:=PageVersionLeft.Version)
|
Setup.Set("VersionAdvanceAssetsV2", True, Version:=PageVersionLeft.Version)
|
||||||
End If
|
End If
|
||||||
CheckAdvanceAssetsV2.Checked = Setup.Get("VersionAdvanceAssetsV2", Version:=PageVersionLeft.Version)
|
CheckAdvanceAssetsV2.Checked = Setup.Get("VersionAdvanceAssetsV2", Version:=PageVersionLeft.Version)
|
||||||
|
CheckAdvanceUseLaunchWrapperV2.Checked = Setup.Get("VersionAdvanceUseLaunchWrapperV2", Version:=PageVersionLeft.Version)
|
||||||
CheckAdvanceJava.Checked = Setup.Get("VersionAdvanceJava", Version:=PageVersionLeft.Version)
|
CheckAdvanceJava.Checked = Setup.Get("VersionAdvanceJava", Version:=PageVersionLeft.Version)
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
@@ -104,7 +105,7 @@
|
|||||||
Setup.Reset("VersionAdvanceJava", Version:=PageVersionLeft.Version)
|
Setup.Reset("VersionAdvanceJava", Version:=PageVersionLeft.Version)
|
||||||
Setup.Reset("VersionAdvanceRun", Version:=PageVersionLeft.Version)
|
Setup.Reset("VersionAdvanceRun", Version:=PageVersionLeft.Version)
|
||||||
Setup.Reset("VersionAdvanceRunWait", Version:=PageVersionLeft.Version)
|
Setup.Reset("VersionAdvanceRunWait", Version:=PageVersionLeft.Version)
|
||||||
|
Setup.Reset("VersionAdvanceUseLaunchWrapperV2", Version:=PageVersionLeft.Version)
|
||||||
Setup.Reset("VersionArgumentJavaSelect", Version:=PageVersionLeft.Version)
|
Setup.Reset("VersionArgumentJavaSelect", Version:=PageVersionLeft.Version)
|
||||||
JavaSearchLoader.Start(IsForceRestart:=True)
|
JavaSearchLoader.Start(IsForceRestart:=True)
|
||||||
|
|
||||||
@@ -135,7 +136,7 @@
|
|||||||
Private Shared Sub ComboChange(sender As MyComboBox, e As Object) Handles ComboArgumentIndie.SelectionChanged, ComboRamOptimize.SelectionChanged
|
Private Shared Sub ComboChange(sender As MyComboBox, e As Object) Handles ComboArgumentIndie.SelectionChanged, ComboRamOptimize.SelectionChanged
|
||||||
If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.SelectedIndex, Version:=PageVersionLeft.Version)
|
If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.SelectedIndex, Version:=PageVersionLeft.Version)
|
||||||
End Sub
|
End Sub
|
||||||
Private Shared Sub CheckBoxChange(sender As MyCheckBox, e As Object) Handles CheckAdvanceRunWait.Change, CheckAdvanceAssetsV2.Change, CheckAdvanceJava.Change
|
Private Shared Sub CheckBoxChange(sender As MyCheckBox, e As Object) Handles CheckAdvanceRunWait.Change, CheckAdvanceAssetsV2.Change, CheckAdvanceJava.Change, CheckAdvanceUseLaunchWrapperV2.Change
|
||||||
If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.Checked, Version:=PageVersionLeft.Version)
|
If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.Checked, Version:=PageVersionLeft.Version)
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -170,7 +171,7 @@
|
|||||||
End If
|
End If
|
||||||
'设置文本
|
'设置文本
|
||||||
LabRamGame.Text = If(RamGame = Math.Floor(RamGame), RamGame & ".0", RamGame) & " GB" &
|
LabRamGame.Text = If(RamGame = Math.Floor(RamGame), RamGame & ".0", RamGame) & " GB" &
|
||||||
If(RamGame <> RamGameActual, " (可用 " & If(RamGameActual = Math.Floor(RamGameActual), RamGameActual & ".0", RamGameActual) & " GB)", "")
|
If(Math.Abs(RamGame - RamGameActual) > 0.05, " (可用 " & If(RamGameActual = Math.Floor(RamGameActual), RamGameActual & ".0", RamGameActual) & " GB)", "")
|
||||||
LabRamUsed.Text = If(RamUsed = Math.Floor(RamUsed), RamUsed & ".0", RamUsed) & " GB"
|
LabRamUsed.Text = If(RamUsed = Math.Floor(RamUsed), RamUsed & ".0", RamUsed) & " GB"
|
||||||
LabRamTotal.Text = " / " & If(RamTotal = Math.Floor(RamTotal), RamTotal & ".0", RamTotal) & " GB"
|
LabRamTotal.Text = " / " & If(RamTotal = Math.Floor(RamTotal), RamTotal & ".0", RamTotal) & " GB"
|
||||||
LabRamWarn.Visibility = If(RamGame = 1 AndAlso Not JavaIs64Bit(PageVersionLeft.Version) AndAlso Not Is32BitSystem AndAlso JavaList.Any, Visibility.Visible, Visibility.Collapsed)
|
LabRamWarn.Visibility = If(RamGame = 1 AndAlso Not JavaIs64Bit(PageVersionLeft.Version) AndAlso Not Is32BitSystem AndAlso JavaList.Any, Visibility.Visible, Visibility.Collapsed)
|
||||||
|
|||||||
Reference in New Issue
Block a user