From 82dacd7eeb2676062e46d1e7663dbfaf0acf97f1 Mon Sep 17 00:00:00 2001
From: youzi-2333 <youzi5201086@163.com>
Date: Wed, 19 Jun 2024 13:07:32 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=20`{mcv}`=20?=
 =?UTF-8?q?=E8=A2=AB=E6=9B=BF=E6=8D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plain Craft Launcher 2/Modules/ModEvent.vb   | 2 +-
 Plain Craft Launcher 2/Modules/ModMain.vb    | 1 -
 Plain Craft Launcher 2/Resources/Custom.xaml | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Plain Craft Launcher 2/Modules/ModEvent.vb b/Plain Craft Launcher 2/Modules/ModEvent.vb
index 78baafc..77740d5 100644
--- a/Plain Craft Launcher 2/Modules/ModEvent.vb	
+++ b/Plain Craft Launcher 2/Modules/ModEvent.vb	
@@ -43,7 +43,7 @@
                                 End Sub)
 
                 Case "启动游戏"
-                    If Data(0) = "$mcv" Then Data(0) = McVersionCurrent.Name
+                    If Data(0) = "\current" Then Data(0) = McVersionCurrent.Name
                     If McLaunchStart(New McLaunchOptions With
                                      {.ServerIp = If(Data.Length >= 2, Data(1), Nothing), .Version = New McVersion(Data(0))}) Then
                         Hint("正在启动 " & Data(0) & "……")
diff --git a/Plain Craft Launcher 2/Modules/ModMain.vb b/Plain Craft Launcher 2/Modules/ModMain.vb
index d495e3a..e2b797c 100644
--- a/Plain Craft Launcher 2/Modules/ModMain.vb	
+++ b/Plain Craft Launcher 2/Modules/ModMain.vb	
@@ -665,7 +665,6 @@ NextFile:
         Dim Result = Xaml.Replace("{path}", EscapeXML(Path))
         Result = RegexReplaceEach(Result, Function() EscapeXML(PageOtherTest.GetRandomHint()), "\{hint\}")
         Result = RegexReplaceEach(Result, Function() EscapeXML(PageOtherTest.GetRandomCave()), "\{cave\}")
-        Result = Result.Replace("{mcv}", "$mcv") '不知道为啥，实例化 {mcv} 有可能会炸掉，只能先把它换掉，再换成版本名
         Return Result
     End Function
 
diff --git a/Plain Craft Launcher 2/Resources/Custom.xaml b/Plain Craft Launcher 2/Resources/Custom.xaml
index 3b59e97..3f103b1 100644
--- a/Plain Craft Launcher 2/Resources/Custom.xaml	
+++ b/Plain Craft Launcher 2/Resources/Custom.xaml	
@@ -81,9 +81,9 @@
 		<local:MyButton Margin="0,4,0,0" Width="250" Height="35"
                     Text="启动 1.12.2 并进入 Hypixel" EventType="启动游戏" EventData="1.12.2|mc.hypixel.net" ToolTip="服务器 IP：mc.hypixel.net" />
 		<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
-                    Text="使用 “花括号 mcv” 可以表示当前被选中的游戏版本，但请注意，这只在 EventData 属性中有效。" />
+                    Text="使用 {mcver} 可以表示当前被选中的游戏版本，但请注意，这只在 EventData 属性中有效。" />
 		<local:MyButton Margin="0,4,0,10" Width="250" Height="35"
-                    Text="启动当前选中版本并进入 Hypixel" EventType="启动游戏" EventData="{mcv}|mc.hypixel.net" ToolTip="服务器 IP：mc.hypixel.net" />
+                    Text="启动当前选中版本并进入 Hypixel" EventType="启动游戏" EventData="{mcver}|mc.hypixel.net" ToolTip="服务器 IP：mc.hypixel.net" />
 	</StackPanel>
 </local:MyCard>