Merge pull request #2 from xuanzhi33:feat-cross-platform

feat: Cross Platform

Author: xuanzhi33

.github/release_util.py

@@ -1,32 +1,42 @@
 import re
-from os import getenv, name
+import os
 with open("./src/main.html", "r", encoding="utf-8") as f:
     content = f.read()
     pattern = re.compile(r'const VERSION = "([0-9.]+)";')
     version = pattern.search(content).group(1)
     print(f"Version: {version}")
 
-if name == "nt":
-    os_name = "Windows"
-elif name == "posix":
-    os_name = "Linux"
-elif name == "darwin":
-    os_name = "macOS"
+
+platforms = {
+    "nt": "Windows",
+    "posix": "Linux",
+    "darwin": "macOS"
+}
+
+def get_filename(os_name):
+    name = platforms[os_name]
+    return f"SMCL-{version}-{name}.zip"
 
 envs = {
     "smcl_version": version,
-    "smcl_filename": f"SMCL-{version}-{os_name}.zip"
+    "smcl_filename": get_filename(os.name)
 }
 
-download_url = f"https://github.com/xuanzhi33/smcl/releases/download/{version}/{envs['smcl_filename']}"
-download_mirror = "https://mirror.ghproxy.com/" + download_url
+DOWNLOAD_URL = "https://github.com/xuanzhi33/smcl/releases/download/"
+MIRROR = "https://mirror.ghproxy.com/"
+
+download_md = ""
+for i in platforms:
+    os_name = platforms[i]
+    filename = get_filename(i)
+    url = f"{MIRROR}{DOWNLOAD_URL}{version}/{filename}"
+    download_md += f"- {os_name}: [{filename}]({url})\n"
 
 release_notes = f"""
 # SMCL {version}
 
 ## Download / 下载
-- Windows: [{envs['smcl_filename']}]({download_mirror})
-
+{download_md}
 ## Notes / 说明
 - Zip Password / 解压密码: `smcl`
 - Please extract and run smcl.exe / 下载后请解压并运行 smcl.exe
@@ -36,7 +46,7 @@
 with open("release_notes.md", "w", encoding="utf-8") as f:
     f.write(release_notes)
 
-gh_env = getenv("GITHUB_ENV")
+gh_env = os.getenv("GITHUB_ENV")
 
 if gh_env is not None:
     print(f"Writing: {gh_env}")

.github/workflows/build.yml

@@ -6,7 +6,10 @@ on:
 
 jobs:
   build-and-publish:
-    runs-on: windows-latest
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
     permissions:
       contents: write
     steps:

README.md

@@ -12,8 +12,7 @@ Still under development / 仍在开发中，功能不完善
 - [x] Multi-language support / 多语言支持
 - [x] Game version management / 游戏版本管理
 - [ ] Mod management / 模组管理
-- [ ] Cross-platform / 跨平台
-- [ ] Java version management / Java 版本管理
+- [x] Cross-platform / 跨平台
 - [ ] Auto-update / 自动更新
 
 Based on [CMCL](https://github.com/MrShieh-X/console-minecraft-launcher)

smcl.py

@@ -13,7 +13,8 @@
 SRC_DIR = path.join(PATH, "src")
 GUI_MAIN = path.join(SRC_DIR, "main.html")
 CMCL_CONFIG = path.join(SRC_DIR, "cmcl.json")
-CMCL = path.join(SRC_DIR, "cmcl.exe")
+CMCL_PATH = path.join(SRC_DIR, "cmcl.jar")
+CMCL_CMD = ["java", "-jar", CMCL_PATH]
 
 SIZE = (800, 450)
 DEBUG = True
@@ -49,7 +50,7 @@ def cmd_result(self, result):
         resultJson = json.dumps(result)
         self.run_js(f"window.cmdResult({resultJson});")
     def cmcl_waiting(self, cmd):
-        args = [CMCL]
+        args = CMCL_CMD
         if cmd is not None:
             self.log(f"CMCL: {cmd}")
             args += cmd
@@ -98,7 +99,7 @@ def confirm_dialog(self, message, title="SMCL"):
         return self._window.create_confirmation_dialog(title, message)
     def cmcl(self, args):
         self.log(f"CMCL: {args}")
-        p = sp_run([CMCL] + args, capture_output=True, text=True, startupinfo=self.startupinfo)
+        p = sp_run(CMCL_CMD + args, capture_output=True, text=True, startupinfo=self.startupinfo)
         result = p.stdout
         self.log(result)
         return result
@@ -150,6 +151,8 @@ def __init__(self) -> None:
         self.api = Api()
     def start(self):
         self.api.log(f"SMCL is starting, DEBUG: {self.isDebug()}")
+        webview.settings['ALLOW_DOWNLOADS'] = True
+
         window = webview.create_window('SMCL', GUI_MAIN,
                                        width=SIZE[0], height=SIZE[1],
                                        js_api=self.api)

src/cmcl.exe src/cmcl.jar

@@ -37,6 +37,8 @@
         :init="init"></version-list>
       <text-input v-else-if="ui === 'input'" @finish="input.resolveFunc" @close="goBack" :title="input.title"
         :desc="input.desc" :placeholder="input.placeholder"></text-input>
+      <install-java v-else-if="ui === 'installJava'" :show-warning="showWarning"
+        :ui-init="uiInit"></install-java>
       <div v-else-if="ui === 'main'">
         <button class="ctrl button account-menu" @click="changeUI('playerList')">
           <div style="font-size: 1.2rem; font-weight: bold;">
@@ -366,14 +368,62 @@
     </transition>
   </template>
 
+  <template id="install-java">
+    <ui-container>
+      <template #title>
+        <i class="fa fa-coffee"></i>
+        {{ $t('javaNotFound') }}
+      </template>
+      <template #content>
+        <div>
+          {{ $t('tips') }}
+        </div>
+        <div class="btn-group mt-2">
+          <a href="https://download.oracle.com/java/22/latest/jdk-22_windows-x64_bin.exe"
+            class="btn btn-info">
+            <i class="fa fa-download"></i>
+            Windows <br>
+          </a>
+          <a href="https://download.oracle.com/java/22/latest/jdk-22_macos-x64_bin.dmg"
+            class="btn btn-info">
+            <i class="fa fa-download"></i>
+            macOS <br>
+            (Intel)
+          </a>
+          <a href="https://download.oracle.com/java/22/latest/jdk-22_macos-aarch64_bin.dmg"
+            class="btn btn-info">
+            <i class="fa fa-download"></i>
+            macOS <br>
+            (Apple Silicon)
+          </a>
+          <a href="https://download.oracle.com/java/22/latest/jdk-22_linux-x64_bin.rpm"
+            class="btn btn-info">
+            <i class="fa fa-download"></i>
+            Linux <br>
+            (x64)
+          </a>
+          <a href="https://download.oracle.com/java/22/latest/jdk-22_linux-aarch64_bin.rpm"
+            class="btn btn-info">
+            <i class="fa fa-download"></i>
+            Linux <br>
+            (ARM64)
+          </a>
+        </div>
+        <button class="btn btn-success btn-block mt-2" @click="retry">
+          <i class="fa fa-check"></i> {{ $t('retry') }}
+        </button>
+      </template>
+    </ui-container>
+  </template>
+
 
   <!-- TODO: Component templates -->
 
   <script src="./vue.global.prod.js"></script>
   <script src="./vue-i18n.global.prod.js"></script>
   <script type="module">
     // TODO: Version
-    const VERSION = "0.3.0";
+    const VERSION = "0.4.0";
     const { createApp } = Vue;
     const { createI18n } = VueI18n;
     let api = null;
@@ -823,6 +873,45 @@
       }
     };
 
+    const InstallJava = {
+      components: {
+        UiContainer
+      },
+      props: {
+        uiInit: {
+          type: Function
+        },
+        showWarning: {
+          type: Function
+        }
+      },
+      template: "#install-java",
+      methods: {
+        async retry() {
+          const res = await this.uiInit();
+          if (!res) {
+            this.showWarning(this.$t("javaNotFound"), this.$t("stillFail"));
+          }
+        }
+      },
+      i18n: {
+        messages: {
+          en: {
+            javaNotFound: "Java not detected",
+            tips: "Minecraft requires Java Runtime. Please click the button below to download Java installer for your system.",
+            retry: "I have downloaded and installed Java",
+            stillFail: "Java still not detected, please try again or restart SMCL"
+          },
+          zh: {
+            javaNotFound: "未检测到 Java",
+            tips: "Minecraft 需要 Java 运行环境，请点击下方的按钮下载对应的 Java 安装包。",
+            retry: "我已经下载并安装了 Java",
+            stillFail: "仍然无法检测到 Java，请再次尝试，或重启 SMCL"
+          }
+        }
+      }
+    };
+
     // TODO: Components
     const app = createApp({
       components: {
@@ -831,7 +920,8 @@
         Settings,
         PlayerList,
         VersionList,
-        TextInput
+        TextInput,
+        InstallJava
       },
       data() {
         // TODO: data
@@ -1018,6 +1108,17 @@
           this.downloadSource = config.downloadSource;
           this.gameDir = config.gameDir;
           await api.set_title(`SMCL ${VERSION} - Minecraft: ${curVer} - ${this.$t('player')}: ${playerName} - by xuanzhi33`);
+        },
+        async uiInit() {
+          try {
+            await api.init_cmcl();
+            await this.init();
+            this.ui = "main";
+            return true;
+          } catch (e) {
+            this.ui = "installJava";
+            return false;
+          }
         }
       },
       watch: {
@@ -1036,9 +1137,7 @@
       },
       async mounted() {
         await this.init_api();
-        await api.init_cmcl();
-        await this.init();
-        this.ui = "main";
+        await this.uiInit();
       },
       template: "#main"
     });