fix: fix #26

dreamguxiang · dreamguxiang · commit 20b3e9845374 · 2025-12-13T19:29:17.000+08:00
diff --git a/build/config.yml b/build/config.yml
@@ -11,7 +11,7 @@ info:
   description: "A Minecraft Launcher" # The application description
   copyright: "(c) 2025, LeviMC" # Copyright text
   comments: "Some Product Comments" # Comments
-  version: "0.0.26" # The application version
+  version: "0.0.27" # The application version
   beta: "true" # Whether the application is in beta or not
 
 # Dev mode configuration
diff --git a/build/darwin/Info.dev.plist b/build/darwin/Info.dev.plist
@@ -15,9 +15,9 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.0.26</string>
+		<string>0.0.27</string>
 		<key>CFBundleVersion</key>
-		<string>0.0.26</string>
+		<string>0.0.27</string>
 		<key>LSMinimumSystemVersion</key>
 		<string>10.15.0</string>
 		<key>NSAppTransportSecurity</key>
diff --git a/build/darwin/Info.plist b/build/darwin/Info.plist
@@ -15,9 +15,9 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.0.26</string>
+		<string>0.0.27</string>
 		<key>CFBundleVersion</key>
-		<string>0.0.26</string>
+		<string>0.0.27</string>
 		<key>LSMinimumSystemVersion</key>
 		<string>10.15.0</string>
 		<key>NSHighResolutionCapable</key>
diff --git a/build/ios/Info.dev.plist b/build/ios/Info.dev.plist
@@ -15,9 +15,9 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.0.26-dev</string>
+		<string>0.0.27-dev</string>
 		<key>CFBundleVersion</key>
-		<string>0.0.26</string>
+		<string>0.0.27</string>
 		<key>LSRequiresIPhoneOS</key>
 		<true/>
 		<key>MinimumOSVersion</key>
diff --git a/build/ios/Info.plist b/build/ios/Info.plist
@@ -15,9 +15,9 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.0.26</string>
+		<string>0.0.27</string>
 		<key>CFBundleVersion</key>
-		<string>0.0.26</string>
+		<string>0.0.27</string>
 		<key>LSRequiresIPhoneOS</key>
 		<true/>
 		<key>MinimumOSVersion</key>
diff --git a/build/ios/build.sh b/build/ios/build.sh
@@ -4,8 +4,8 @@ set -e
 # Build configuration
 APP_NAME="LeviLauncher"
 BUNDLE_ID="org.levimc.launcher"
-VERSION="0.0.26"
-BUILD_NUMBER="0.0.26"
+VERSION="0.0.27"
+BUILD_NUMBER="0.0.27"
 BUILD_DIR="build/ios"
 TARGET="simulator"
 
diff --git a/build/linux/nfpm/nfpm.yaml b/build/linux/nfpm/nfpm.yaml
@@ -6,7 +6,7 @@
 name: "LeviLauncher"
 arch: ${GOARCH}
 platform: "linux"
-version: "0.0.26"
+version: "0.0.27"
 section: "default"
 priority: "extra"
 maintainer: ${GIT_COMMITTER_NAME} <${GIT_COMMITTER_EMAIL}>
