Merge upstream/develop into v2.0.11 - sync with main repository

This commit is contained in:
chasem-dev
2026-01-22 13:07:34 -05:00
19 changed files with 1358 additions and 516 deletions

2
.env.example Normal file
View File

@@ -0,0 +1,2 @@
CURSEFORGE_API_KEY=$1234asdxXXXXXXkQCXXXXXXXXXXASDb32
DISCORD_CLIENT_ID=561263XXXXXX

5
.gitignore vendored
View File

@@ -8,4 +8,7 @@ pkg/
# Package files # Package files
*.tar.zst *.tar.zst
*.zst *.zst.DS_Store
*.zst
bun.lockb
.env

View File

@@ -51,11 +51,7 @@
<i class="fas fa-cog"></i> <i class="fas fa-cog"></i>
<span class="nav-tooltip" data-i18n="nav.settings">Settings</span> <span class="nav-tooltip" data-i18n="nav.settings">Settings</span>
</div> </div>
<div class="nav-item" data-page="skins"> <div class="nav-item logs-nav-item" data-page="logs" id="openLogsBtn" onclick="openLogs()">
<i class="fas fa-user"></i>
<span class="nav-tooltip" data-i18n="nav.skins">Skins</span>
</div>
<div class="nav-item" data-page="logs" id="openLogsBtn" onclick="openLogs()">
<i class="fas fa-terminal"></i> <i class="fas fa-terminal"></i>
<span class="nav-tooltip">Logs</span> <span class="nav-tooltip">Logs</span>
</div> </div>
@@ -94,6 +90,9 @@
<button class="control-btn minimize" onclick="window.electronAPI?.minimizeWindow()"> <button class="control-btn minimize" onclick="window.electronAPI?.minimizeWindow()">
<i class="fas fa-minus"></i> <i class="fas fa-minus"></i>
</button> </button>
<button class="control-btn maximize" onclick="toggleMaximize()">
<i class="fas fa-square"></i>
</button>
<button class="control-btn close" onclick="window.electronAPI?.closeWindow()"> <button class="control-btn close" onclick="window.electronAPI?.closeWindow()">
<i class="fas fa-times"></i> <i class="fas fa-times"></i>
</button> </button>
@@ -104,9 +103,6 @@
<h1 class="game-title"> <h1 class="game-title">
HY<span class="title-accent">TALE</span> HY<span class="title-accent">TALE</span>
</h1> </h1>
<div class="game-tags">
<span class="tag" data-i18n="header.f2p">FREE TO PLAY</span>
</div>
</div> </div>
<div class="content-pages"> <div class="content-pages">
@@ -114,7 +110,7 @@
<div class="install-content"> <div class="install-content">
<div class="install-header"> <div class="install-header">
<h1 class="install-title"> <h1 class="install-title">
HYTA<span class="title-accent">LE</span> HY<span class="title-accent">TALE</span>
</h1> </h1>
<p class="install-subtitle" data-i18n="install.title">FREE TO PLAY LAUNCHER</p> <p class="install-subtitle" data-i18n="install.title">FREE TO PLAY LAUNCHER</p>
</div> </div>
@@ -122,22 +118,26 @@
<div class="install-form"> <div class="install-form">
<div class="form-group"> <div class="form-group">
<label class="form-label" data-i18n="install.playerName">Player Name</label> <label class="form-label" data-i18n="install.playerName">Player Name</label>
<input type="text" id="installPlayerName" data-i18n-placeholder="install.playerNamePlaceholder" <input type="text" id="installPlayerName"
class="form-input" value="Player" /> data-i18n-placeholder="install.playerNamePlaceholder" class="form-input"
value="Player" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="checkbox-group"> <label class="checkbox-group">
<input type="checkbox" id="installCustomCheck" class="custom-checkbox"> <input type="checkbox" id="installCustomCheck" class="custom-checkbox">
<span class="checkbox-label" data-i18n="install.customInstallation">Custom Installation</span> <span class="checkbox-label" data-i18n="install.customInstallation">Custom
Installation</span>
</label> </label>
<div id="installCustomOptions" class="custom-options"> <div id="installCustomOptions" class="custom-options">
<div class="form-subgroup"> <div class="form-subgroup">
<label class="form-label" data-i18n="install.installationFolder">Installation Folder</label> <label class="form-label" data-i18n="install.installationFolder">Installation
Folder</label>
<div class="input-with-button"> <div class="input-with-button">
<input type="text" id="installPath" data-i18n-placeholder="install.pathPlaceholder" <input type="text" id="installPath"
class="form-input" readonly /> data-i18n-placeholder="install.pathPlaceholder" class="form-input"
readonly />
<button onclick="browseInstallPath()" class="browse-btn"> <button onclick="browseInstallPath()" class="browse-btn">
<i class="fas fa-folder-open"></i> <i class="fas fa-folder-open"></i>
</button> </button>
@@ -163,7 +163,8 @@
<i class="fas fa-play-circle mr-2"></i> <i class="fas fa-play-circle mr-2"></i>
<span data-i18n="play.ready">READY TO PLAY</span> <span data-i18n="play.ready">READY TO PLAY</span>
</h2> </h2>
<p class="play-subtitle" data-i18n="play.subtitle">Launch Hytale and enter the adventure</p> <p class="play-subtitle" data-i18n="play.subtitle">Launch Hytale and enter the
adventure</p>
</div> </div>
<button id="homePlayBtn" class="home-play-button" onclick="launch()"> <button id="homePlayBtn" class="home-play-button" onclick="launch()">
@@ -180,7 +181,8 @@
<span data-i18n="play.latestNews">LATEST NEWS</span> <span data-i18n="play.latestNews">LATEST NEWS</span>
</h2> </h2>
<button class="view-all-btn" onclick="navigateToPage('news')"> <button class="view-all-btn" onclick="navigateToPage('news')">
<span data-i18n="play.viewAll">VIEW ALL</span> <i class="fas fa-arrow-right ml-1"></i> <span data-i18n="play.viewAll">VIEW ALL</span> <i
class="fas fa-arrow-right ml-1"></i>
</button> </button>
</div> </div>
<div id="newsGrid" class="news-grid-horizontal"></div> <div id="newsGrid" class="news-grid-horizontal"></div>
@@ -191,7 +193,8 @@
<div class="mods-header"> <div class="mods-header">
<div class="mods-search-container"> <div class="mods-search-container">
<i class="fas fa-search"></i> <i class="fas fa-search"></i>
<input type="text" id="modsSearch" data-i18n-placeholder="mods.searchPlaceholder" class="mods-search" /> <input type="text" id="modsSearch" data-i18n-placeholder="mods.searchPlaceholder"
class="mods-search" />
</div> </div>
<div class="mods-actions"> <div class="mods-actions">
<button id="myModsBtn" class="mods-btn-primary"> <button id="myModsBtn" class="mods-btn-primary">
@@ -210,7 +213,8 @@
<span data-i18n="mods.previous">PREVIOUS</span> <span data-i18n="mods.previous">PREVIOUS</span>
</button> </button>
<span class="pagination-info"> <span class="pagination-info">
<span data-i18n="mods.page">Page</span> <span id="currentPage">1</span> <span data-i18n="mods.of">of</span> <span id="totalPages">1</span> <span data-i18n="mods.page">Page</span> <span id="currentPage">1</span> <span
data-i18n="mods.of">of</span> <span id="totalPages">1</span>
</span> </span>
<button id="nextPage" class="pagination-btn"> <button id="nextPage" class="pagination-btn">
<span data-i18n="mods.next">NEXT</span> <span data-i18n="mods.next">NEXT</span>
@@ -291,12 +295,14 @@
<div class="settings-option"> <div class="settings-option">
<div class="settings-input-group"> <div class="settings-input-group">
<label class="settings-input-label" data-i18n="settings.playerName">Player Name</label> <label class="settings-input-label" data-i18n="settings.playerName">Player
Name</label>
<input type="text" id="settingsPlayerName" class="settings-input" <input type="text" id="settingsPlayerName" class="settings-input"
data-i18n-placeholder="settings.playerNamePlaceholder" maxlength="16" /> data-i18n-placeholder="settings.playerNamePlaceholder" maxlength="16" />
<p class="settings-hint"> <p class="settings-hint">
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
<span data-i18n="settings.playerNameHint">This name will be used in-game (1-16 characters)</span> <span data-i18n="settings.playerNameHint">This name will be used in-game
(1-16 characters)</span>
</p> </p>
</div> </div>
</div> </div>
@@ -307,8 +313,11 @@
onclick="openGameLocation()"> onclick="openGameLocation()">
<i class="fas fa-folder-open"></i> <i class="fas fa-folder-open"></i>
<div class="btn-content"> <div class="btn-content">
<div class="btn-title" data-i18n="settings.openGameLocation">Open Game Location</div> <div class="btn-title" data-i18n="settings.openGameLocation">Open
<div class="btn-description" data-i18n="settings.openGameLocationDesc">Open the game installation folder</div> Game Location</div>
<div class="btn-description"
data-i18n="settings.openGameLocationDesc">Open the game
installation folder</div>
</div> </div>
</button> </button>
</div> </div>
@@ -320,8 +329,10 @@
onclick="repairGame()"> onclick="repairGame()">
<i class="fas fa-tools"></i> <i class="fas fa-tools"></i>
<div class="btn-content"> <div class="btn-content">
<div class="btn-title" data-i18n="settings.repairGame">Repair Game</div> <div class="btn-title" data-i18n="settings.repairGame">Repair Game
<div class="btn-description" data-i18n="settings.reinstallGame">Reinstall game files (preserves data) </div>
<div class="btn-description" data-i18n="settings.reinstallGame">
Reinstall game files (preserves data)
</div> </div>
</div> </div>
</button> </button>
@@ -329,18 +340,25 @@
<div class="settings-input-group"> <div class="settings-input-group">
<label class="settings-input-label" data-i18n="settings.gpuPreference">GPU Preference</label> <label class="settings-input-label" data-i18n="settings.gpuPreference">GPU
Preference</label>
<div class="segmented-control"> <div class="segmented-control">
<input type="radio" id="gpu-auto" name="gpuPreference" value="auto" checked> <input type="radio" id="gpu-auto" name="gpuPreference" value="auto"
checked>
<label for="gpu-auto" data-i18n="settings.gpuAuto">Auto</label> <label for="gpu-auto" data-i18n="settings.gpuAuto">Auto</label>
<input type="radio" id="gpu-integrated" name="gpuPreference" value="integrated"> <input type="radio" id="gpu-integrated" name="gpuPreference"
<label for="gpu-integrated" data-i18n="settings.gpuIntegrated">Integrated</label> value="integrated">
<input type="radio" id="gpu-dedicated" name="gpuPreference" value="dedicated"> <label for="gpu-integrated"
<label for="gpu-dedicated" data-i18n="settings.gpuDedicated">Dedicated</label> data-i18n="settings.gpuIntegrated">Integrated</label>
<input type="radio" id="gpu-dedicated" name="gpuPreference"
value="dedicated">
<label for="gpu-dedicated"
data-i18n="settings.gpuDedicated">Dedicated</label>
</div> </div>
<p class="settings-hint"> <p class="settings-hint">
<i class="fas fa-info-circle"></i> <i class="fas fa-info-circle"></i>
<span data-i18n="settings.gpuHint">Select your preferred GPU (Linux: affects DRI_PRIME)</span> <span data-i18n="settings.gpuHint">Select your preferred GPU (Linux:
affects DRI_PRIME)</span>
</p> </p>
<div id="gpu-detection-info" class="gpu-detection-info"></div> <div id="gpu-detection-info" class="gpu-detection-info"></div>
</div> </div>
@@ -355,7 +373,8 @@
<div class="settings-option"> <div class="settings-option">
<div class="settings-input-group"> <div class="settings-input-group">
<label class="settings-input-label" data-i18n="settings.currentUUID">Current UUID</label> <label class="settings-input-label" data-i18n="settings.currentUUID">Current
UUID</label>
<div class="uuid-display-container"> <div class="uuid-display-container">
<input type="text" id="currentUuid" class="settings-input uuid-input" <input type="text" id="currentUuid" class="settings-input uuid-input"
readonly data-i18n-placeholder="settings.uuidPlaceholder" /> readonly data-i18n-placeholder="settings.uuidPlaceholder" />
@@ -369,7 +388,8 @@
</div> </div>
<p class="settings-hint"> <p class="settings-hint">
<i class="fas fa-info-circle"></i> <i class="fas fa-info-circle"></i>
<span data-i18n="settings.uuidHint">Your unique player identifier for this username</span> <span data-i18n="settings.uuidHint">Your unique player identifier for
this username</span>
</p> </p>
</div> </div>
</div> </div>
@@ -379,8 +399,10 @@
<button id="manageUuidsBtn" class="settings-action-btn"> <button id="manageUuidsBtn" class="settings-action-btn">
<i class="fas fa-list"></i> <i class="fas fa-list"></i>
<div class="btn-content"> <div class="btn-content">
<div class="btn-title" data-i18n="settings.manageUUIDs">Manage All UUIDs</div> <div class="btn-title" data-i18n="settings.manageUUIDs">Manage All
<div class="btn-description" data-i18n="settings.manageUUIDsDesc">View and manage all player UUIDs</div> UUIDs</div>
<div class="btn-description" data-i18n="settings.manageUUIDsDesc">
View and manage all player UUIDs</div>
</div> </div>
</button> </button>
</div> </div>
@@ -398,14 +420,38 @@
<input type="checkbox" id="discordRPCCheck" checked /> <input type="checkbox" id="discordRPCCheck" checked />
<span class="checkmark"></span> <span class="checkmark"></span>
<div class="checkbox-content"> <div class="checkbox-content">
<div class="checkbox-title" data-i18n="settings.enableRPC">Enable Discord Rich Presence</div> <div class="checkbox-title" data-i18n="settings.enableRPC">Enable
<div class="checkbox-description" data-i18n="settings.discordDescription">Show your launcher activity on Discord Discord Rich Presence</div>
<div class="checkbox-description"
data-i18n="settings.discordDescription">Show your launcher activity
on Discord
</div> </div>
</div> </div>
</label> </label>
</div> </div>
</div> </div>
<div class="settings-section">
<h3 class="settings-section-title">
<i class="fas fa-window-close"></i>
<span data-i18n="settings.closeLauncher">Launcher Behavior</span>
</h3>
<div class="settings-option">
<label class="settings-checkbox">
<input type="checkbox" id="closeLauncherCheck" />
<span class="checkmark"></span>
<div class="checkbox-content">
<div class="checkbox-title" data-i18n="settings.closeOnStart">Close Launcher on game start</div>
<div class="checkbox-description" data-i18n="settings.closeOnStartDescription">
Automatically close the launcher after Hytale has launched
</div>
</div>
</label>
</div>
</div>
<div class="settings-section"> <div class="settings-section">
<h3 class="settings-section-title"> <h3 class="settings-section-title">
<i class="fas fa-coffee"></i> <i class="fas fa-coffee"></i>
@@ -417,8 +463,10 @@
<input type="checkbox" id="customJavaCheck" /> <input type="checkbox" id="customJavaCheck" />
<span class="checkmark"></span> <span class="checkmark"></span>
<div class="checkbox-content"> <div class="checkbox-content">
<div class="checkbox-title" data-i18n="settings.useCustomJava">Use Custom Java Path</div> <div class="checkbox-title" data-i18n="settings.useCustomJava">Use
<div class="checkbox-description" data-i18n="settings.javaDescription">Override the bundled Java runtime with Custom Java Path</div>
<div class="checkbox-description" data-i18n="settings.javaDescription">
Override the bundled Java runtime with
your own installation</div> your own installation</div>
</div> </div>
</label> </label>
@@ -426,7 +474,8 @@
<div id="customJavaOptions" class="custom-java-options" style="display: none;"> <div id="customJavaOptions" class="custom-java-options" style="display: none;">
<div class="settings-input-group"> <div class="settings-input-group">
<label class="settings-input-label" data-i18n="settings.javaPath">Java Executable Path</label> <label class="settings-input-label" data-i18n="settings.javaPath">Java
Executable Path</label>
<div class="settings-input-with-button"> <div class="settings-input-with-button">
<input type="text" id="customJavaPath" class="settings-input" <input type="text" id="customJavaPath" class="settings-input"
data-i18n-placeholder="settings.javaPathPlaceholder" readonly /> data-i18n-placeholder="settings.javaPathPlaceholder" readonly />
@@ -437,12 +486,13 @@
</div> </div>
<p class="settings-hint"> <p class="settings-hint">
<i class="fas fa-info-circle"></i> <i class="fas fa-info-circle"></i>
<span data-i18n="settings.javaHint">Select the Java installation folder (supports Windows, Mac, Linux)</span> <span data-i18n="settings.javaHint">Select the Java installation folder
(supports Windows, Mac, Linux)</span>
</p> </p>
</div> </div>
</div> </div>
</div> </div>
<div class="settings-section"> <div class="settings-section">
<h3 class="settings-section-title"> <h3 class="settings-section-title">
<i class="fas fa-language"></i> <i class="fas fa-language"></i>
@@ -451,7 +501,8 @@
<div class="settings-option"> <div class="settings-option">
<div class="settings-input-group"> <div class="settings-input-group">
<label class="settings-input-label" data-i18n="settings.selectLanguage">Select Language</label> <label class="settings-input-label"
data-i18n="settings.selectLanguage">Select Language</label>
<select id="languageSelect" class="settings-input"> <select id="languageSelect" class="settings-input">
<!-- Options populated by i18n.js --> <!-- Options populated by i18n.js -->
</select> </select>
@@ -462,14 +513,6 @@
</div> </div>
</div> </div>
<div id="skins-page" class="page">
<div class="placeholder-content">
<i class="fas fa-user text-6xl mb-4 text-purple-500"></i>
<h2 data-i18n="skins.title">Skins</h2>
<p data-i18n="skins.comingSoon">Skin customization coming soon...</p>
</div>
</div>
<div id="logs-page" class="page"> <div id="logs-page" class="page">
<div class="logs-container"> <div class="logs-container">
<div class="logs-header"> <div class="logs-header">
@@ -482,15 +525,18 @@
<i class="fas fa-copy"></i> <span data-i18n="settings.logsCopy">Copy</span> <i class="fas fa-copy"></i> <span data-i18n="settings.logsCopy">Copy</span>
</button> </button>
<button class="logs-action-btn" onclick="refreshLogs()"> <button class="logs-action-btn" onclick="refreshLogs()">
<i class="fas fa-sync-alt"></i> <span data-i18n="settings.logsRefresh">Refresh</span> <i class="fas fa-sync-alt"></i> <span
data-i18n="settings.logsRefresh">Refresh</span>
</button> </button>
<button class="logs-action-btn" onclick="openLogsFolder()"> <button class="logs-action-btn" onclick="openLogsFolder()">
<i class="fas fa-folder-open"></i> <span data-i18n="settings.logsFolder">Open Folder</span> <i class="fas fa-folder-open"></i> <span data-i18n="settings.logsFolder">Open
Folder</span>
</button> </button>
</div> </div>
</div> </div>
<div id="logsTerminal" class="logs-terminal"> <div id="logsTerminal" class="logs-terminal">
<div class="text-gray-500 text-center mt-10" data-i18n="settings.logsLoading">Loading logs...</div> <div class="text-gray-500 text-center mt-10" data-i18n="settings.logsLoading">Loading
logs...</div>
</div> </div>
</div> </div>
</div> </div>
@@ -532,6 +578,20 @@
</div> </div>
</div> </div>
<!-- Installation effects overlay -->
<div id="installationEffects" class="installation-effects" style="display: none;">
<div class="space-effects">
<div class="warp-line"></div>
<div class="warp-line"></div>
<div class="warp-line"></div>
<div class="warp-line"></div>
<div class="warp-line"></div>
<div class="warp-line"></div>
<div class="warp-line"></div>
<div class="warp-line"></div>
</div>
</div>
<div id="chatUsernameModal" class="chat-username-modal" style="display: none;"> <div id="chatUsernameModal" class="chat-username-modal" style="display: none;">
<div class="chat-username-modal-content"> <div class="chat-username-modal-content">
<div class="chat-username-modal-header"> <div class="chat-username-modal-header">
@@ -545,10 +605,12 @@
Choose a username to join the Players Chat Choose a username to join the Players Chat
</p> </p>
<div class="chat-username-input-group"> <div class="chat-username-input-group">
<label for="chatUsernameInput" class="chat-username-label" data-i18n="chat.username">Username</label> <label for="chatUsernameInput" class="chat-username-label"
data-i18n="chat.username">Username</label>
<input type="text" id="chatUsernameInput" class="chat-username-input" <input type="text" id="chatUsernameInput" class="chat-username-input"
data-i18n-placeholder="chat.usernamePlaceholder" maxlength="20" autocomplete="off" /> data-i18n-placeholder="chat.usernamePlaceholder" maxlength="20" autocomplete="off" />
<span class="chat-username-hint" data-i18n="chat.usernameHint">3-20 characters, letters, numbers, - and _ only</span> <span class="chat-username-hint" data-i18n="chat.usernameHint">3-20 characters, letters, numbers, -
and _ only</span>
<span id="chatUsernameError" class="chat-username-error"></span> <span id="chatUsernameError" class="chat-username-error"></span>
</div> </div>
</div> </div>
@@ -613,8 +675,7 @@
<h3 class="uuid-section-title" data-i18n="uuid.setCustomUUID">Set Custom UUID</h3> <h3 class="uuid-section-title" data-i18n="uuid.setCustomUUID">Set Custom UUID</h3>
<div class="uuid-custom-form"> <div class="uuid-custom-form">
<input type="text" id="customUuidInput" class="uuid-input" <input type="text" id="customUuidInput" class="uuid-input"
data-i18n-placeholder="uuid.customPlaceholder" data-i18n-placeholder="uuid.customPlaceholder" maxlength="36" />
maxlength="36" />
<button id="setCustomUuidBtn" class="uuid-set-btn"> <button id="setCustomUuidBtn" class="uuid-set-btn">
<i class="fas fa-check"></i> <i class="fas fa-check"></i>
<span data-i18n="uuid.setUUID">Set UUID</span> <span data-i18n="uuid.setUUID">Set UUID</span>
@@ -622,7 +683,8 @@
</div> </div>
<p class="uuid-custom-hint"> <p class="uuid-custom-hint">
<i class="fas fa-exclamation-triangle"></i> <i class="fas fa-exclamation-triangle"></i>
<span data-i18n="uuid.warning">Warning: Setting a custom UUID will change your current player identity</span> <span data-i18n="uuid.warning">Warning: Setting a custom UUID will change your current player
identity</span>
</p> </p>
</div> </div>
</div> </div>
@@ -646,8 +708,8 @@
<!-- Populated by JS --> <!-- Populated by JS -->
</div> </div>
<div class="profile-create-section"> <div class="profile-create-section">
<input type="text" id="newProfileName" data-i18n-placeholder="profiles.newProfilePlaceholder" class="profile-input" <input type="text" id="newProfileName" data-i18n-placeholder="profiles.newProfilePlaceholder"
maxlength="20"> class="profile-input" maxlength="20">
<button class="profile-create-btn" onclick="createNewProfile()"> <button class="profile-create-btn" onclick="createNewProfile()">
<i class="fas fa-plus"></i> <span data-i18n="profiles.createProfile">Create Profile</span> <i class="fas fa-plus"></i> <span data-i18n="profiles.createProfile">Create Profile</span>
</button> </button>
@@ -656,6 +718,11 @@
</div> </div>
</div> </div>
<div class="version-display-bottom">
<i class="fas fa-code-branch"></i>
<span id="launcherVersion">Loading...</span>
</div>
<footer class="fixed bottom-0 left-0 right-0 z-50 bg-black/80 backdrop-blur-sm px-4 py-2"> <footer class="fixed bottom-0 left-0 right-0 z-50 bg-black/80 backdrop-blur-sm px-4 py-2">
<div class="flex items-center justify-center text-xs text-gray-400"> <div class="flex items-center justify-center text-xs text-gray-400">
<span>Made by <a href="https://github.com/amiayweb" target="_blank" <span>Made by <a href="https://github.com/amiayweb" target="_blank"
@@ -728,12 +795,15 @@
<div class="color-preview"> <div class="color-preview">
<h4 data-i18n="chat.colorModal.preview">Preview:</h4> <h4 data-i18n="chat.colorModal.preview">Preview:</h4>
<div id="colorPreview" class="preview-username" data-i18n="chat.colorModal.previewUsername">YourUsername</div> <div id="colorPreview" class="preview-username" data-i18n="chat.colorModal.previewUsername">
YourUsername</div>
</div> </div>
</div> </div>
<div class="chat-color-modal-footer"> <div class="chat-color-modal-footer">
<button class="btn-secondary" onclick="closeChatColorModal()"><span data-i18n="common.cancel">Cancel</span></button> <button class="btn-secondary" onclick="closeChatColorModal()"><span
<button class="btn-primary" onclick="applyChatColor()"><span data-i18n="chat.colorModal.apply">Apply Color</span></button> data-i18n="common.cancel">Cancel</span></button>
<button class="btn-primary" onclick="applyChatColor()"><span data-i18n="chat.colorModal.apply">Apply
Color</span></button>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -39,6 +39,19 @@ export function setupInstallation() {
} }
}); });
} }
// Setup installation effects listeners
if (window.electronAPI && window.electronAPI.onInstallationStart) {
window.electronAPI.onInstallationStart(() => {
showInstallationEffects();
});
}
if (window.electronAPI && window.electronAPI.onInstallationEnd) {
window.electronAPI.onInstallationEnd(() => {
hideInstallationEffects();
});
}
} }
export async function installGame() { export async function installGame() {
@@ -78,12 +91,19 @@ export async function installGame() {
} }
} catch (error) { } catch (error) {
const errorMsg = window.i18n ? window.i18n.t('progress.installationFailed').replace('{error}', error.message) : `Installation failed: ${error.message}`; const errorMsg = window.i18n ? window.i18n.t('progress.installationFailed').replace('{error}', error.message) : `Installation failed: ${error.message}`;
// Hide installation effects on error
if (window.hideInstallationEffects) {
window.hideInstallationEffects();
}
// Reset button state on error
resetInstallButton();
if (window.LauncherUI) { if (window.LauncherUI) {
window.LauncherUI.updateProgress({ message: errorMsg }); window.LauncherUI.updateProgress({ message: errorMsg });
setTimeout(() => { // Don't hide progress bar, just update the message
window.LauncherUI.hideProgress(); // User can see the error and close it manually
resetInstallButton();
}, 3000);
} }
} }
} }

