Skip to content

feat: 将 UI 中的“版本”替换为“实例” - #9431

Open
Howard302 wants to merge 2 commits into
Meloong-Git:mainfrom
Howard302:feature/8996-rename-version-to-instance
Open

Howard302 wants to merge 2 commits into
Meloong-Git:mainfrom
Howard302:feature/8996-rename-version-to-instance

Conversation

@Howard302

Copy link
Copy Markdown
Contributor

Closes #8996
根据 Issue #8996,将指代游戏实例的“版本”一词统一替换为“实例”,
例如“版本设置”→“实例设置”、“版本文件夹”→“实例文件夹”、
“版本选择”→“实例选择”等。

保留了指代实际版本号的“版本”(如 Java 版本、Minecraft 版本号、版本 JSON 等)。

@camileko camileko added 等待提交者 需要提交者补充信息或进行操作 · 优化 labels Oct 2, 2026
@Howard302

Copy link
Copy Markdown
Contributor Author

emm…让我提交什么

Comment thread Plain Craft Launcher 2/FormMain.xaml.vb Outdated
Comment thread Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml Outdated
@camileko

camileko commented Oct 2, 2026 •

Copy link
Copy Markdown
Collaborator

emm…让我提交什么

额...忘记点 Submit review 了

@Howard302
Howard302 force-pushed the feature/8996-rename-version-to-instance branch from bd2b78d to 9d6a1c2 Compare October 2, 2026 14:07
根据 Issue Meloong-Git#8996,将指代游戏实例的“版本”一词统一替换为“实例”,
例如“版本设置”→“实例设置”、“版本文件夹”→“实例文件夹”、
“版本选择”→“实例选择”等。

保留了指代实际版本号的“版本”(如 Java 版本、Minecraft 版本号、版本 JSON 等)。
@Howard302
Howard302 force-pushed the feature/8996-rename-version-to-instance branch from 9d6a1c2 to 0134130 Compare October 2, 2026 14:07

@camileko camileko left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ModMinecraft.vb 也需要改 有些部分就应该使用 Version
建议去看一下版本和实例的区别再来修改PR

Comment thread Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb Outdated
Comment thread Plain Craft Launcher 2/Modules/Resource/ResourceVersion.vb Outdated
Comment thread Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb Outdated
Comment thread Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml Outdated
Comment thread Plain Craft Launcher 2/Modules/Resource/ResourceProject.vb Outdated
Comment thread Plain Craft Launcher 2/Pages/PageInstance/MyLocalModItem.xaml.vb Outdated
@LTCatt LTCatt added 处理中 开发者正在调查或处理该项 🟩 低 优先度:低 and removed 等待提交者 需要提交者补充信息或进行操作 labels Oct 3, 2026
@Howard302
Howard302 force-pushed the feature/8996-rename-version-to-instance branch from f87e294 to f712b7a Compare October 4, 2026 10:00
@Howard302
Howard302 force-pushed the feature/8996-rename-version-to-instance branch 2 times, most recently from c00772d to 2a6f1ad Compare October 4, 2026 10:30
@camileko
camileko self-requested a review October 4, 2026 10:35

@camileko camileko left a comment •

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FormMain.xaml.vb 是 changelog,感觉没有必要改(
版本隔离 按社区建议改回去吧

Select(Function(JavaObject) New Java(JavaObject("Path").ToString)).ToList()
OldJavaList = JavaUtils.SortAsync(OldJavaList).Run()
Logger.Info($"已从老版本设置中发现 {OldJavaList.Count} 个 Java")
Logger.Info($"已从老实例设置中发现 {OldJavaList.Count} 个 Java")

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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}")

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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" '显示用实例名

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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","未知实例"。

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 "范围下限的版本号比上限更高,导致该范围无法匹配到任何实例"

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
If Range.IsEmpty Then Return "范围下限的版本号比上限更高,导致该范围无法匹配到任何实例"
If Range.IsEmpty Then Return "范围下限的版本号比上限更高,导致该范围无法匹配到任何版本"

Public Version As Version
''' <summary>
''' 可读的非格式化版本名。
''' 可读的非格式化实例名。

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
''' 可读的非格式化实例名。
''' 可读的非格式化版本名。

Public Category As String
''' <summary>
''' 用于下载的文件版本名。可能在 Version 的基础上添加了分支。
''' 用于下载的文件实例名。可能在 Version 的基础上添加了分支。

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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="未找到任何版本的游戏,请先下载任意版本的游戏。&#xa;若有已存在的游戏,请在左边的列表中选择“添加文件夹”,选择 .minecraft 文件夹将其导入。" TextWrapping="Wrap" />
<TextBlock Name="LabEmptyContent" Margin="10,15,10,5" Text="未找到任何实例的游戏,请先下载任意游戏实例。&#xa;若有已存在的游戏,请在左边的列表中选择“添加文件夹”,选择 .minecraft 文件夹将其导入。" TextWrapping="Wrap" />

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<TextBlock Name="LabEmptyContent" Margin="10,15,10,5" Text="未找到任何实例的游戏,请先下载任意游戏实例。&#xa;若有已存在的游戏,请在左边的列表中选择“添加文件夹”,选择 .minecraft 文件夹将其导入。" TextWrapping="Wrap" />
<TextBlock Name="LabEmptyContent" Margin="10,15,10,5" Text="未找到任何实例的游戏,请先下载任意版本的游戏。&#xa;若有已存在的游戏,请在左边的列表中选择“添加文件夹”,选择 .minecraft 文件夹将其导入。" TextWrapping="Wrap" />

LabEmptyTitle.Text = "无可用版本"
LabEmptyContent.Text = "未找到任何版本的游戏,请先下载任意版本的游戏。" & vbCrLf & "若有已存在的游戏,请在左边的列表中选择添加文件夹,选择 .minecraft 文件夹将其导入。"
LabEmptyTitle.Text = "无可用实例"
LabEmptyContent.Text = "未找到任何实例的游戏,请先下载任意游戏实例。" & vbCrLf & "若有已存在的游戏,请在左边的列表中选择添加文件夹,选择 .minecraft 文件夹将其导入。"

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
LabEmptyContent.Text = "未找到任何实例的游戏,请先下载任意游戏实例。" & vbCrLf & "若有已存在的游戏,请在左边的列表中选择添加文件夹,选择 .minecraft 文件夹将其导入。"
LabEmptyContent.Text = "未找到任何实例的游戏,请先下载任意版本的游戏。" & vbCrLf & "若有已存在的游戏,请在左边的列表中选择添加文件夹,选择 .minecraft 文件夹将其导入。"

@camileko

camileko commented Oct 4, 2026

Copy link
Copy Markdown
Collaborator

其他部分看起来没有什么问题(

@MoYuan-CN

Copy link
Copy Markdown
Collaborator

版本隔离 等龙猫看看要不要改成 实例隔离

版本隔离 做专有名词不需要动

@Howard302

Copy link
Copy Markdown
Contributor Author

版本隔离 做专有名词不需要动

彳亍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

· 优化 处理中 开发者正在调查或处理该项 🟩 低 优先度:低

Projects

None yet

Development

Successfully merging this pull request may close these issues.

使用“实例”一词取代“版本设置”等里的“版本”

4 participants