diff --git a/build/windows/info.json b/build/windows/info.json
@@ -1,10 +1,10 @@
 {
 	"fixed": {
-		"file_version": "0.0.26"
+		"file_version": "0.0.27"
 	},
 	"info": {
 		"0000": {
-			"ProductVersion": "0.0.26",
+			"ProductVersion": "0.0.27",
 			"CompanyName": "LeviMC",
 			"FileDescription": "A Minecraft Launcher",
 			"LegalCopyright": "(c) 2025, LeviMC",
diff --git a/build/windows/nsis/wails_tools.nsh b/build/windows/nsis/wails_tools.nsh
@@ -14,7 +14,7 @@
     !define INFO_PRODUCTNAME "LeviLauncher"
 !endif
 !ifndef INFO_PRODUCTVERSION
-    !define INFO_PRODUCTVERSION "0.0.26"
+    !define INFO_PRODUCTVERSION "0.0.27"
 !endif
 !ifndef INFO_COPYRIGHT
     !define INFO_COPYRIGHT "(c) 2025, LeviMC"
diff --git a/build/windows/wails.exe.manifest b/build/windows/wails.exe.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity type="win32" name="org.levimc.launcher" version="0.0.26" processorArchitecture="*"/>
+    <assemblyIdentity type="win32" name="org.levimc.launcher" version="0.0.27" processorArchitecture="*"/>
     <dependency>
         <dependentAssembly>
             <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
diff --git a/frontend/src/assets/locales/en_US.json b/frontend/src/assets/locales/en_US.json
@@ -740,7 +740,7 @@
     "delete_summary_title_failed": "Deletion Failed",
     "summary_deleted": "Deleted",
     "confirm_delete_title": "Confirm Deletion",
-    "confirm_delete_body": "Are you sure you want to delete this mod? This action cannot be undone.",
+    "confirm_delete_body": "Are you sure you want to delete this {{type}}? This action cannot be undone.",
     "dll_modal_title": "Import DLL Plugin",
     "dll_name": "Plugin Name",
     "dll_type": "Type",
diff --git a/frontend/src/assets/locales/ru_RU.json b/frontend/src/assets/locales/ru_RU.json
@@ -740,7 +740,7 @@
       "delete_summary_title_failed": "Ошибка удаления",
       "summary_deleted": "Удалено",
       "confirm_delete_title": "Подтвердите удаление",
-      "confirm_delete_body": "Вы действительно хотите удалить этот мод? Действие нельзя отменить.",
+      "confirm_delete_body": "Вы действительно хотите удалить этот {{type}}? Действие нельзя отменить.",
       "dll_modal_title": "Импорт DLL-плагина",
       "dll_name": "Имя плагина",
       "dll_type": "Тип",
diff --git a/frontend/src/assets/locales/zh_CN.json b/frontend/src/assets/locales/zh_CN.json
@@ -740,7 +740,7 @@
     "delete_summary_title_failed": "删除失败",
     "summary_deleted": "已删除",
     "confirm_delete_title": "确认删除",
-    "confirm_delete_body": "确定要删除此模组吗？此操作不可撤销。",
+    "confirm_delete_body": "确定要删除此{{type}}吗？此操作不可撤销。",
     "dll_modal_title": "导入 DLL 插件",
     "dll_name": "插件名称",
     "dll_type": "类型",
diff --git a/frontend/src/pages/BehaviorPacksPage.tsx b/frontend/src/pages/BehaviorPacksPage.tsx
@@ -608,6 +608,7 @@ export default function BehaviorPacksPage() {
                 <ModalBody>
                   <div className="text-sm text-default-700 break-words whitespace-pre-wrap">
                     {t("mods.confirm_delete_body", {
+                      type: t("contentpage.behavior_packs"),
                       defaultValue: "确定要删除此包吗？此操作不可撤销。",
                     })}
                   </div>
@@ -756,6 +757,7 @@ export default function BehaviorPacksPage() {
                 <ModalBody>
                   <div className="text-sm text-default-700 break-words whitespace-pre-wrap">
                     {t("mods.confirm_delete_body", {
+                      type: t("contentpage.behavior_packs"),
                       defaultValue: "确定要删除此包吗？此操作不可撤销。",
                     })}
                   </div>
diff --git a/frontend/src/pages/ModsPage.tsx b/frontend/src/pages/ModsPage.tsx
@@ -1520,6 +1520,7 @@ export const ModsPage: React.FC = () => {
               <ModalBody>
                 <div className="text-sm text-default-700 break-words whitespace-pre-wrap">
                   {t("mods.confirm_delete_body", {
+                    type: t("moddedcard.title"),
                     defaultValue: "确定要删除此模组吗？此操作不可撤销。",
                   })}
                 </div>
diff --git a/frontend/src/pages/ResourcePacksPage.tsx b/frontend/src/pages/ResourcePacksPage.tsx
@@ -608,6 +608,7 @@ export default function ResourcePacksPage() {
                 <ModalBody>
                   <div className="text-sm text-default-700 break-words whitespace-pre-wrap">
                     {t("mods.confirm_delete_body", {
+                      type: t("contentpage.resource_packs"),
                       defaultValue: "确定要删除此包吗？此操作不可撤销。",
                     })}
                   </div>
@@ -756,6 +757,7 @@ export default function ResourcePacksPage() {
                 <ModalBody>
                   <div className="text-sm text-default-700 break-words whitespace-pre-wrap">
                     {t("mods.confirm_delete_body", {
+                      type: t("contentpage.resource_packs"),
                       defaultValue: "确定要删除此包吗？此操作不可撤销。",
                     })}
                   </div>
diff --git a/frontend/src/pages/SkinPacksPage.tsx b/frontend/src/pages/SkinPacksPage.tsx
@@ -669,6 +669,7 @@ export default function SkinPacksPage() {
                 <ModalBody>
                   <div className="text-sm text-default-700 break-words whitespace-pre-wrap">
                     {t("mods.confirm_delete_body", {
+                      type: t("contentpage.skin_packs"),
                       defaultValue: "确定要删除此包吗？此操作不可撤销。",
                     })}
                   </div>
@@ -751,6 +752,7 @@ export default function SkinPacksPage() {
                 <ModalBody>
                   <div className="text-sm text-default-700 break-words whitespace-pre-wrap">
                     {t("mods.confirm_delete_body", {
+                      type: t("contentpage.skin_packs"),
                       defaultValue: "确定要删除此包吗？此操作不可撤销。",
                     })}
                   </div>
diff --git a/frontend/src/pages/WorldsListPage.tsx b/frontend/src/pages/WorldsListPage.tsx
@@ -720,6 +720,7 @@ export default function WorldsListPage() {
                 <ModalBody>
                   <div className="text-sm text-default-700 break-words whitespace-pre-wrap">
                     {t("mods.confirm_delete_body", {
+                      type: t("contentpage.worlds"),
                       defaultValue: "确定要删除此包吗？此操作不可撤销。",
                     })}
                   </div>
@@ -805,6 +806,7 @@ export default function WorldsListPage() {
                 <ModalBody>
                   <div className="text-sm text-default-700 break-words whitespace-pre-wrap">
                     {t("mods.confirm_delete_body", {
+                      type: t("contentpage.worlds"),
                       defaultValue: "确定要删除此包吗？此操作不可撤销。",
                     })}
                   </div>
diff --git a/minecraft.go b/minecraft.go
@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"syscall"
 
 	"github.com/liteldev/LeviLauncher/internal/discord"
 	"github.com/wailsapp/wails/v3/pkg/application"
@@ -670,7 +671,9 @@ func (a *Minecraft) launchVersionInternal(name string, checkRunning bool) string
 	var args []string
 	toRun := exe
 	var gameVer string
+	var enableConsole bool
 	if m, err := versions.ReadMeta(dir); err == nil {
+		enableConsole = m.EnableConsole
 		p := peeditor.PrepareExecutableForLaunch(a.ctx, dir, m.EnableConsole)
 		if strings.TrimSpace(p) != "" {
 			toRun = p
@@ -707,9 +710,12 @@ func (a *Minecraft) launchVersionInternal(name string, checkRunning bool) string
 	}
 	cmd := exec.Command(toRun, args...)
 	cmd.Dir = filepath.Dir(toRun)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	cmd.Stdin = os.Stdin
+	if enableConsole {
+		cmd.SysProcAttr = &syscall.SysProcAttr{
+			HideWindow:       false,
+			NoInheritHandles: true,
+		}
+	}
 	if err := cmd.Start(); err != nil {
 		return "ERR_LAUNCH_GAME"
 	}