View File

@@ -1,5 +1,5 @@
const API_KEY = '$2a$10$bqk254NMZOWVTzLVJCcxEOmhcyUujKxA5xk.kQCN9q0KNYFJd5b32'; let API_KEY = null;
const CURSEFORGE_API = 'https://api.curseforge.com/v1'; const CURSEFORGE_API = 'https://api.curseforge.com/v1';
const HYTALE_GAME_ID = 70216; const HYTALE_GAME_ID = 70216;
@@ -11,6 +11,15 @@ let modsPageSize = 20;
let modsTotalPages = 1; let modsTotalPages = 1;
export async function initModsManager() { export async function initModsManager() {
try {
if (window.electronAPI && window.electronAPI.getEnvVar) {
API_KEY = await window.electronAPI.getEnvVar('CURSEFORGE_API_KEY');
console.log('Loaded API Key:', API_KEY ? 'Yes' : 'No');
}
} catch (err) {
console.error('Failed to load API Key:', err);
}
setupModsEventListeners(); setupModsEventListeners();
await loadInstalledMods(); await loadInstalledMods();
await loadBrowseMods(); await loadBrowseMods();
@@ -417,10 +426,10 @@ async function deleteMod(modId) {
const mod = installedMods.find(m => m.id === modId); const mod = installedMods.find(m => m.id === modId);
if (!mod) return; if (!mod) return;
const confirmMsg = window.i18n ? const confirmMsg = window.i18n ?
window.i18n.t('mods.confirmDelete').replace('{name}', mod.name) + ' ' + window.i18n.t('mods.confirmDeleteDesc') : window.i18n.t('mods.confirmDelete').replace('{name}', mod.name) + ' ' + window.i18n.t('mods.confirmDeleteDesc') :
`Are you sure you want to delete "${mod.name}"? This action cannot be undone.`; `Are you sure you want to delete "${mod.name}"? This action cannot be undone.`;
showConfirmModal( showConfirmModal(
confirmMsg, confirmMsg,
async () => { async () => {

View File

@@ -3,9 +3,11 @@ let customJavaCheck;
let customJavaOptions; let customJavaOptions;
let customJavaPath; let customJavaPath;
let browseJavaBtn; let browseJavaBtn;
let settingsPlayerName; let settingsPlayerName;
let discordRPCCheck; let discordRPCCheck;
let gpuPreferenceRadios; let closeLauncherCheck;
let gpuPreferenceRadios;
// UUID Management elements // UUID Management elements
let currentUuidDisplay; let currentUuidDisplay;
@@ -159,9 +161,11 @@ function setupSettingsElements() {
customJavaOptions = document.getElementById('customJavaOptions'); customJavaOptions = document.getElementById('customJavaOptions');
customJavaPath = document.getElementById('customJavaPath'); customJavaPath = document.getElementById('customJavaPath');
browseJavaBtn = document.getElementById('browseJavaBtn'); browseJavaBtn = document.getElementById('browseJavaBtn');
settingsPlayerName = document.getElementById('settingsPlayerName'); settingsPlayerName = document.getElementById('settingsPlayerName');
discordRPCCheck = document.getElementById('discordRPCCheck'); discordRPCCheck = document.getElementById('discordRPCCheck');
gpuPreferenceRadios = document.querySelectorAll('input[name="gpuPreference"]'); closeLauncherCheck = document.getElementById('closeLauncherCheck');
gpuPreferenceRadios = document.querySelectorAll('input[name="gpuPreference"]');
// UUID Management elements // UUID Management elements
currentUuidDisplay = document.getElementById('currentUuid'); currentUuidDisplay = document.getElementById('currentUuid');
@@ -190,9 +194,14 @@ function setupSettingsElements() {
settingsPlayerName.addEventListener('change', savePlayerName); settingsPlayerName.addEventListener('change', savePlayerName);
} }
if (discordRPCCheck) { if (discordRPCCheck) {
discordRPCCheck.addEventListener('change', saveDiscordRPC); discordRPCCheck.addEventListener('change', saveDiscordRPC);
} }
if (closeLauncherCheck) {
closeLauncherCheck.addEventListener('change', saveCloseLauncher);
}
// UUID event listeners // UUID event listeners
if (copyUuidBtn) { if (copyUuidBtn) {
@@ -335,18 +344,43 @@ async function saveDiscordRPC() {
} }
} }
async function loadDiscordRPC() { async function loadDiscordRPC() {
try { try {
if (window.electronAPI && window.electronAPI.loadDiscordRPC) { if (window.electronAPI && window.electronAPI.loadDiscordRPC) {
const enabled = await window.electronAPI.loadDiscordRPC(); const enabled = await window.electronAPI.loadDiscordRPC();
if (discordRPCCheck) { if (discordRPCCheck) {
discordRPCCheck.checked = enabled; discordRPCCheck.checked = enabled;
} }
} }
} catch (error) { } catch (error) {
console.error('Error loading Discord RPC setting:', error); console.error('Error loading Discord RPC setting:', error);
} }
} }
async function saveCloseLauncher() {
try {
if (window.electronAPI && window.electronAPI.saveCloseLauncher && closeLauncherCheck) {
const enabled = closeLauncherCheck.checked;
await window.electronAPI.saveCloseLauncher(enabled);
}
} catch (error) {
console.error('Error saving close launcher setting:', error);
}
}
async function loadCloseLauncher() {
try {
if (window.electronAPI && window.electronAPI.loadCloseLauncher) {
const enabled = await window.electronAPI.loadCloseLauncher();
if (closeLauncherCheck) {
closeLauncherCheck.checked = enabled;
}
}
} catch (error) {
console.error('Error loading close launcher setting:', error);
}
}
async function savePlayerName() { async function savePlayerName() {
try { try {
@@ -457,13 +491,15 @@ async function loadGpuPreference() {
} }
} }
async function loadAllSettings() { async function loadAllSettings() {
await loadCustomJavaPath(); await loadCustomJavaPath();
await loadPlayerName(); await loadPlayerName();
await loadCurrentUuid(); await loadCurrentUuid();
await loadDiscordRPC(); await loadDiscordRPC();
await loadGpuPreference(); await loadCloseLauncher();
} await loadGpuPreference();
}
async function openGameLocation() { async function openGameLocation() {
try { try {

View File

@@ -479,6 +479,9 @@ function setupUI() {
progressSpeed = document.getElementById('progressSpeed'); progressSpeed = document.getElementById('progressSpeed');
progressSize = document.getElementById('progressSize'); progressSize = document.getElementById('progressSize');
// Setup draggable progress bar
setupProgressDrag();
lockPlayButton(true); lockPlayButton(true);
setTimeout(() => { setTimeout(() => {
@@ -497,10 +500,26 @@ function setupUI() {
setupSidebarLogo(); setupSidebarLogo();
setupAnimations(); setupAnimations();
setupFirstLaunchHandlers(); setupFirstLaunchHandlers();
loadLauncherVersion();
document.body.focus(); document.body.focus();
} }
// Load launcher version from package.json
async function loadLauncherVersion() {
try {
if (window.electronAPI && window.electronAPI.getVersion) {
const version = await window.electronAPI.getVersion();
const versionElement = document.getElementById('launcherVersion');
if (versionElement) {
versionElement.textContent = `v${version}`;
}
}
} catch (error) {
console.error('Failed to load launcher version:', error);
}
}
window.LauncherUI = { window.LauncherUI = {
showPage, showPage,
setActiveNav, setActiveNav,
@@ -510,4 +529,91 @@ window.LauncherUI = {
updateProgress updateProgress
}; };
// Make installation effects globally available
window.showInstallationEffects = showInstallationEffects;
window.hideInstallationEffects = hideInstallationEffects;
// Draggable progress bar functionality
function setupProgressDrag() {
if (!progressOverlay) return;
let isDragging = false;
let offsetX;
let offsetY;
progressOverlay.addEventListener('mousedown', dragStart);
document.addEventListener('mousemove', drag);
document.addEventListener('mouseup', dragEnd);
function dragStart(e) {
// Only drag if clicking on the overlay itself, not on buttons or inputs
if (e.target.closest('.progress-bar-fill')) return;
if (e.target === progressOverlay || e.target.closest('.progress-content')) {
isDragging = true;
progressOverlay.classList.add('dragging');
// Get the current position of the progress overlay
const rect = progressOverlay.getBoundingClientRect();
offsetX = e.clientX - rect.left - progressOverlay.offsetWidth / 2;
offsetY = e.clientY - rect.top;
}
}
function drag(e) {
if (isDragging) {
e.preventDefault();
// Calculate new position
const newX = e.clientX - offsetX - progressOverlay.offsetWidth / 2;
const newY = e.clientY - offsetY;
// Get window bounds
const maxX = window.innerWidth - progressOverlay.offsetWidth;
const maxY = window.innerHeight - progressOverlay.offsetHeight;
const minX = 0;
const minY = 0;
// Constrain to window bounds
const constrainedX = Math.max(minX, Math.min(newX, maxX));
const constrainedY = Math.max(minY, Math.min(newY, maxY));
progressOverlay.style.left = constrainedX + 'px';
progressOverlay.style.bottom = 'auto';
progressOverlay.style.top = constrainedY + 'px';
progressOverlay.style.transform = 'none';
}
}
function dragEnd() {
isDragging = false;
progressOverlay.classList.remove('dragging');
}
}
// Show/hide installation effects
function showInstallationEffects() {
const installationEffects = document.getElementById('installationEffects');
if (installationEffects) {
installationEffects.style.display = 'block';
}
}
function hideInstallationEffects() {
const installationEffects = document.getElementById('installationEffects');
if (installationEffects) {
installationEffects.style.display = 'none';
}
}
// Toggle maximize/restore window function
function toggleMaximize() {
if (window.electronAPI && window.electronAPI.maximizeWindow) {
window.electronAPI.maximizeWindow();
}
}
// Make toggleMaximize globally available
window.toggleMaximize = toggleMaximize;
document.addEventListener('DOMContentLoaded', setupUI); document.addEventListener('DOMContentLoaded', setupUI);

View File

@@ -4,14 +4,12 @@
"mods": "Mods", "mods": "Mods",
"news": "News", "news": "News",
"chat": "Players Chat", "chat": "Players Chat",
"settings": "Settings", "settings": "Settings"
"skins": "Skins"
}, },
"header": { "header": {
"playersLabel": "Players:", "playersLabel": "Players:",
"manageProfiles": "Manage Profiles", "manageProfiles": "Manage Profiles",
"defaultProfile": "Default", "defaultProfile": "Default"
"f2p": "FREE TO PLAY"
}, },
"install": { "install": {
"title": "FREE TO PLAY LAUNCHER", "title": "FREE TO PLAY LAUNCHER",
@@ -124,7 +122,10 @@
"logsCopy": "Copy", "logsCopy": "Copy",
"logsRefresh": "Refresh", "logsRefresh": "Refresh",
"logsFolder": "Open Folder", "logsFolder": "Open Folder",
"logsLoading": "Loading logs..." "logsLoading": "Loading logs...",
"closeLauncher": "Launcher Behavior",
"closeOnStart": "Close Launcher on game start",
"closeOnStartDescription": "Automatically close the launcher after Hytale has launched"
}, },
"uuid": { "uuid": {
"modalTitle": "UUID Management", "modalTitle": "UUID Management",
@@ -148,10 +149,6 @@
"notificationText": "Join our Discord community!", "notificationText": "Join our Discord community!",
"joinButton": "Join Discord" "joinButton": "Join Discord"
}, },
"skins": {
"title": "Skins",
"comingSoon": "Skin customization coming soon..."
},
"common": { "common": {
"confirm": "Confirm", "confirm": "Confirm",
"cancel": "Cancel", "cancel": "Cancel",

View File

@@ -4,14 +4,12 @@
"mods": "Mods", "mods": "Mods",
"news": "Noticias", "news": "Noticias",
"chat": "Chat de Jugadores", "chat": "Chat de Jugadores",
"settings": "Configuración", "settings": "Configuración"
"skins": "Aspectos"
}, },
"header": { "header": {
"playersLabel": "Jugadores:", "playersLabel": "Jugadores:",
"manageProfiles": "Gestionar Perfiles", "manageProfiles": "Gestionar Perfiles",
"defaultProfile": "Predeterminado", "defaultProfile": "Predeterminado"
"f2p": "FREE TO PLAY"
}, },
"install": { "install": {
"title": "LAUNCHER GRATUITO", "title": "LAUNCHER GRATUITO",
@@ -124,7 +122,10 @@
"logsCopy": "Copiar", "logsCopy": "Copiar",
"logsRefresh": "Actualizar", "logsRefresh": "Actualizar",
"logsFolder": "Abrir Carpeta", "logsFolder": "Abrir Carpeta",
"logsLoading": "Cargando registros..." "logsLoading": "Cargando registros...",
"closeLauncher": "Comportamiento del Launcher",
"closeOnStart": "Cerrar Launcher al iniciar el juego",
"closeOnStartDescription": "Cierra automáticamente el launcher después de que Hytale se haya iniciado"
}, },
"uuid": { "uuid": {
"modalTitle": "Gestión de UUID", "modalTitle": "Gestión de UUID",
@@ -148,10 +149,6 @@
"notificationText": "¡Únete a nuestra comunidad de Discord!", "notificationText": "¡Únete a nuestra comunidad de Discord!",
"joinButton": "Unirse a Discord" "joinButton": "Unirse a Discord"
}, },
"skins": {
"title": "Aspectos",
"comingSoon": "Personalización de aspectos próximamente..."
},
"common": { "common": {
"confirm": "Confirmar", "confirm": "Confirmar",
"cancel": "Cancelar", "cancel": "Cancelar",

View File

@@ -4,14 +4,12 @@
"mods": "Mods", "mods": "Mods",
"news": "Notícias", "news": "Notícias",
"chat": "Chat de Jogadores", "chat": "Chat de Jogadores",
"settings": "Configurações", "settings": "Configurações"
"skins": "Aparências"
}, },
"header": { "header": {
"playersLabel": "Jogadores:", "playersLabel": "Jogadores:",
"manageProfiles": "Gerenciar Perfis", "manageProfiles": "Gerenciar Perfis",
"defaultProfile": "Padrão", "defaultProfile": "Padrão"
"f2p": "FREE TO PLAY"
}, },
"install": { "install": {
"title": "LANÇADOR JOGO GRATUITO", "title": "LANÇADOR JOGO GRATUITO",
@@ -124,7 +122,10 @@
"logsCopy": "Copiar", "logsCopy": "Copiar",
"logsRefresh": "Atualizar", "logsRefresh": "Atualizar",
"logsFolder": "Abrir Pasta", "logsFolder": "Abrir Pasta",
"logsLoading": "Carregando registros..." "logsLoading": "Carregando registros...",
"closeLauncher": "Comportamento do Lançador",
"closeOnStart": "Fechar Lançador ao iniciar o jogo",
"closeOnStartDescription": "Fechar automaticamente o lançador após o Hytale ter sido iniciado"
}, },
"uuid": { "uuid": {
"modalTitle": "Gerenciamento de UUID", "modalTitle": "Gerenciamento de UUID",
@@ -148,10 +149,7 @@
"notificationText": "Junte-se à nossa comunidade do Discord!", "notificationText": "Junte-se à nossa comunidade do Discord!",
"joinButton": "Entrar no Discord" "joinButton": "Entrar no Discord"
}, },
"skins": {
"title": "Aparências",
"comingSoon": "Personalização de aparências em breve..."
},
"common": { "common": {
"confirm": "Confirmar", "confirm": "Confirmar",
"cancel": "Cancelar", "cancel": "Cancelar",

178
GUI/splash.html Normal file
View File

@@ -0,0 +1,178 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Hytale F2P</title>
<link href="https://fonts.googleapis.com/css2?family=Space+Grotesk:wght@300;400;500;600;700&display=swap" rel="stylesheet">
<style>
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
body {
width: 100%;
height: 100vh;
background: transparent;
display: flex;
align-items: center;
justify-content: center;
font-family: 'Space Grotesk', sans-serif;
overflow: hidden;
position: relative;
border-radius: 16px;
}
.background {
position: absolute;
inset: 0;
z-index: 0;
border-radius: 16px;
overflow: hidden;
}
.background img {
width: 100%;
height: 100%;
object-fit: cover;
}
.background::after {
content: '';
position: absolute;
inset: 0;
background: rgba(0, 0, 0, 0.7);
}
.splash-container {
position: relative;
z-index: 10;
text-align: center;
animation: fadeIn 0.5s ease-out;
}
@keyframes fadeIn {
from {
opacity: 0;
transform: translateY(20px);
}
to {
opacity: 1;
transform: translateY(0);
}
}
.logo {
width: 120px;
height: 120px;
margin: 0 auto 2rem;
animation: pulse 2s ease-in-out infinite;
}
@keyframes pulse {
0%, 100% {
transform: scale(1);
}
50% {
transform: scale(1.05);
}
}
.logo img {
width: 100%;
height: 100%;
object-fit: contain;
filter: drop-shadow(0 0 30px rgba(147, 51, 234, 0.5));
}
.title {
font-size: 3rem;
font-weight: 700;
color: white;
margin-bottom: 1rem;
letter-spacing: 0.1em;
}
.title-accent {
background: linear-gradient(135deg, #9333ea, #a855f7, #c084fc);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
}
.subtitle {
font-size: 0.875rem;
color: #9ca3af;
margin-bottom: 2rem;
text-transform: uppercase;
letter-spacing: 0.2em;
}
.loader {
width: 200px;
height: 4px;
background: rgba(147, 51, 234, 0.2);
border-radius: 2px;
margin: 0 auto;
overflow: hidden;
position: relative;
}
.loader::after {
content: '';
position: absolute;
top: 0;
left: -100%;
width: 100%;
height: 100%;
background: linear-gradient(90deg, #9333ea, #a855f7, #c084fc);
animation: loading 1.5s ease-in-out infinite;
box-shadow: 0 0 20px rgba(147, 51, 234, 0.6);
}
@keyframes loading {
0% {
left: -100%;
}
100% {
left: 100%;
}
}
.loading-text {
margin-top: 1rem;
font-size: 0.75rem;
color: #6b7280;
animation: blink 1.5s ease-in-out infinite;
}
@keyframes blink {
0%, 100% {
opacity: 0.5;
}
50% {
opacity: 1;
}
}
</style>
</head>
<body>
<div class="background">
<img src="https://i.imgur.com/Visrk66.png" alt="Background">
</div>
<div class="splash-container">
<div class="logo">
<img src="./icon.png" alt="Hytale Logo">
</div>
<h1 class="title">
HY<span class="title-accent">TALE</span>
</h1>
<p class="subtitle">FREE TO PLAY LAUNCHER</p>
<div class="loader"></div>
<p class="loading-text">Loading...</p>
</div>
</body>
</html>

View File

@@ -26,7 +26,7 @@ body {
backdrop-filter: blur(20px); backdrop-filter: blur(20px);
border-right: 1px solid rgba(255, 255, 255, 0.1); border-right: 1px solid rgba(255, 255, 255, 0.1);
position: relative; position: relative;
z-index: 20; z-index: 45;
} }
.sidebar-logo { .sidebar-logo {
@@ -109,6 +109,12 @@ body {
transform: scale(1.1); transform: scale(1.1);
} }
/* Allow logs navigation during installation */
.logs-nav-item {
z-index: 100;
position: relative;
}
.nav-tooltip { .nav-tooltip {
position: absolute; position: absolute;
left: 100%; left: 100%;
@@ -210,6 +216,63 @@ body {
border-color: rgba(147, 51, 234, 0.3); border-color: rgba(147, 51, 234, 0.3);
} }
.version-display {
display: flex;
align-items: center;
gap: 0.5rem;
padding: 0.5rem 1rem;
background: rgba(0, 0, 0, 0.4);
backdrop-filter: blur(20px);
border: 1px solid rgba(255, 255, 255, 0.1);
border-radius: 12px;
font-family: 'JetBrains Mono', monospace;
font-size: 0.75rem;
color: #9ca3af;
pointer-events: auto;
transition: all 0.3s ease;
}
.version-display i {
color: #9333ea;
font-size: 0.875rem;
}
.version-display:hover {
background: rgba(0, 0, 0, 0.6);
border-color: rgba(147, 51, 234, 0.3);
color: #ffffff;
}
.version-display-bottom {
position: fixed;
bottom: 3rem;
right: 1rem;
display: flex;
align-items: center;
gap: 0.5rem;
padding: 0.5rem 1rem;
background: rgba(0, 0, 0, 0.6);
backdrop-filter: blur(20px);
border: 1px solid rgba(255, 255, 255, 0.1);
border-radius: 12px;
font-family: 'JetBrains Mono', monospace;
font-size: 0.75rem;
color: #9ca3af;
z-index: 45;
transition: all 0.3s ease;
}
.version-display-bottom i {
color: #9333ea;
font-size: 0.875rem;
}
.version-display-bottom:hover {
background: rgba(0, 0, 0, 0.8);
border-color: rgba(147, 51, 234, 0.3);
color: #ffffff;
}
.user-info { .user-info {
display: flex; display: flex;
@@ -374,10 +437,10 @@ body {
} }
.control-btn { .control-btn {
width: 20px; width: 28px;
height: 20px; height: 28px;
border-radius: 50%; border-radius: 6px;
border: none; border: 1px solid rgba(255, 255, 255, 0.1);
cursor: pointer !important; cursor: pointer !important;
transition: all 0.3s ease; transition: all 0.3s ease;
display: flex !important; display: flex !important;
@@ -386,24 +449,36 @@ body {
position: relative; position: relative;
z-index: 100000 !important; z-index: 100000 !important;
pointer-events: auto !important; pointer-events: auto !important;
backdrop-filter: blur(10px);
} }
.control-btn i { .control-btn i {
font-size: 0.5rem; font-size: 0.75rem;
opacity: 0; opacity: 0.7;
transition: opacity 0.3s ease; transition: opacity 0.3s ease;
color: white;
} }
.control-btn:hover i { .control-btn:hover i {
opacity: 1; opacity: 1;
} }
.maximize {
background: rgba(34, 197, 94, 0.2);
}
.maximize:hover {
background: rgba(34, 197, 94, 0.4);
border-color: rgba(34, 197, 94, 0.5);
}
.minimize { .minimize {
background: rgba(251, 191, 36, 0.2); background: rgba(251, 191, 36, 0.2);
} }
.minimize:hover { .minimize:hover {
background: #fbbf24; background: rgba(251, 191, 36, 0.4);
border-color: rgba(251, 191, 36, 0.5);
} }
.close { .close {
@@ -411,7 +486,8 @@ body {
} }
.close:hover { .close:hover {
background: #ef4444; background: rgba(239, 68, 68, 0.4);
border-color: rgba(239, 68, 68, 0.5);
} }
@@ -429,7 +505,7 @@ body {
} }
.title-accent { .title-accent {
color: #9333ea; color: #bf84f7;
text-shadow: 0 0 20px rgba(147, 51, 234, 0.5); text-shadow: 0 0 20px rgba(147, 51, 234, 0.5);
} }
@@ -928,15 +1004,22 @@ body {
.news-grid-horizontal { .news-grid-horizontal {
display: flex; display: grid;
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
grid-auto-rows: minmax(200px, 1fr);
gap: 1rem; gap: 1rem;
overflow-x: auto; overflow-y: auto;
overflow-x: hidden;
padding-bottom: 1rem; padding-bottom: 1rem;
scrollbar-width: thin; scrollbar-width: thin;
scrollbar-color: rgba(147, 51, 234, 0.3) transparent; scrollbar-color: rgba(147, 51, 234, 0.3) transparent;
flex: 1;
min-height: 0;
align-content: start;
} }
.news-grid-horizontal::-webkit-scrollbar { .news-grid-horizontal::-webkit-scrollbar {
width: 6px;
height: 6px; height: 6px;
} }
@@ -954,9 +1037,11 @@ body {
} }
.news-grid-horizontal .news-item { .news-grid-horizontal .news-item {
min-width: 300px; width: 100%;
max-width: 300px; min-width: 0;
height: 200px; max-width: none;
height: auto;
aspect-ratio: 16 / 9;
flex-shrink: 0; flex-shrink: 0;
} }
@@ -997,6 +1082,12 @@ body {
border: 1px solid rgba(255, 255, 255, 0.1); border: 1px solid rgba(255, 255, 255, 0.1);
} }
/* Style spécifique pour LATEST NEWS (Play tab) */
.news-grid-horizontal .news-card {
aspect-ratio: unset;
height: 100%;
}
.news-card:hover { .news-card:hover {
box-shadow: 0 8px 40px rgba(147, 51, 234, 0.2); box-shadow: 0 8px 40px rgba(147, 51, 234, 0.2);
border-color: rgba(147, 51, 234, 0.3); border-color: rgba(147, 51, 234, 0.3);
@@ -1500,44 +1591,55 @@ body {
.progress-overlay { .progress-overlay {
position: fixed; position: fixed;
bottom: 1rem; bottom: 1.5rem;
left: 1rem; left: 50%;
right: 1rem; transform: translateX(-50%);
background: rgba(0, 0, 0, 0.85); width: 400px;
backdrop-filter: blur(30px); background: rgba(15, 23, 42, 0.95);
border: 2px solid rgba(147, 51, 234, 0.3); backdrop-filter: blur(20px);
border-radius: 16px; border: 1px solid rgba(147, 51, 234, 0.3);
padding: 2rem; border-radius: 12px;
z-index: 50; padding: 1.25rem;
z-index: 60;
box-shadow: box-shadow:
0 8px 32px rgba(0, 0, 0, 0.6), 0 4px 16px rgba(0, 0, 0, 0.5),
0 0 40px rgba(147, 51, 234, 0.1), 0 0 30px rgba(147, 51, 234, 0.15),
inset 0 1px 0 rgba(255, 255, 255, 0.1); inset 0 1px 0 rgba(255, 255, 255, 0.05);
animation: progressGlow 3s ease-in-out infinite alternate; animation: progressGlow 3s ease-in-out infinite alternate;
cursor: move;
user-select: none;
}
.progress-overlay.dragging {
cursor: grabbing;
box-shadow:
0 8px 24px rgba(0, 0, 0, 0.7),
0 0 50px rgba(147, 51, 234, 0.3),
inset 0 1px 0 rgba(255, 255, 255, 0.05);
} }
@keyframes progressGlow { @keyframes progressGlow {
0% { 0% {
box-shadow: box-shadow:
0 8px 32px rgba(0, 0, 0, 0.6), 0 4px 16px rgba(0, 0, 0, 0.5),
0 0 40px rgba(147, 51, 234, 0.1), 0 0 30px rgba(147, 51, 234, 0.15),
inset 0 1px 0 rgba(255, 255, 255, 0.1); inset 0 1px 0 rgba(255, 255, 255, 0.05);
border-color: rgba(147, 51, 234, 0.3); border-color: rgba(147, 51, 234, 0.3);
} }
100% { 100% {
box-shadow: box-shadow:
0 8px 32px rgba(0, 0, 0, 0.6), 0 4px 16px rgba(0, 0, 0, 0.5),
0 0 60px rgba(147, 51, 234, 0.3), 0 0 40px rgba(147, 51, 234, 0.25),
inset 0 1px 0 rgba(255, 255, 255, 0.1); inset 0 1px 0 rgba(255, 255, 255, 0.05);
border-color: rgba(147, 51, 234, 0.5); border-color: rgba(147, 51, 234, 0.4);
} }
} }
.progress-content { .progress-content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 1.5rem; gap: 0.75rem;
} }
.progress-info { .progress-info {
@@ -1548,7 +1650,7 @@ body {
.progress-info span { .progress-info span {
font-family: 'JetBrains Mono', monospace; font-family: 'JetBrains Mono', monospace;
font-size: 0.875rem; font-size: 0.8rem;
} }
#progressText { #progressText {
@@ -1572,8 +1674,8 @@ body {
#progressPercent { #progressPercent {
color: #9333ea; color: #9333ea;
font-weight: 700; font-weight: 700;
font-size: 2rem; font-size: 1.25rem;
text-shadow: 0 0 20px rgba(147, 51, 234, 0.8); text-shadow: 0 0 15px rgba(147, 51, 234, 0.6);
animation: percentGlow 1.5s ease-in-out infinite; animation: percentGlow 1.5s ease-in-out infinite;
} }
@@ -1592,15 +1694,15 @@ body {
} }
.progress-bar-container { .progress-bar-container {
height: 16px; height: 10px;
background: linear-gradient(90deg, #1f2937, #374151); background: linear-gradient(90deg, #1f2937, #374151);
border: 2px solid rgba(147, 51, 234, 0.2); border: 1px solid rgba(147, 51, 234, 0.2);
border-radius: 12px; border-radius: 8px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
box-shadow: box-shadow:
inset 0 2px 4px rgba(0, 0, 0, 0.5), inset 0 2px 4px rgba(0, 0, 0, 0.5),
0 0 20px rgba(147, 51, 234, 0.1); 0 0 15px rgba(147, 51, 234, 0.1);
} }
.progress-bar-container::before { .progress-bar-container::before {
@@ -1636,15 +1738,15 @@ body {
#06b6d4 75%, #06b6d4 75%,
#10b981 100%); #10b981 100%);
background-size: 200% 100%; background-size: 200% 100%;
border-radius: 10px; border-radius: 6px;
width: 0%; width: 0%;
transition: width 0.5s cubic-bezier(0.4, 0, 0.2, 1); transition: width 0.5s cubic-bezier(0.4, 0, 0.2, 1);
position: relative; position: relative;
overflow: hidden; overflow: hidden;
animation: progressFlow 3s linear infinite; animation: progressFlow 3s linear infinite;
box-shadow: box-shadow:
0 0 30px rgba(147, 51, 234, 0.6), 0 0 20px rgba(147, 51, 234, 0.5),
inset 0 1px 0 rgba(255, 255, 255, 0.3); inset 0 1px 0 rgba(255, 255, 255, 0.2);
} }
@keyframes progressFlow { @keyframes progressFlow {
@@ -1692,6 +1794,71 @@ body {
text-shadow: 0 0 5px rgba(156, 163, 175, 0.3); text-shadow: 0 0 5px rgba(156, 163, 175, 0.3);
} }
/* Installation effects */
.installation-effects {
position: fixed;
top: 0;
left: 80px;
width: calc(100% - 80px);
height: 100%;
background: rgba(0, 0, 0, 0.5);
backdrop-filter: blur(10px);
z-index: 40;
pointer-events: auto;
overflow: hidden;
}
.space-effects {
position: absolute;
width: 100%;
height: 100%;
perspective: 1000px;
}
.warp-line {
position: absolute;
width: 2px;
height: 100%;
background: linear-gradient(180deg,
transparent 0%,
rgba(147, 51, 234, 0.8) 50%,
transparent 100%);
box-shadow: 0 0 10px rgba(147, 51, 234, 0.8),
0 0 20px rgba(147, 51, 234, 0.4);
animation: warpSpeed 1.5s linear infinite;
opacity: 0;
}
.warp-line:nth-child(1) { left: 10%; animation-delay: 0s; }
.warp-line:nth-child(2) { left: 25%; animation-delay: 0.2s; }
.warp-line:nth-child(3) { left: 40%; animation-delay: 0.4s; }
.warp-line:nth-child(4) { left: 55%; animation-delay: 0.6s; }
.warp-line:nth-child(5) { left: 70%; animation-delay: 0.8s; }
.warp-line:nth-child(6) { left: 85%; animation-delay: 1s; }
.warp-line:nth-child(7) { left: 15%; animation-delay: 0.3s; }
.warp-line:nth-child(8) { left: 60%; animation-delay: 0.7s; }
@keyframes warpSpeed {
0% {
transform: translateY(-100%) scaleY(0);
opacity: 0;
}
10% {
opacity: 1;
}
50% {
opacity: 1;
transform: translateY(0%) scaleY(1);
}
90% {
opacity: 1;
}
100% {
transform: translateY(100%) scaleY(2);
opacity: 0;
}
}
.mods-manager { .mods-manager {
display: flex; display: flex;

View File

@@ -156,6 +156,15 @@ function loadLanguage() {
return config.language || 'en'; return config.language || 'en';
} }
function saveCloseLauncherOnStart(enabled) {
saveConfig({ closeLauncherOnStart: !!enabled });
}
function loadCloseLauncherOnStart() {
const config = loadConfig();
return config.closeLauncherOnStart !== undefined ? config.closeLauncherOnStart : false;
}
function saveModsToConfig(mods) { function saveModsToConfig(mods) {
try { try {
const config = loadConfig(); const config = loadConfig();
@@ -331,5 +340,8 @@ module.exports = {
resetCurrentUserUuid, resetCurrentUserUuid,
// GPU Preference exports // GPU Preference exports
saveGpuPreference, saveGpuPreference,
loadGpuPreference loadGpuPreference,
// Close Launcher export
saveCloseLauncherOnStart,
loadCloseLauncherOnStart
}; };

View File

@@ -162,13 +162,18 @@ async function getModsPath(customInstallPath = null) {
const modsPath = path.join(userDataPath, 'Mods'); const modsPath = path.join(userDataPath, 'Mods');
const disabledModsPath = path.join(userDataPath, 'DisabledMods'); const disabledModsPath = path.join(userDataPath, 'DisabledMods');
const profilesPath = path.join(userDataPath, 'Profiles');
if (!fs.existsSync(modsPath)) { if (!fs.existsSync(modsPath)) {
// Ensure the Mods directory exists
fs.mkdirSync(modsPath, { recursive: true }); fs.mkdirSync(modsPath, { recursive: true });
} }
if (!fs.existsSync(disabledModsPath)) { if (!fs.existsSync(disabledModsPath)) {
fs.mkdirSync(disabledModsPath, { recursive: true }); fs.mkdirSync(disabledModsPath, { recursive: true });
} }
if (!fs.existsSync(profilesPath)) {
fs.mkdirSync(profilesPath, { recursive: true });
}
return modsPath; return modsPath;
} catch (error) { } catch (error) {
@@ -177,6 +182,34 @@ async function getModsPath(customInstallPath = null) {
} }
} }
function getProfilesDir(customInstallPath = null) {
try {
// get UserData path
let installPath = customInstallPath;
if (!installPath) {
const configFile = path.join(DEFAULT_APP_DIR, 'config.json');
if (fs.existsSync(configFile)) {
const config = JSON.parse(fs.readFileSync(configFile, 'utf8'));
installPath = config.installPath || '';
}
}
if (!installPath) installPath = getAppDir();
const gameLatest = path.join(installPath, 'release', 'package', 'game', 'latest');
const userDataPath = findUserDataPath(gameLatest);
const profilesDir = path.join(userDataPath, 'Profiles');
if (!fs.existsSync(profilesDir)) {
fs.mkdirSync(profilesDir, { recursive: true });
}
return profilesDir;
} catch (err) {
console.error('Error getting profiles dir:', err);
return null;
}
}
module.exports = { module.exports = {
getAppDir, getAppDir,
getResolvedAppDir, getResolvedAppDir,
@@ -191,5 +224,6 @@ module.exports = {
findClientPath, findClientPath,
findUserDataPath, findUserDataPath,
findUserDataRecursive, findUserDataRecursive,
getModsPath getModsPath,
getProfilesDir
}; };

View File

@@ -17,6 +17,8 @@ const {
loadDiscordRPC, loadDiscordRPC,
saveLanguage, saveLanguage,
loadLanguage, loadLanguage,
saveCloseLauncherOnStart,
loadCloseLauncherOnStart,
saveModsToConfig, saveModsToConfig,
loadModsFromConfig, loadModsFromConfig,
getUuidForUser, getUuidForUser,
@@ -124,6 +126,10 @@ module.exports = {
saveLanguage, saveLanguage,
loadLanguage, loadLanguage,
// Close Launcher functions
saveCloseLauncherOnStart,
loadCloseLauncherOnStart,
// GPU Preference functions // GPU Preference functions
saveGpuPreference, saveGpuPreference,
loadGpuPreference, loadGpuPreference,

View File

@@ -2,10 +2,30 @@ const fs = require('fs');
const path = require('path'); const path = require('path');
const crypto = require('crypto'); const crypto = require('crypto');
const axios = require('axios'); const axios = require('axios');
const { getModsPath } = require('../core/paths'); const { getModsPath, getProfilesDir } = require('../core/paths');
const { saveModsToConfig, loadModsFromConfig } = require('../core/config'); const { saveModsToConfig, loadModsFromConfig } = require('../core/config');
const profileManager = require('./profileManager'); const profileManager = require('./profileManager');
const API_KEY = process.env.CURSEFORGE_API_KEY;
/**
* Get the physical mods path for a specific profile.
* Each profile now has its own 'mods' folder.
*/
function getProfileModsPath(profileId) {
const profilesDir = getProfilesDir();
if (!profilesDir) return null;
const profileDir = path.join(profilesDir, profileId);
const modsDir = path.join(profileDir, 'mods');
if (!fs.existsSync(modsDir)) {
fs.mkdirSync(modsDir, { recursive: true });
}
return modsDir;
}
function generateModId(filename) { function generateModId(filename) {
return crypto.createHash('md5').update(filename).digest('hex').substring(0, 8); return crypto.createHash('md5').update(filename).digest('hex').substring(0, 8);
} }
@@ -35,30 +55,33 @@ function getProfileMods() {
async function loadInstalledMods(modsPath) { async function loadInstalledMods(modsPath) {
try { try {
// Sync first to ensure we detect any manually added mods and paths are correct
await syncModsForCurrentProfile();
const activeProfile = profileManager.getActiveProfile(); const activeProfile = profileManager.getActiveProfile();
if (!activeProfile) return []; if (!activeProfile) return [];
const profileMods = activeProfile.mods || []; const profileMods = activeProfile.mods || [];
const profileModFiles = new Set(profileMods.map(m => m.fileName));
// Use profile-specific paths
// We only return mods that are explicitly in the profile const profileModsPath = getProfileModsPath(activeProfile.id);
// Check which ones are physically present (either in mods/ or DisabledMods/) const profileDisabledModsPath = path.join(path.dirname(profileModsPath), 'DisabledMods');
const physicalModsPath = modsPath; // .../mods if (!fs.existsSync(profileModsPath)) fs.mkdirSync(profileModsPath, { recursive: true });
const disabledModsPath = path.join(path.dirname(modsPath), 'DisabledMods'); if (!fs.existsSync(profileDisabledModsPath)) fs.mkdirSync(profileDisabledModsPath, { recursive: true });
const validMods = []; const validMods = [];
for (const modConfig of profileMods) { for (const modConfig of profileMods) {
// Check if file exists in either location // Check if file exists in either location
const inEnabled = fs.existsSync(path.join(physicalModsPath, modConfig.fileName)); const inEnabled = fs.existsSync(path.join(profileModsPath, modConfig.fileName));
const inDisabled = fs.existsSync(path.join(disabledModsPath, modConfig.fileName)); const inDisabled = fs.existsSync(path.join(profileDisabledModsPath, modConfig.fileName));
if (inEnabled || inDisabled) { if (inEnabled || inDisabled) {
validMods.push({ validMods.push({
...modConfig, ...modConfig,
// Set filePath based on physical location // Set filePath based on physical location
filePath: inEnabled ? path.join(physicalModsPath, modConfig.fileName) : path.join(disabledModsPath, modConfig.fileName), filePath: inEnabled ? path.join(profileModsPath, modConfig.fileName) : path.join(profileDisabledModsPath, modConfig.fileName),
enabled: modConfig.enabled !== false // Default true enabled: modConfig.enabled !== false // Default true
}); });
} else { } else {
@@ -82,7 +105,11 @@ async function loadInstalledMods(modsPath) {
async function downloadMod(modInfo) { async function downloadMod(modInfo) {
try { try {
const modsPath = await getModsPath(); const activeProfile = profileManager.getActiveProfile();
if (!activeProfile) throw new Error('No active profile to save mod to');
const modsPath = getProfileModsPath(activeProfile.id);
if (!modsPath) throw new Error('Could not determine profile mods path');
if (!modInfo.downloadUrl && !modInfo.fileId) { if (!modInfo.downloadUrl && !modInfo.fileId) {
throw new Error('No download URL or file ID provided'); throw new Error('No download URL or file ID provided');
@@ -91,9 +118,9 @@ async function downloadMod(modInfo) {
let downloadUrl = modInfo.downloadUrl; let downloadUrl = modInfo.downloadUrl;
if (!downloadUrl && modInfo.fileId && modInfo.modId) { if (!downloadUrl && modInfo.fileId && modInfo.modId) {
const response = await axios.get(`https://api.curseforge.com/v1/mods/${modInfo.modId}/files/${modInfo.fileId}`, { const response = await axios.get(`https://api.curseforge.com/v1/mods/${modInfo.modId || modInfo.curseForgeId}/files/${modInfo.fileId || modInfo.curseForgeFileId}`, {
headers: { headers: {
'x-api-key': modInfo.apiKey, 'x-api-key': modInfo.apiKey || API_KEY,
'Accept': 'application/json' 'Accept': 'application/json'
} }
}); });
@@ -119,35 +146,30 @@ async function downloadMod(modInfo) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
writer.on('finish', () => { writer.on('finish', () => {
// NEW: Update Active Profile instead of global config // Update Active Profile
const activeProfile = profileManager.getActiveProfile(); const newMod = {
if (activeProfile) { id: modInfo.id || generateModId(fileName),
const newMod = { name: modInfo.name || extractModName(fileName),
id: modInfo.id || generateModId(fileName), version: modInfo.version || '1.0.0',
name: modInfo.name || extractModName(fileName), description: modInfo.summary || modInfo.description || 'Downloaded from CurseForge',
version: modInfo.version || '1.0.0', author: modInfo.author || 'Unknown',
description: modInfo.summary || modInfo.description || 'Downloaded from CurseForge', enabled: true,
author: modInfo.author || 'Unknown', fileName: fileName,
enabled: true, fileSize: fs.statSync(filePath).size,
fileName: fileName, dateInstalled: new Date().toISOString(),
fileSize: fs.statSync(filePath).size, curseForgeId: modInfo.modId,
dateInstalled: new Date().toISOString(), curseForgeFileId: modInfo.fileId
curseForgeId: modInfo.modId, };
curseForgeFileId: modInfo.fileId
};
const updatedMods = [...(activeProfile.mods || []), newMod]; const updatedMods = [...(activeProfile.mods || []), newMod];
profileManager.updateProfile(activeProfile.id, { mods: updatedMods }); profileManager.updateProfile(activeProfile.id, { mods: updatedMods });
resolve({ resolve({
success: true, success: true,
filePath: filePath, filePath: filePath,
fileName: fileName, fileName: fileName,
modInfo: newMod modInfo: newMod
}); });
} else {
reject(new Error('No active profile to save mod to'));
}
}); });
writer.on('error', reject); writer.on('error', reject);
}); });
@@ -173,8 +195,11 @@ async function uninstallMod(modId, modsPath) {
throw new Error('Mod not found in profile'); throw new Error('Mod not found in profile');
} }
const disabledModsPath = path.join(path.dirname(modsPath), 'DisabledMods'); // Use profile paths
const enabledPath = path.join(modsPath, mod.fileName); const profileModsPath = getProfileModsPath(activeProfile.id);
const disabledModsPath = path.join(path.dirname(profileModsPath), 'DisabledMods');
const enabledPath = path.join(profileModsPath, mod.fileName);
const disabledPath = path.join(disabledModsPath, mod.fileName); const disabledPath = path.join(disabledModsPath, mod.fileName);
let fileRemoved = false; let fileRemoved = false;
@@ -226,31 +251,25 @@ async function toggleMod(modId, modsPath) {
updatedMods[modIndex] = { ...mod, enabled: newEnabled }; updatedMods[modIndex] = { ...mod, enabled: newEnabled };
profileManager.updateProfile(activeProfile.id, { mods: updatedMods }); profileManager.updateProfile(activeProfile.id, { mods: updatedMods });
// Manually move the file to reflect the new state // Move file between Profile/Mods and Profile/DisabledMods
const disabledModsPath = path.join(path.dirname(modsPath), 'DisabledMods'); const profileModsPath = getProfileModsPath(activeProfile.id);
const disabledModsPath = path.join(path.dirname(profileModsPath), 'DisabledMods');
if (!fs.existsSync(disabledModsPath)) fs.mkdirSync(disabledModsPath, { recursive: true }); if (!fs.existsSync(disabledModsPath)) fs.mkdirSync(disabledModsPath, { recursive: true });
const currentPath = mod.enabled ? path.join(modsPath, mod.fileName) : path.join(disabledModsPath, mod.fileName); const currentPath = mod.enabled ? path.join(profileModsPath, mod.fileName) : path.join(disabledModsPath, mod.fileName);
const targetDir = newEnabled ? profileModsPath : disabledModsPath;
// Determine target paths
const targetDir = newEnabled ? modsPath : disabledModsPath;
const targetPath = path.join(targetDir, mod.fileName); const targetPath = path.join(targetDir, mod.fileName);
if (fs.existsSync(currentPath)) { if (fs.existsSync(currentPath)) {
fs.renameSync(currentPath, targetPath); fs.renameSync(currentPath, targetPath);
} else { } else {
// Fallback: check if it's already in target? // Fallback: check if it's already in target?
if (fs.existsSync(targetPath)) { if (fs.existsSync(targetPath)) {
// It's already there, maybe just state was wrong.
console.log(`[ModManager] Mod ${mod.fileName} is already in the correct state`); console.log(`[ModManager] Mod ${mod.fileName} is already in the correct state`);
} else { } else {
// Try finding it // Try finding it
const altPath = mod.enabled ? path.join(disabledModsPath, mod.fileName) : path.join(modsPath, mod.fileName); const altPath = mod.enabled ? path.join(disabledModsPath, mod.fileName) : path.join(profileModsPath, mod.fileName);
if (fs.existsSync(altPath)) fs.renameSync(altPath, targetPath); if (fs.existsSync(altPath)) fs.renameSync(altPath, targetPath);
} }
} }
@@ -273,35 +292,166 @@ async function syncModsForCurrentProfile() {
return; return;
} }
console.log(`[ModManager] Syncing mods for profile: ${activeProfile.name}`); console.log(`[ModManager] Syncing mods for profile: ${activeProfile.name} (${activeProfile.id})`);
const modsPath = await getModsPath(); // 1. Resolve Paths
const disabledModsPath = path.join(path.dirname(modsPath), 'DisabledMods'); // globalModsPath is the one the game uses (symlink target)
const globalModsPath = await getModsPath();
// profileModsPath is the real storage for this profile
const profileModsPath = getProfileModsPath(activeProfile.id);
const profileDisabledModsPath = path.join(path.dirname(profileModsPath), 'DisabledMods');
if (!fs.existsSync(disabledModsPath)) { if (!fs.existsSync(profileDisabledModsPath)) {
fs.mkdirSync(disabledModsPath, { recursive: true }); fs.mkdirSync(profileDisabledModsPath, { recursive: true });
} }
// Get all physical files from both folders // 2. Symlink / Migration Logic
const enabledFiles = fs.existsSync(modsPath) ? fs.readdirSync(modsPath).filter(f => f.endsWith('.jar') || f.endsWith('.zip')) : []; let needsLink = false;
const disabledFiles = fs.existsSync(disabledModsPath) ? fs.readdirSync(disabledModsPath).filter(f => f.endsWith('.jar') || f.endsWith('.zip')) : [];
if (fs.existsSync(globalModsPath)) {
const stats = fs.lstatSync(globalModsPath);
if (stats.isSymbolicLink()) {
const linkTarget = fs.readlinkSync(globalModsPath);
// Normalize paths for comparison
if (path.resolve(linkTarget) !== path.resolve(profileModsPath)) {
console.log(`[ModManager] Updating symlink from ${linkTarget} to ${profileModsPath}`);
fs.unlinkSync(globalModsPath);
needsLink = true;
}
} else if (stats.isDirectory()) {
// MIGRATION: It's a real directory. Move contents to profile.
console.log('[ModManager] Migrating global mods folder to profile folder...');
const files = fs.readdirSync(globalModsPath);
for (const file of files) {
const src = path.join(globalModsPath, file);
const dest = path.join(profileModsPath, file);
// Only move if dest doesn't exist to avoid overwriting
if (!fs.existsSync(dest)) {
fs.renameSync(src, dest);
}
}
// Also migrate DisabledMods if it exists globally
const globalDisabledPath = path.join(path.dirname(globalModsPath), 'DisabledMods');
if (fs.existsSync(globalDisabledPath) && fs.lstatSync(globalDisabledPath).isDirectory()) {
const dFiles = fs.readdirSync(globalDisabledPath);
for (const file of dFiles) {
const src = path.join(globalDisabledPath, file);
const dest = path.join(profileDisabledModsPath, file);
if (!fs.existsSync(dest)) {
fs.renameSync(src, dest);
}
}
// We can remove global DisabledMods now, as it's not used by game
try { fs.rmSync(globalDisabledPath, { recursive: true, force: true }); } catch(e) {}
}
// Remove the directory so we can link it
try {
fs.rmSync(globalModsPath, { recursive: true, force: true });
needsLink = true;
} catch (e) {
console.error('Failed to remove global mods dir:', e);
// Throw error to stop.
throw new Error('Failed to migrate mods directory. Please clear ' + globalModsPath);
}
}
} else {
needsLink = true;
}
if (needsLink) {
console.log(`[ModManager] Creating symlink: ${globalModsPath} -> ${profileModsPath}`);
try {
// 'junction' is key for Windows without admin
fs.symlinkSync(profileModsPath, globalModsPath, 'junction');
} catch (err) {
// If we can't create the symlink, try creating the directory first
console.error('[ModManager] Failed to create symlink. Falling back to direct folder mode.');
console.error(err.message);
// Fallback: create a real directory so the game still works
if (!fs.existsSync(globalModsPath)) {
fs.mkdirSync(globalModsPath, { recursive: true });
}
}
}
// 3. Auto-Repair (Download missing mods)
const profileModsSnapshot = activeProfile.mods || [];
for (const mod of profileModsSnapshot) {
if (mod.enabled && !mod.manual) {
const inEnabled = fs.existsSync(path.join(profileModsPath, mod.fileName));
const inDisabled = fs.existsSync(path.join(profileDisabledModsPath, mod.fileName));
if (!inEnabled && !inDisabled) {
if (mod.curseForgeId && (mod.curseForgeFileId || mod.fileId)) {
console.log(`[ModManager] Auto-repair: Re-downloading missing mod "${mod.name}"...`);
try {
await downloadMod({
...mod,
modId: mod.curseForgeId,
fileId: mod.curseForgeFileId || mod.fileId,
apiKey: API_KEY
});
} catch (err) {
console.error(`[ModManager] Auto-repair failed for "${mod.name}": ${err.message}`);
}
}
}
}
}
// 4. Auto-Import (Detect manual drops in the profile folder)
const enabledFiles = fs.existsSync(profileModsPath) ? fs.readdirSync(profileModsPath).filter(f => f.endsWith('.jar') || f.endsWith('.zip')) : [];
let profileMods = activeProfile.mods || [];
let profileUpdated = false;
// Anything in this folder belongs to this profile.
for (const file of enabledFiles) {
const isKnown = profileMods.some(m => m.fileName === file);
if (!isKnown) {
console.log(`[ModManager] Auto-importing manual mod: ${file}`);
const newMod = {
id: generateModId(file),
name: extractModName(file),
version: 'Unknown',
description: 'Manually installed',
author: 'Local',
enabled: true,
fileName: file,
fileSize: 0,
dateInstalled: new Date().toISOString(),
manual: true
};
profileMods.push(newMod);
profileUpdated = true;
}
}
if (profileUpdated) {
profileManager.updateProfile(activeProfile.id, { mods: profileMods });
const updatedProfile = profileManager.getActiveProfile();
profileMods = updatedProfile ? (updatedProfile.mods || []) : profileMods;
}
// 5. Enforce Enabled/Disabled State (Move files between Profile/Mods and Profile/DisabledMods)
// Note: Since Global/Mods IS Profile/Mods (via symlink), moving out of Profile/Mods disables it for the game.
const disabledFiles = fs.existsSync(profileDisabledModsPath) ? fs.readdirSync(profileDisabledModsPath).filter(f => f.endsWith('.jar') || f.endsWith('.zip')) : [];
const allFiles = new Set([...enabledFiles, ...disabledFiles]); const allFiles = new Set([...enabledFiles, ...disabledFiles]);
// Profile.mods contains the list of ALL mods for that profile, with their enabled state.
const profileMods = activeProfile.mods || [];
for (const fileName of allFiles) { for (const fileName of allFiles) {
const modConfig = profileMods.find(m => m.fileName === fileName); const modConfig = profileMods.find(m => m.fileName === fileName);
const shouldBeEnabled = modConfig && modConfig.enabled !== false; // Default to true if in list, unless explicitly false const shouldBeEnabled = modConfig && modConfig.enabled !== false;
// Logic: const currentPath = enabledFiles.includes(fileName) ? path.join(profileModsPath, fileName) : path.join(profileDisabledModsPath, fileName);
// If it should be enabled -> Move to mods/ const targetDir = shouldBeEnabled ? profileModsPath : profileDisabledModsPath;
// If it should be disabled -> Move to DisabledMods/
const currentPath = enabledFiles.includes(fileName) ? path.join(modsPath, fileName) : path.join(disabledModsPath, fileName);
const targetDir = shouldBeEnabled ? modsPath : disabledModsPath;
const targetPath = path.join(targetDir, fileName); const targetPath = path.join(targetDir, fileName);
if (path.dirname(currentPath) !== targetDir) { if (path.dirname(currentPath) !== targetDir) {

265
main.js
View File

@@ -1,19 +1,36 @@
const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron');
const path = require('path'); const path = require('path');
require('dotenv').config({ path: path.join(__dirname, '.env') });
const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron');
const fs = require('fs'); const fs = require('fs');
const { launchGame, launchGameWithVersionCheck, installGame, saveUsername, loadUsername, saveChatUsername, loadChatUsername, saveChatColor, loadChatColor, saveJavaPath, loadJavaPath, saveInstallPath, loadInstallPath, saveDiscordRPC, loadDiscordRPC, saveLanguage, loadLanguage, isGameInstalled, uninstallGame, repairGame, getHytaleNews, handleFirstLaunchCheck, proposeGameUpdate, markAsLaunched } = require('./backend/launcher'); const { launchGame, launchGameWithVersionCheck, installGame, saveUsername, loadUsername, saveChatUsername, loadChatUsername, saveChatColor, loadChatColor, saveJavaPath, loadJavaPath, saveInstallPath, loadInstallPath, saveDiscordRPC, loadDiscordRPC, saveLanguage, loadLanguage, saveCloseLauncherOnStart, loadCloseLauncherOnStart, isGameInstalled, uninstallGame, repairGame, getHytaleNews, handleFirstLaunchCheck, proposeGameUpdate, markAsLaunched } = require('./backend/launcher');
const AppUpdater = require('./backend/appUpdater');
const UpdateManager = require('./backend/updateManager');
const logger = require('./backend/logger'); const logger = require('./backend/logger');
const profileManager = require('./backend/managers/profileManager'); const profileManager = require('./backend/managers/profileManager');
logger.interceptConsole(); logger.interceptConsole();
// Single instance lock
const gotTheLock = app.requestSingleInstanceLock();
if (!gotTheLock) {
console.log('Another instance is already running. Quitting...');
app.quit();
} else {
app.on('second-instance', (event, commandLine, workingDirectory) => {
if (mainWindow) {
if (mainWindow.isMinimized()) mainWindow.restore();
mainWindow.focus();
}
});
}
let mainWindow; let mainWindow;
let appUpdater; let updateManager;
let discordRPC = null; let discordRPC = null;
// Discord Rich Presence setup // Discord Rich Presence setup
const DISCORD_CLIENT_ID = '1462244937868513373'; const DISCORD_CLIENT_ID = process.env.DISCORD_CLIENT_ID;
function initDiscordRPC() { function initDiscordRPC() {
try { try {
@@ -80,19 +97,47 @@ function toggleDiscordRPC(enabled) {
console.log('Discord RPC disconnected successfully'); console.log('Discord RPC disconnected successfully');
} catch (error) { } catch (error) {
console.error('Error disconnecting Discord RPC:', error.message); console.error('Error disconnecting Discord RPC:', error.message);
discordRPC = null; // Force null même en cas d'erreur discordRPC = null;
} }
} }
} }
function createSplashScreen() {
const splashWindow = new BrowserWindow({
width: 500,
height: 350,
frame: false,
transparent: true,
alwaysOnTop: true,
resizable: false,
skipTaskbar: true,
webPreferences: {
nodeIntegration: false,
contextIsolation: true
}
});
splashWindow.loadFile('GUI/splash.html');
splashWindow.center();
// close splash after 2.5s , need to implement a files check or whatever. just mock for now
setTimeout(() => {
splashWindow.close();
createWindow();
}, 2500);
}
function createWindow() { function createWindow() {
mainWindow = new BrowserWindow({ mainWindow = new BrowserWindow({
width: 1280, width: 1280,
height: 720, height: 720,
minWidth: 900,
minHeight: 600,
frame: false, frame: false,
resizable: false, resizable: true,
alwaysOnTop: false, alwaysOnTop: false,
backgroundColor: '#090909', backgroundColor: '#090909',
show: false,
webPreferences: { webPreferences: {
preload: path.join(__dirname, 'preload.js'), preload: path.join(__dirname, 'preload.js'),
nodeIntegration: false, nodeIntegration: false,
@@ -104,6 +149,10 @@ function createWindow() {
mainWindow.loadFile('GUI/index.html'); mainWindow.loadFile('GUI/index.html');
mainWindow.once('ready-to-show', () => {
mainWindow.show();
});
// Cleanup Discord RPC when window is closed // Cleanup Discord RPC when window is closed
mainWindow.on('closed', () => { mainWindow.on('closed', () => {
console.log('Main window closed, cleaning up Discord RPC...'); console.log('Main window closed, cleaning up Discord RPC...');
@@ -113,13 +162,11 @@ function createWindow() {
// Initialize Discord Rich Presence // Initialize Discord Rich Presence
initDiscordRPC(); initDiscordRPC();
// Initialize App Updater updateManager = new UpdateManager();
appUpdater = new AppUpdater(mainWindow); setTimeout(async () => {
const updateInfo = await updateManager.checkForUpdates();
// Check for updates after a short delay (3 seconds) if (updateInfo.updateAvailable) {
setTimeout(() => { mainWindow.webContents.send('show-update-popup', updateInfo);
if (appUpdater) {
appUpdater.checkForUpdatesAndNotify();
} }
}, 3000); }, 3000);
@@ -140,10 +187,21 @@ function createWindow() {
if (input.key === 'F12') { if (input.key === 'F12') {
event.preventDefault(); event.preventDefault();
} }
if (input.key === 'F5') { if (input.key === 'F5') {
event.preventDefault(); event.preventDefault();
} }
});
// Close application shortcuts
const isMac = process.platform === 'darwin';
const quitShortcut = (isMac && input.meta && input.key.toLowerCase() === 'q') ||
(!isMac && input.control && input.key.toLowerCase() === 'q') ||
(!isMac && input.alt && input.key === 'F4');
if (quitShortcut) {
app.quit();
}
});
mainWindow.webContents.on('context-menu', (e) => { mainWindow.webContents.on('context-menu', (e) => {
@@ -154,7 +212,9 @@ function createWindow() {
} }
app.whenReady().then(async () => { app.whenReady().then(async () => {
const packageJson = require('./package.json');
console.log('=== HYTALE F2P LAUNCHER STARTED ==='); console.log('=== HYTALE F2P LAUNCHER STARTED ===');
console.log('Launcher version:', packageJson.version);
console.log('Platform:', process.platform); console.log('Platform:', process.platform);
console.log('Architecture:', process.arch); console.log('Architecture:', process.arch);
console.log('Electron version:', process.versions.electron); console.log('Electron version:', process.versions.electron);
@@ -179,7 +239,7 @@ app.whenReady().then(async () => {
// Initialize Profile Manager (runs migration if needed) // Initialize Profile Manager (runs migration if needed)
profileManager.init(); profileManager.init();
createWindow(); createSplashScreen();
setTimeout(async () => { setTimeout(async () => {
let timeoutReached = false; let timeoutReached = false;
@@ -285,15 +345,14 @@ app.on('before-quit', () => {
cleanupDiscordRPC(); cleanupDiscordRPC();
}); });
app.on('window-all-closed', () => { app.on('window-all-closed', () => {
console.log('=== LAUNCHER CLOSING ==='); console.log('=== LAUNCHER CLOSING ===');
cleanupDiscordRPC(); cleanupDiscordRPC();
if (process.platform !== 'darwin') { app.quit();
app.quit(); });
}
});
ipcMain.handle('launch-game', async (event, playerName, javaPath, installPath, gpuPreference) => { ipcMain.handle('launch-game', async (event, playerName, javaPath, installPath, gpuPreference) => {
try { try {
@@ -310,9 +369,20 @@ ipcMain.handle('launch-game', async (event, playerName, javaPath, installPath, g
} }
}; };
const result = await launchGameWithVersionCheck(playerName, progressCallback, javaPath, installPath, gpuPreference); const result = await launchGameWithVersionCheck(playerName, progressCallback, javaPath, installPath, gpuPreference);
return result; if (result.success && result.launched) {
const closeOnStart = loadCloseLauncherOnStart();
if (closeOnStart) {
console.log('Close Launcher on start enabled, quitting application...');
setTimeout(() => {
app.quit();
}, 1000);
}
}
return result;
} catch (error) { } catch (error) {
console.error('Launch error:', error); console.error('Launch error:', error);
const errorMessage = error.message || error.toString(); const errorMessage = error.message || error.toString();
@@ -329,6 +399,11 @@ ipcMain.handle('launch-game', async (event, playerName, javaPath, installPath, g
ipcMain.handle('install-game', async (event, playerName, javaPath, installPath) => { ipcMain.handle('install-game', async (event, playerName, javaPath, installPath) => {
try { try {
// Signal installation start
if (mainWindow && !mainWindow.isDestroyed()) {
mainWindow.webContents.send('installation-start');
}
const progressCallback = (message, percent, speed, downloaded, total) => { const progressCallback = (message, percent, speed, downloaded, total) => {
if (mainWindow && !mainWindow.isDestroyed()) { if (mainWindow && !mainWindow.isDestroyed()) {
const data = { const data = {
@@ -344,11 +419,21 @@ ipcMain.handle('install-game', async (event, playerName, javaPath, installPath)
const result = await installGame(playerName, progressCallback, javaPath, installPath); const result = await installGame(playerName, progressCallback, javaPath, installPath);
// Signal installation end
if (mainWindow && !mainWindow.isDestroyed()) {
mainWindow.webContents.send('installation-end');
}
return result; return result;
} catch (error) { } catch (error) {
console.error('Install error:', error); console.error('Install error:', error);
const errorMessage = error.message || error.toString(); const errorMessage = error.message || error.toString();
// Signal installation end on error too
if (mainWindow && !mainWindow.isDestroyed()) {
mainWindow.webContents.send('installation-end');
}
return { success: false, error: errorMessage }; return { success: false, error: errorMessage };
} }
}); });
@@ -412,11 +497,21 @@ ipcMain.handle('save-language', (event, language) => {
return { success: true }; return { success: true };
}); });
ipcMain.handle('load-language', () => { ipcMain.handle('load-language', () => {
return loadLanguage(); return loadLanguage();
}); });
ipcMain.handle('select-install-path', async () => { ipcMain.handle('save-close-launcher', (event, enabled) => {
saveCloseLauncherOnStart(enabled);
return { success: true };
});
ipcMain.handle('load-close-launcher', () => {
return loadCloseLauncherOnStart();
});
ipcMain.handle('select-install-path', async () => {
const result = await dialog.showOpenDialog(mainWindow, { const result = await dialog.showOpenDialog(mainWindow, {
properties: ['openDirectory'], properties: ['openDirectory'],
title: 'Select Installation Folder' title: 'Select Installation Folder'
@@ -628,6 +723,10 @@ ipcMain.handle('get-local-app-data', async () => {
return process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local'); return process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local');
}); });
ipcMain.handle('get-env-var', async (event, key) => {
return process.env[key];
});
ipcMain.handle('get-user-id', async () => { ipcMain.handle('get-user-id', async () => {
try { try {
const { getOrCreatePlayerId } = require('./backend/launcher'); const { getOrCreatePlayerId } = require('./backend/launcher');
@@ -726,61 +825,21 @@ ipcMain.handle('copy-mod-file', async (event, sourcePath, modsPath) => {
ipcMain.handle('check-for-updates', async () => { ipcMain.handle('check-for-updates', async () => {
try { try {
if (appUpdater) { return await updateManager.checkForUpdates();
const result = await appUpdater.checkForUpdates();
const currentVersion = app.getVersion();
const remoteVersion = result?.updateInfo?.version;
// Only show update if remote version is actually newer than current
const updateAvailable = remoteVersion &&
remoteVersion !== currentVersion &&
isVersionNewer(remoteVersion, currentVersion);
return {
updateAvailable: updateAvailable,
version: remoteVersion,
newVersion: remoteVersion,
currentVersion: currentVersion
};
}
return { updateAvailable: false, error: 'AppUpdater not initialized' };
} catch (error) { } catch (error) {
console.error('Error checking for updates:', error); console.error('Error checking for updates:', error);
return { updateAvailable: false, error: error.message }; return { updateAvailable: false, error: error.message };
} }
}); });
// Helper function to compare semantic versions
function isVersionNewer(version1, version2) {
// Simple semantic version comparison
// Remove any non-numeric suffixes for comparison
const v1Parts = version1.replace(/[^0-9.]/g, '').split('.').map(Number);
const v2Parts = version2.replace(/[^0-9.]/g, '').split('.').map(Number);
// Pad arrays to same length
const maxLength = Math.max(v1Parts.length, v2Parts.length);
while (v1Parts.length < maxLength) v1Parts.push(0);
while (v2Parts.length < maxLength) v2Parts.push(0);
// Compare each part
for (let i = 0; i < maxLength; i++) {
if (v1Parts[i] > v2Parts[i]) return true;
if (v1Parts[i] < v2Parts[i]) return false;
}
return false; // Versions are equal
}
ipcMain.handle('open-download-page', async () => { ipcMain.handle('open-download-page', async () => {
try { try {
// Open GitHub releases page await shell.openExternal(updateManager.getDownloadUrl());
await shell.openExternal('https://github.com/amiayweb/Hytale-F2P/releases');
setTimeout(() => { setTimeout(() => {
if (mainWindow && !mainWindow.isDestroyed()) { app.quit();
mainWindow.close(); }, 1000);
}
}, 1000);
return { success: true }; return { success: true };
} catch (error) { } catch (error) {
@@ -789,24 +848,8 @@ ipcMain.handle('open-download-page', async () => {
} }
}); });
ipcMain.handle('quit-and-install-update', async () => {
try {
if (appUpdater) {
appUpdater.quitAndInstall();
return { success: true };
}
return { success: false, error: 'AppUpdater not initialized' };
} catch (error) {
console.error('Error installing update:', error);
return { success: false, error: error.message };
}
});
ipcMain.handle('get-update-info', async () => { ipcMain.handle('get-update-info', async () => {
if (appUpdater) { return updateManager.getUpdateInfo();
return appUpdater.getUpdateInfo();
}
return { currentVersion: app.getVersion(), updateAvailable: false };
}); });
ipcMain.handle('get-gpu-info', () => { ipcMain.handle('get-gpu-info', () => {
@@ -838,11 +881,10 @@ ipcMain.handle('get-detected-gpu', () => {
return global.detectedGpu; return global.detectedGpu;
}); });
ipcMain.handle('window-close', () => { ipcMain.handle('window-close', () => {
if (mainWindow && !mainWindow.isDestroyed()) { app.quit();
mainWindow.close(); });
}
});
ipcMain.handle('window-minimize', () => { ipcMain.handle('window-minimize', () => {
if (mainWindow && !mainWindow.isDestroyed()) { if (mainWindow && !mainWindow.isDestroyed()) {
@@ -850,6 +892,21 @@ ipcMain.handle('window-minimize', () => {
} }
}); });
ipcMain.handle('window-maximize', () => {
if (mainWindow && !mainWindow.isDestroyed()) {
if (mainWindow.isMaximized()) {
mainWindow.unmaximize();
} else {
mainWindow.maximize();
}
}
});
ipcMain.handle('get-version', () => {
const packageJson = require('./package.json');
return packageJson.version;
});
ipcMain.handle('get-log-directory', () => { ipcMain.handle('get-log-directory', () => {
return logger.getLogDirectory(); return logger.getLogDirectory();
}); });

View File

@@ -1,148 +1,150 @@
{ {
"name": "hytale-f2p-launcher", "name": "hytale-f2p-launcher",
"version": "2.0.11", "version": "2.0.11",
"description": "A modern, cross-platform launcher for Hytale with automatic updates and multi-client support", "description": "A modern, cross-platform launcher for Hytale with automatic updates and multi-client support",
"homepage": "https://github.com/amiayweb/Hytale-F2P", "homepage": "https://github.com/amiayweb/Hytale-F2P",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
"start": "electron .", "start": "electron .",
"dev": "electron . --dev", "dev": "electron . --dev",
"build": "electron-builder", "build": "electron-builder",
"build:win": "electron-builder --win", "build:win": "electron-builder --win",
"build:linux": "electron-builder --linux", "build:linux": "electron-builder --linux",
"build:mac": "electron-builder --mac", "build:mac": "electron-builder --mac",
"build:all": "electron-builder --win --linux --mac" "build:all": "electron-builder --win --linux --mac"
}, },
"keywords": [ "keywords": [
"hytale", "hytale",
"launcher", "launcher",
"game", "game",
"client", "client",
"cross-platform", "cross-platform",
"electron", "electron",
"auto-update", "auto-update",
"mod-manager", "mod-manager",
"chat" "chat"
], ],
"maintainers": [ "maintainers": [
{ {
"name": "Terromur", "name": "Terromur",
"url": "https://github.com/Terromur" "url": "https://github.com/Terromur"
}, },
{ {
"name": "Fari Gading", "name": "Fari Gading",
"email": "fazrigading@gmail.com", "email": "fazrigading@gmail.com",
"url": "https://github.com/fazrigading" "url": "https://github.com/fazrigading"
} }
], ],
"author": { "author": {
"name": "AMIAY", "name": "AMIAY",
"email": "support@amiay.dev" "email": "support@amiay.dev"
}, },
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"electron": "^40.0.0", "electron": "^40.0.0",
"electron-builder": "^26.4.0" "electron-builder": "^26.4.0"
}, },
"dependencies": { "dependencies": {
"adm-zip": "^0.5.10", "adm-zip": "^0.5.10",
"axios": "^1.6.0", "axios": "^1.6.0",
"discord-rpc": "^4.0.1", "discord-rpc": "^4.0.1",
"electron-updater": "^6.7.3", "dotenv": "^17.2.3",
"tar": "^6.2.1", "electron-updater": "^6.7.3",
"uuid": "^9.0.1" "tar": "^6.2.1",
}, "uuid": "^9.0.1"
"overrides": { },
"tar": "$tar" "overrides": {
}, "tar": "$tar"
"build": { },
"appId": "com.hytalef2p.launcher", "build": {
"productName": "Hytale F2P Launcher", "appId": "com.hytalef2p.launcher",
"artifactName": "${name}_${version}_${arch}.${ext}", "productName": "Hytale F2P Launcher",
"directories": { "artifactName": "${name}_${version}_${arch}.${ext}",
"output": "dist" "directories": {
}, "output": "dist"
"files": [ },
"main.js", "files": [
"preload.js", "main.js",
"backend/**/*", "preload.js",
"GUI/**/*", "backend/**/*",
"package.json" "GUI/**/*",
], "package.json",
"win": { ".env"
"target": [ ],
{ "win": {
"target": "nsis", "target": [
"arch": [ {
"x64", "target": "nsis",
"arm64" "arch": [
] "x64",
} "arm64"
], ]
"icon": "icon.ico" }
}, ],
"linux": { "icon": "icon.ico"
"target": [ },
{ "linux": {
"target": "AppImage", "target": [
"arch": [ {
"x64", "target": "AppImage",
"arm64" "arch": [
] "x64",
}, "arm64"
{ ]
"target": "deb", },
"arch": [ {
"x64", "target": "deb",
"arm64" "arch": [
] "x64",
}, "arm64"
{ ]
"target": "rpm", },
"arch": [ {
"x64", "target": "rpm",
"arm64" "arch": [
] "x64",
}, "arm64"
{ ]
"target": "pacman", },
"arch": [ {
"x64", "target": "pacman",
"arm64" "arch": [
] "x64",
} "arm64"
], ]
"icon": "build/icon.png", }
"category": "Game" ],
}, "icon": "build/icon.png",
"mac": { "category": "Game"
"target": [ },
{ "mac": {
"target": "dmg", "target": [
"arch": [ {
"universal" "target": "dmg",
] "arch": [
}, "universal"
{ ]
"target": "zip", },
"arch": [ {
"universal" "target": "zip",
] "arch": [
} "universal"
], ]
"icon": "build/icon.icns", }
"category": "public.app-category.games" ],
}, "icon": "build/icon.icns",
"nsis": { "category": "public.app-category.games"
"oneClick": false, },
"allowToChangeInstallationDirectory": true, "nsis": {
"createDesktopShortcut": true, "oneClick": false,
"createStartMenuShortcut": true "allowToChangeInstallationDirectory": true,
}, "createDesktopShortcut": true,
"publish": { "createStartMenuShortcut": true
"provider": "github", },
"owner": "amiayweb", "publish": {
"repo": "Hytale-F2P" "provider": "github",
} "owner": "amiayweb",
} "repo": "Hytale-F2P"
} }
}
}

View File

@@ -5,6 +5,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
installGame: (playerName, javaPath, installPath) => ipcRenderer.invoke('install-game', playerName, javaPath, installPath), installGame: (playerName, javaPath, installPath) => ipcRenderer.invoke('install-game', playerName, javaPath, installPath),
closeWindow: () => ipcRenderer.invoke('window-close'), closeWindow: () => ipcRenderer.invoke('window-close'),
minimizeWindow: () => ipcRenderer.invoke('window-minimize'), minimizeWindow: () => ipcRenderer.invoke('window-minimize'),
maximizeWindow: () => ipcRenderer.invoke('window-maximize'),
getVersion: () => ipcRenderer.invoke('get-version'),
saveUsername: (username) => ipcRenderer.invoke('save-username', username), saveUsername: (username) => ipcRenderer.invoke('save-username', username),
loadUsername: () => ipcRenderer.invoke('load-username'), loadUsername: () => ipcRenderer.invoke('load-username'),
saveChatUsername: (chatUsername) => ipcRenderer.invoke('save-chat-username', chatUsername), saveChatUsername: (chatUsername) => ipcRenderer.invoke('save-chat-username', chatUsername),
@@ -19,6 +21,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
loadDiscordRPC: () => ipcRenderer.invoke('load-discord-rpc'), loadDiscordRPC: () => ipcRenderer.invoke('load-discord-rpc'),
saveLanguage: (language) => ipcRenderer.invoke('save-language', language), saveLanguage: (language) => ipcRenderer.invoke('save-language', language),
loadLanguage: () => ipcRenderer.invoke('load-language'), loadLanguage: () => ipcRenderer.invoke('load-language'),
saveCloseLauncher: (enabled) => ipcRenderer.invoke('save-close-launcher', enabled),
loadCloseLauncher: () => ipcRenderer.invoke('load-close-launcher'),
selectInstallPath: () => ipcRenderer.invoke('select-install-path'), selectInstallPath: () => ipcRenderer.invoke('select-install-path'),
browseJavaPath: () => ipcRenderer.invoke('browse-java-path'), browseJavaPath: () => ipcRenderer.invoke('browse-java-path'),
isGameInstalled: () => ipcRenderer.invoke('is-game-installed'), isGameInstalled: () => ipcRenderer.invoke('is-game-installed'),
@@ -30,6 +34,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
openGameLocation: () => ipcRenderer.invoke('open-game-location'), openGameLocation: () => ipcRenderer.invoke('open-game-location'),
saveSettings: (settings) => ipcRenderer.invoke('save-settings', settings), saveSettings: (settings) => ipcRenderer.invoke('save-settings', settings),
loadSettings: () => ipcRenderer.invoke('load-settings'), loadSettings: () => ipcRenderer.invoke('load-settings'),
getEnvVar: (key) => ipcRenderer.invoke('get-env-var', key),
getLocalAppData: () => ipcRenderer.invoke('get-local-app-data'), getLocalAppData: () => ipcRenderer.invoke('get-local-app-data'),
getModsPath: () => ipcRenderer.invoke('get-mods-path'), getModsPath: () => ipcRenderer.invoke('get-mods-path'),
loadInstalledMods: (modsPath) => ipcRenderer.invoke('load-installed-mods', modsPath), loadInstalledMods: (modsPath) => ipcRenderer.invoke('load-installed-mods', modsPath),
@@ -44,6 +49,12 @@ contextBridge.exposeInMainWorld('electronAPI', {
onProgressComplete: (callback) => { onProgressComplete: (callback) => {
ipcRenderer.on('progress-complete', () => callback()); ipcRenderer.on('progress-complete', () => callback());
}, },
onInstallationStart: (callback) => {
ipcRenderer.on('installation-start', () => callback());
},
onInstallationEnd: (callback) => {
ipcRenderer.on('installation-end', () => callback());
},
getUserId: () => ipcRenderer.invoke('get-user-id'), getUserId: () => ipcRenderer.invoke('get-user-id'),
checkForUpdates: () => ipcRenderer.invoke('check-for-updates'), checkForUpdates: () => ipcRenderer.invoke('check-for-updates'),
openDownloadPage: () => ipcRenderer.invoke('open-download-page'), openDownloadPage: () => ipcRenderer.invoke('open-download-page'),
@@ -51,20 +62,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
onUpdatePopup: (callback) => { onUpdatePopup: (callback) => {
ipcRenderer.on('show-update-popup', (event, data) => callback(data)); ipcRenderer.on('show-update-popup', (event, data) => callback(data));
}, },
onUpdateAvailable: (callback) => {
ipcRenderer.on('update-available', (event, data) => callback(data));
},
onUpdateDownloadProgress: (callback) => {
ipcRenderer.on('update-download-progress', (event, data) => callback(data));
},
onUpdateDownloaded: (callback) => {
ipcRenderer.on('update-downloaded', (event, data) => callback(data));
},
onUpdateError: (callback) => {
ipcRenderer.on('update-error', (event, data) => callback(data));
},
quitAndInstallUpdate: () => ipcRenderer.invoke('quit-and-install-update'),
getGpuInfo: () => ipcRenderer.invoke('get-gpu-info'), getGpuInfo: () => ipcRenderer.invoke('get-gpu-info'),
saveGpuPreference: (gpuPreference) => ipcRenderer.invoke('save-gpu-preference', gpuPreference), saveGpuPreference: (gpuPreference) => ipcRenderer.invoke('save-gpu-preference', gpuPreference),
loadGpuPreference: () => ipcRenderer.invoke('load-gpu-preference'), loadGpuPreference: () => ipcRenderer.invoke('load-gpu-preference'),