From a32bf0b79ed5822b6fe10a595ceaa77b99e47958 Mon Sep 17 00:00:00 2001 From: youzi-2333 Date: Tue, 18 Jun 2024 18:13:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:sparkles:=20=E5=AE=8C=E6=88=90=20#3997=20?= =?UTF-8?q?=E9=A1=BA=E4=BE=BF=E6=8A=8A=E6=95=99=E5=AD=A6=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B9=9F=E6=94=B9=E4=BA=86=E2=80=A6=E2=80=A6=20Discussion:=20#?= =?UTF-8?q?4002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/ModEvent.vb | 1 + Plain Craft Launcher 2/Modules/ModMain.vb | 1 + Plain Craft Launcher 2/Resources/Custom.xaml | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/Plain Craft Launcher 2/Modules/ModEvent.vb b/Plain Craft Launcher 2/Modules/ModEvent.vb index aa09e79..78baafc 100644 --- a/Plain Craft Launcher 2/Modules/ModEvent.vb +++ b/Plain Craft Launcher 2/Modules/ModEvent.vb @@ -43,6 +43,7 @@ End Sub) Case "启动游戏" + If Data(0) = "$mcv" 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 e2b797c..d495e3a 100644 --- a/Plain Craft Launcher 2/Modules/ModMain.vb +++ b/Plain Craft Launcher 2/Modules/ModMain.vb @@ -665,6 +665,7 @@ 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 f35be1d..3b59e97 100644 --- a/Plain Craft Launcher 2/Resources/Custom.xaml +++ b/Plain Craft Launcher 2/Resources/Custom.xaml @@ -80,6 +80,10 @@ Text="在 EventData 后面添加一条竖线（|），竖线后填写服务器 IP，即可在启动该版本的同时自动进入服务器。" /> + + From 82dacd7eeb2676062e46d1e7663dbfaf0acf97f1 Mon Sep 17 00:00:00 2001 From: youzi-2333 Date: Wed, 19 Jun 2024 13:07:32 +0800 Subject: [PATCH 2/3] =?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 @@ + Text="使用 {mcver} 可以表示当前被选中的游戏版本，但请注意，这只在 EventData 属性中有效。" /> + Text="启动当前选中版本并进入 Hypixel" EventType="启动游戏" EventData="{mcver}|mc.hypixel.net" ToolTip="服务器 IP：mc.hypixel.net" /> From c62e0e2bd866c32fa74ce6d647903ad56b91a15d Mon Sep 17 00:00:00 2001 From: youzi-2333 Date: Thu, 20 Jun 2024 14:42:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:bento:=20=E4=BF=AE=E6=94=B9=E6=95=99?= =?UTF-8?q?=E5=AD=A6=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Resources/Custom.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Resources/Custom.xaml b/Plain Craft Launcher 2/Resources/Custom.xaml index 3f103b1..4049be1 100644 --- a/Plain Craft Launcher 2/Resources/Custom.xaml +++ b/Plain Craft Launcher 2/Resources/Custom.xaml @@ -81,9 +81,9 @@ + Text="在 EventData 中填写 \current，表示启动当前被选中的游戏版本，同样可以在后面填写服务器 IP。" /> + Text="启动当前选中版本并进入 Hypixel" EventType="启动游戏" EventData="\current|mc.hypixel.net" ToolTip="服务器 IP：mc.hypixel.net" />