From c2a476feffd4b28111c71c4ec7c995c6c454b592 Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Mon, 2 Jun 2025 11:55:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(ModWatcher):=20Quilt=20=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E5=99=A8=E9=94=99=E8=AF=AF=E7=AA=97=E5=8F=A3=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E5=90=8E=E6=8F=90=E7=A4=BA=E5=90=AF=E5=8A=A8=E6=88=90?= =?UTF-8?q?=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb index fb8f52e..fcb444d 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb @@ -271,7 +271,7 @@ If MinecraftWindow Is Nothing Then Return Dim MinecraftWindowName = MinecraftWindow.Value.Value, MinecraftWindowHandle = MinecraftWindow.Value.Key '已找到窗口 - If Not MinecraftWindowName.StartsWithF("FML") Then + If Not MinecraftWindowName.StartsWithF("FML") AndAlso Not MinecraftWindowName.StartsWithF("Quilt Loader") Then '已找到 Minecraft 窗口 WindowHandle = MinecraftWindowHandle WatcherLog($"Minecraft 窗口已加载：{MinecraftWindowName}（{MinecraftWindowHandle.ToInt64}）") From 0c1b9e389acd13612bd5a651109d608ac7016633 Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Thu, 5 Jun 2025 19:40:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(ModWatcher):=20=E5=BF=98=E5=86=99?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=20WatcherLog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb index fcb444d..5bb81b4 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb @@ -292,10 +292,13 @@ End Sub, "MinecraftWindowMaximize") End If ElseIf Not IsWindowAppeared Then - '已找到 FML 窗口 - WatcherLog("FML 窗口已加载：" & MinecraftWindowName & "（" & MinecraftWindowHandle.ToInt64 & "）") + If (MinecraftWindowName.StartsWithF("FML")) Then '已找到 FML 窗口 + WatcherLog("FML 窗口已加载：" & MinecraftWindowName & "（" & MinecraftWindowHandle.ToInt64 & "）") + ElseIf (MinecraftWindowName.StartsWithF("Quilt Loader")) Then '已找到 Quilt Loader 窗口 + WatcherLog("Quilt Loader 窗口已加载：" & MinecraftWindowName & "（" & MinecraftWindowHandle.ToInt64 & "）") + End If End If - IsWindowAppeared = True + IsWindowAppeared = True Catch ex As Exception Log(ex, "检查 Minecraft 窗口失败", LogLevel.Feedback) End Try From 2991e43b456d3e42d3c7d80d2ea9332697ed259e Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Thu, 5 Jun 2025 19:52:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E5=B0=8F=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb index 5bb81b4..ff8438d 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb @@ -294,11 +294,11 @@ ElseIf Not IsWindowAppeared Then If (MinecraftWindowName.StartsWithF("FML")) Then '已找到 FML 窗口 WatcherLog("FML 窗口已加载：" & MinecraftWindowName & "（" & MinecraftWindowHandle.ToInt64 & "）") - ElseIf (MinecraftWindowName.StartsWithF("Quilt Loader")) Then '已找到 Quilt Loader 窗口 + Else '已找到 Quilt Loader 窗口 WatcherLog("Quilt Loader 窗口已加载：" & MinecraftWindowName & "（" & MinecraftWindowHandle.ToInt64 & "）") End If End If - IsWindowAppeared = True + IsWindowAppeared = True Catch ex As Exception Log(ex, "检查 Minecraft 窗口失败", LogLevel.Feedback) End Try