Repository navigation
Conversation
Contributor
Author
|
emm…让我提交什么 |
camileko
suggested changes
Oct 2, 2026
Collaborator
额...忘记点 Submit review 了 |
Howard302
force-pushed
the
feature/8996-rename-version-to-instance
branch
from
October 2, 2026 14:07
bd2b78d to
9d6a1c2
Compare
根据 Issue Meloong-Git#8996,将指代游戏实例的“版本”一词统一替换为“实例”, 例如“版本设置”→“实例设置”、“版本文件夹”→“实例文件夹”、 “版本选择”→“实例选择”等。 保留了指代实际版本号的“版本”(如 Java 版本、Minecraft 版本号、版本 JSON 等)。
Howard302
force-pushed
the
feature/8996-rename-version-to-instance
branch
from
October 2, 2026 14:07
9d6a1c2 to
0134130
Compare
camileko
suggested changes
Oct 2, 2026
Howard302
force-pushed
the
feature/8996-rename-version-to-instance
branch
from
October 4, 2026 10:00
f87e294 to
f712b7a
Compare
Howard302
force-pushed
the
feature/8996-rename-version-to-instance
branch
2 times, most recently
from
October 4, 2026 10:30
c00772d to
2a6f1ad
Compare
camileko
self-requested a review
October 4, 2026 10:35
camileko
suggested changes
Oct 4, 2026
| Select(Function(JavaObject) New Java(JavaObject("Path").ToString)).ToList() | ||
| OldJavaList = JavaUtils.SortAsync(OldJavaList).Run() | ||
| Logger.Info($"已从老版本设置中发现 {OldJavaList.Count} 个 Java") | ||
| Logger.Info($"已从老实例设置中发现 {OldJavaList.Count} 个 Java") |
Collaborator
There was a problem hiding this comment.
Suggested change
| Logger.Info($"已从老实例设置中发现 {OldJavaList.Count} 个 Java") | |
| Logger.Info($"已从老版本设置中发现 {OldJavaList.Count} 个 Java") |
| OldJavaList.Remove(Match) | ||
| OldJavaList.Insert(0, Match) | ||
| Logger.Info($"已将老版本设置中强制选择的 Java 置顶:{Match}") | ||
| Logger.Info($"已将老实例设置中强制选择的 Java 置顶:{Match}") |
Collaborator
There was a problem hiding this comment.
Suggested change
| Logger.Info($"已将老实例设置中强制选择的 Java 置顶:{Match}") | |
| Logger.Info($"已将老版本设置中强制选择的 Java 置顶:{Match}") |
|
|
||
| '下列版本信息由更新器自动修改 | ||
| Public Const VersionBaseName As String = "2.13.1.1" '显示用版本名 | ||
| Public Const VersionBaseName As String = "2.13.1.1" '显示用实例名 |
Collaborator
There was a problem hiding this comment.
Suggested change
| Public Const VersionBaseName As String = "2.13.1.1" '显示用实例名 | |
| Public Const VersionBaseName As String = "2.13.1.1" '显示用版本名 |
| Public ModLoaders As ModLoaders = ModLoaders.None | ||
| ''' <summary> | ||
| ''' 支持的游戏版本列表。类型包括:"26.1.5","26.1","26.1 预览版","1.18.5","1.18","1.18 预览版","21w15a","未知版本"。 | ||
| ''' 支持的游戏版本列表。类型包括:"26.1.5","26.1","26.1 预览版","1.18.5","1.18","1.18 预览版","21w15a","未知实例"。 |
Collaborator
There was a problem hiding this comment.
Suggested change
| ''' 支持的游戏版本列表。类型包括:"26.1.5","26.1","26.1 预览版","1.18.5","1.18","1.18 预览版","21w15a","未知实例"。 | |
| ''' 支持的游戏版本列表。类型包括:"26.1.5","26.1","26.1 预览版","1.18.5","1.18","1.18 预览版","21w15a","未知版本"。 |
| If String.IsNullOrWhiteSpace(Str) Then Return "不能为空" | ||
| Dim Range = ValueRange(Of Version).FromString(Str, Function(s) StringUtils.ParseVersionWithDefaults(s)) | ||
| If Range.IsEmpty Then Return "范围下限的版本号比上限更高,导致该范围无法匹配到任何版本" | ||
| If Range.IsEmpty Then Return "范围下限的版本号比上限更高,导致该范围无法匹配到任何实例" |
Collaborator
There was a problem hiding this comment.
Suggested change
| If Range.IsEmpty Then Return "范围下限的版本号比上限更高,导致该范围无法匹配到任何实例" | |
| If Range.IsEmpty Then Return "范围下限的版本号比上限更高,导致该范围无法匹配到任何版本" |
| Public Version As Version | ||
| ''' <summary> | ||
| ''' 可读的非格式化版本名。 | ||
| ''' 可读的非格式化实例名。 |
Collaborator
There was a problem hiding this comment.
Suggested change
| ''' 可读的非格式化实例名。 | |
| ''' 可读的非格式化版本名。 |
| Public Category As String | ||
| ''' <summary> | ||
| ''' 用于下载的文件版本名。可能在 Version 的基础上添加了分支。 | ||
| ''' 用于下载的文件实例名。可能在 Version 的基础上添加了分支。 |
Collaborator
There was a problem hiding this comment.
Suggested change
| ''' 用于下载的文件实例名。可能在 Version 的基础上添加了分支。 | |
| ''' 用于下载的文件版本名。可能在 Version 的基础上添加了分支。 |
| FileUtils.Write(VersionFolder & "Launch Server.bat", Bat, | ||
| encoding:=If(Encoding.Default.Equals(Encoding.UTF8), Encoding.UTF8, Encoding.GetEncoding("GB18030"))) | ||
| '删除版本 JSON | ||
| '删除实例 JSON |
Collaborator
There was a problem hiding this comment.
Suggested change
| '删除实例 JSON | |
| '删除版本 JSON |
| <TextBlock Name="LabEmptyTitle" Margin="0,0,0,9" HorizontalAlignment="Center" Text="无可用实例" FontSize="19" UseLayoutRounding="True" SnapsToDevicePixels="True" Foreground="{DynamicResource ColorBrush3}" /> | ||
| <Rectangle HorizontalAlignment="Stretch" Height="2" Fill="{DynamicResource ColorBrush3}" /> | ||
| <TextBlock Name="LabEmptyContent" Margin="10,15,10,5" Text="未找到任何版本的游戏,请先下载任意版本的游戏。
若有已存在的游戏,请在左边的列表中选择“添加文件夹”,选择 .minecraft 文件夹将其导入。" TextWrapping="Wrap" /> | ||
| <TextBlock Name="LabEmptyContent" Margin="10,15,10,5" Text="未找到任何实例的游戏,请先下载任意游戏实例。
若有已存在的游戏,请在左边的列表中选择“添加文件夹”,选择 .minecraft 文件夹将其导入。" TextWrapping="Wrap" /> |
Collaborator
There was a problem hiding this comment.
Suggested change
| <TextBlock Name="LabEmptyContent" Margin="10,15,10,5" Text="未找到任何实例的游戏,请先下载任意游戏实例。
若有已存在的游戏,请在左边的列表中选择“添加文件夹”,选择 .minecraft 文件夹将其导入。" TextWrapping="Wrap" /> | |
| <TextBlock Name="LabEmptyContent" Margin="10,15,10,5" Text="未找到任何实例的游戏,请先下载任意版本的游戏。
若有已存在的游戏,请在左边的列表中选择“添加文件夹”,选择 .minecraft 文件夹将其导入。" TextWrapping="Wrap" /> |
| LabEmptyTitle.Text = "无可用版本" | ||
| LabEmptyContent.Text = "未找到任何版本的游戏,请先下载任意版本的游戏。" & vbCrLf & "若有已存在的游戏,请在左边的列表中选择添加文件夹,选择 .minecraft 文件夹将其导入。" | ||
| LabEmptyTitle.Text = "无可用实例" | ||
| LabEmptyContent.Text = "未找到任何实例的游戏,请先下载任意游戏实例。" & vbCrLf & "若有已存在的游戏,请在左边的列表中选择添加文件夹,选择 .minecraft 文件夹将其导入。" |
Collaborator
There was a problem hiding this comment.
Suggested change
| LabEmptyContent.Text = "未找到任何实例的游戏,请先下载任意游戏实例。" & vbCrLf & "若有已存在的游戏,请在左边的列表中选择添加文件夹,选择 .minecraft 文件夹将其导入。" | |
| LabEmptyContent.Text = "未找到任何实例的游戏,请先下载任意版本的游戏。" & vbCrLf & "若有已存在的游戏,请在左边的列表中选择添加文件夹,选择 .minecraft 文件夹将其导入。" |
Collaborator
|
其他部分看起来没有什么问题( |
Collaborator
|
Contributor
Author
彳亍 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #8996
根据 Issue #8996,将指代游戏实例的“版本”一词统一替换为“实例”,
例如“版本设置”→“实例设置”、“版本文件夹”→“实例文件夹”、
“版本选择”→“实例选择”等。
保留了指代实际版本号的“版本”(如 Java 版本、Minecraft 版本号、版本 JSON 等)。