From e2c24a7d44de1009eaaece01328f9f8dbc542dbf Mon Sep 17 00:00:00 2001
From: ENC_Euphony <2330458484@qq.com>
Date: Fri, 15 Aug 2025 15:18:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(mod-launch):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=99=BB=E5=BD=95=E6=97=B6=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=20400=20=E6=8A=A5=E9=94=99=EF=BC=8C=E6=9C=AA=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb
index f9cbe79..e638e8f 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb	
@@ -853,7 +853,7 @@ LoginFinish:
                                             " - 只注册了账号，但没有加入对应服务器。")
                 End Select
             ElseIf AllMessage.Contains("超时") OrElse AllMessage.Contains("imeout") OrElse AllMessage.Contains("网络请求失败") Then
-                Throw New Exception("$登录失败：你的网络环境不佳，导致难以连接到海外服务器。" & vbCrLf & "请稍后重试，或使用加速器或 VPN 以改善网络环境。")
+                Throw New Exception("$登录失败：你的网络环境不佳，导致难以连接到海外服务器。" & vbCrLf & "请稍后重试，或使用加速器或 VPN 以改善网络环境")
             ElseIf ex.Message.StartsWithF("$") Then
                 Throw
             Else
@@ -907,9 +907,12 @@ Retry:
                 Headers:={{"Accept-Language", "en-US,en;q=0.5"}, {"X-Requested-With", "XMLHttpRequest"}},
                 ThreadCount:=2)
         Catch ex As ResponsedWebException
-            If ex.Response.ContainsF("must sign in again", True) OrElse ex.Response.ContainsF("password expired", True) OrElse
-               (ex.Response.Contains("refresh_token") AndAlso ex.Response.Contains("is not valid")) Then '#269
+            Dim Response = ex.Response
+            If Response.ContainsF("must sign in again", True) OrElse Response.ContainsF("password expired", True) OrElse
+               (Response.Contains("refresh_token") AndAlso Response.Contains("is not valid")) Then '#269
                 Return {"Relogin", ""}
+            ElseIf Response.Contains("Account security interrupt") Then
+                MyMsgBox("该账号由于安全问题无法登陆，请前往微软账户页获取更多信息。", "登录失败", "我知道了", IsWarn:=True)
             Else
                 Throw
             End If
@@ -2131,7 +2134,7 @@ IgnoreCustomSkin:
 
         '输出 bat
         Try
-            Dim CmdString As String =
+            Dim CmdString =
                 $"{If(McLaunchJavaSelected.VersionCode > 8, "chcp 65001>nul" & vbCrLf, "")}" &
                 "@echo off" & vbCrLf &
                 $"title 启动 - {McVersionCurrent.Name}" & vbCrLf &

From fe39495f2e27d817f41fa490778d805ea3844ca3 Mon Sep 17 00:00:00 2001
From: ENC_Euphony <2330458484@qq.com>
Date: Fri, 15 Aug 2025 16:25:03 +0800
Subject: [PATCH 2/3] Update ModLaunch.vb

---
 Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb
index e638e8f..99cd5f8 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb	
@@ -853,7 +853,7 @@ LoginFinish:
                                             " - 只注册了账号，但没有加入对应服务器。")
                 End Select
             ElseIf AllMessage.Contains("超时") OrElse AllMessage.Contains("imeout") OrElse AllMessage.Contains("网络请求失败") Then
-                Throw New Exception("$登录失败：你的网络环境不佳，导致难以连接到海外服务器。" & vbCrLf & "请稍后重试，或使用加速器或 VPN 以改善网络环境")
+                Throw New Exception("$登录失败：你的网络环境不佳，导致难以连接到海外服务器。" & vbCrLf & "请稍后重试，或使用加速器或 VPN 以改善网络环境。")
             ElseIf ex.Message.StartsWithF("$") Then
                 Throw
             Else
@@ -2134,7 +2134,7 @@ IgnoreCustomSkin:
 
         '输出 bat
         Try
-            Dim CmdString =
+            Dim CmdString As String =
                 $"{If(McLaunchJavaSelected.VersionCode > 8, "chcp 65001>nul" & vbCrLf, "")}" &
                 "@echo off" & vbCrLf &
                 $"title 启动 - {McVersionCurrent.Name}" & vbCrLf &

From 54c45ff54bd8297ad66fd414d940421bae8ffb72 Mon Sep 17 00:00:00 2001
From: ENC_Euphony <2330458484@qq.com>
Date: Fri, 15 Aug 2025 20:37:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=B0=81=E5=8F=B7?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb
index 99cd5f8..7f5622b 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb	
@@ -913,6 +913,10 @@ Retry:
                 Return {"Relogin", ""}
             ElseIf Response.Contains("Account security interrupt") Then
                 MyMsgBox("该账号由于安全问题无法登陆，请前往微软账户页获取更多信息。", "登录失败", "我知道了", IsWarn:=True)
+                Throw New Exception("$$")
+            ElseIf Response.Contains("service abuse") Then
+                MyMsgBox("非常抱歉，该账号已被微软封禁，无法登录。", "登录失败", "我知道了", IsWarn:=True)
+                Throw New Exception("$$")
             Else
                 Throw
             End If