diff --git a/GUI/index.html b/GUI/index.html index 312e4c6..7e7175d 100644 --- a/GUI/index.html +++ b/GUI/index.html @@ -867,6 +867,25 @@ + + + + diff --git a/GUI/js/mods.js b/GUI/js/mods.js index 0ebda25..dfc77ba 100644 --- a/GUI/js/mods.js +++ b/GUI/js/mods.js @@ -78,6 +78,20 @@ function setupModsEventListeners() { } }); } + + const browseContainer = document.getElementById('browseModsList'); + if (browseContainer) { + browseContainer.addEventListener('click', (e) => { + const installBtn = e.target.closest('[data-install-mod-id]'); + if (installBtn) { + const modId = installBtn.getAttribute('data-install-mod-id'); + const mod = browseMods.find(m => m.id == modId); + if (mod) { + openVersionSelectModal(mod); + } + } + }); + } } function openMyModsModal() { @@ -165,7 +179,7 @@ function createInstalledModCard(mod) {

${mod.name}

- v${mod.version} + ${mod.fileName || 'v' + mod.version}

${mod.description || (window.i18n ? window.i18n.t('mods.noDescription') : 'No description available')}

@@ -295,13 +309,6 @@ function displayBrowseMods(mods) { } browseContainer.innerHTML = mods.map(mod => createBrowseModCard(mod)).join(''); - - mods.forEach(mod => { - const installBtn = document.getElementById(`install-${mod.id}`); - if (installBtn) { - installBtn.addEventListener('click', () => downloadAndInstallMod(mod)); - } - }); } function createBrowseModCard(mod) { @@ -350,12 +357,12 @@ function createBrowseModCard(mod) { ${window.i18n ? window.i18n.t('mods.view') : 'VIEW'} ${!isInstalled ? - `` : - `` } @@ -364,6 +371,104 @@ function createBrowseModCard(mod) { `; } +let currentSelectedMod = null; + +function openVersionSelectModal(mod) { + currentSelectedMod = mod; + const modal = document.getElementById('versionSelectModal'); + const closeBtn = document.getElementById('closeVersionModal'); + const versionList = document.getElementById('versionList'); + + if (modal) { + modal.style.display = 'flex'; + modal.classList.add('active'); + + const closeHandler = () => { + modal.classList.remove('active'); + setTimeout(() => { + modal.style.display = 'none'; + }, 300); + currentSelectedMod = null; + }; + + if (closeBtn) { + closeBtn.onclick = closeHandler; + } + modal.onclick = (e) => { + if (e.target === modal) closeHandler(); + }; + + loadModVersions(mod.id, versionList); + } +} + +async function loadModVersions(modId, container) { + container.innerHTML = ` +
+ + Loading versions... +
+ `; + + try { + const versions = await window.electronAPI.getModFiles(modId); + + if (!versions || versions.length === 0) { + container.innerHTML = `
No versions found for this mod.
`; + return; + } + + // Sort versions by date desc (API returns desc but ensure) + versions.sort((a, b) => new Date(b.fileDate) - new Date(a.fileDate)); + + container.innerHTML = versions.map(file => ` +
+
+
${file.displayName}
+
+ ${new Date(file.fileDate).toLocaleDateString()} + ${formatNumber(file.downloadCount)} + ${(file.fileLength / 1024 / 1024).toFixed(2)} MB +
+
+
+ +
+
+ `).join(''); + + // Add event listeners securely + container.querySelectorAll('.btn-install').forEach((btn, index) => { + const file = versions[index]; // Map index to file data + btn.onclick = () => installVersion(file); + }); + + } catch (error) { + console.error('Error loading versions:', error); + container.innerHTML = `
Error loading versions.
${error.message}
`; + } +} + +async function installVersion(file) { + if (!currentSelectedMod) return; + + const modal = document.getElementById('versionSelectModal'); + modal.style.display = 'none'; + + const modInfo = { + ...currentSelectedMod, + fileId: file.id, + downloadUrl: file.downloadUrl, + fileName: file.fileName, + fileSize: file.fileLength + }; + + await downloadAndInstallMod(modInfo); + currentSelectedMod = null; +} + async function downloadAndInstallMod(modInfo) { try { const downloadMsg = window.i18n ? window.i18n.t('notifications.modsDownloading').replace('{name}', modInfo.name) : `Downloading ${modInfo.name}...`; @@ -762,7 +867,10 @@ window.modsManager = { closeMyModsModal, viewModPage, loadInstalledMods, - loadBrowseMods + loadBrowseMods, + openVersionSelectModal }; -document.addEventListener('DOMContentLoaded', initModsManager); +// Remove auto-init since we are now calling it from script.js explicitly +// which guarantees order and environment readiness +// document.addEventListener('DOMContentLoaded', initModsManager); diff --git a/GUI/js/script.js b/GUI/js/script.js index a6bd492..d19e949 100644 --- a/GUI/js/script.js +++ b/GUI/js/script.js @@ -2,7 +2,7 @@ import './ui.js'; import './install.js'; import './launcher.js'; import './news.js'; -import './mods.js'; +import { initModsManager } from './mods.js'; import './players.js'; import './settings.js'; import './logs.js'; @@ -15,6 +15,12 @@ let i18nInitialized = false; if (document.readyState === 'complete' || document.readyState === 'interactive') { updateLanguageSelector(); + initModsManager(); + } else { + document.addEventListener('DOMContentLoaded', () => { + updateLanguageSelector(); + initModsManager(); + }); } })(); diff --git a/GUI/style.css b/GUI/style.css index 566f7fe..fecfea0 100644 --- a/GUI/style.css +++ b/GUI/style.css @@ -6610,3 +6610,85 @@ input[type="text"].uuid-input, opacity: 0.5; cursor: not-allowed; } + +/* Version Selection Styles */ +.version-list-container::-webkit-scrollbar { + width: 6px; +} + +.version-list-container::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.2); + border-radius: 3px; +} + +.version-item { + display: flex; + justify-content: space-between; + align-items: center; + padding: 1rem; + background: rgba(255, 255, 255, 0.05); + border: 1px solid rgba(255, 255, 255, 0.1); + border-radius: 8px; + margin-bottom: 0.5rem; + transition: all 0.2s ease; +} + +.version-item:hover { + background: rgba(255, 255, 255, 0.1); + transform: translateX(4px); +} + +.version-info { + display: flex; + flex-direction: column; + gap: 0.25rem; +} + +.version-name { + font-weight: 600; + color: #fff; + font-size: 0.95rem; +} + +.version-meta { + font-size: 0.8rem; + color: #a0a0a0; + display: flex; + gap: 1rem; + align-items: center; +} + +.version-meta span { + display: flex; + align-items: center; + gap: 0.35rem; +} + +.version-meta i { + font-size: 0.8em; + opacity: 0.7; +} + +.version-actions .btn-install { + padding: 0.5rem 1.25rem; + background: linear-gradient(135deg, #3b82f6, #2563eb); + color: white; + border: none; + border-radius: 6px; + cursor: pointer; + font-weight: 600; + font-size: 0.85rem; + transition: all 0.2s; + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.2); +} + +.version-actions .btn-install:hover { + transform: translateY(-1px); + box-shadow: 0 6px 8px rgba(0, 0, 0, 0.3); + background: linear-gradient(135deg, #4f93f6, #3b82f6); +} + +.loading-versions { + padding: 3rem; + text-align: center; +} \ No newline at end of file diff --git a/backend/launcher.js b/backend/launcher.js index 2f98005..7ef9d4e 100644 --- a/backend/launcher.js +++ b/backend/launcher.js @@ -84,7 +84,8 @@ const { loadInstalledMods, downloadMod, uninstallMod, - toggleMod + toggleMod, + getModFiles } = require('./managers/modManager'); // Services @@ -187,6 +188,7 @@ module.exports = { downloadMod, uninstallMod, toggleMod, + getModFiles, saveModsToConfig, loadModsFromConfig, diff --git a/backend/managers/modManager.js b/backend/managers/modManager.js index cb7775e..f125ff8 100644 --- a/backend/managers/modManager.js +++ b/backend/managers/modManager.js @@ -285,6 +285,27 @@ async function toggleMod(modId, modsPath) { } } + +async function getModFiles(modId) { + try { + const response = await axios.get(`https://api.curseforge.com/v1/mods/${modId}/files`, { + headers: { + 'x-api-key': API_KEY, + 'Accept': 'application/json' + }, + params: { + pageSize: 20, + sortOrder: 'desc' + } + }); + + return response.data.data; + } catch (error) { + console.error('Error fetching mod files:', error); + return []; + } +} + async function syncModsForCurrentProfile() { try { const activeProfile = profileManager.getActiveProfile(); @@ -455,5 +476,6 @@ module.exports = { syncModsForCurrentProfile, generateModId, extractModName, - extractVersion -}; + extractVersion, + getModFiles +}; \ No newline at end of file diff --git a/main.js b/main.js index 21fbcc8..6059b4c 100644 --- a/main.js +++ b/main.js @@ -1068,7 +1068,7 @@ ipcMain.handle('load-settings', async () => { } }); -const { getModsPath, loadInstalledMods, downloadMod, uninstallMod, toggleMod, getCurrentUuid, getAllUuidMappings, setUuidForUser, generateNewUuid, deleteUuidForUser, resetCurrentUserUuid } = require('./backend/launcher'); +const { getModsPath, loadInstalledMods, downloadMod, uninstallMod, toggleMod, getModFiles, getCurrentUuid, getAllUuidMappings, setUuidForUser, generateNewUuid, deleteUuidForUser, resetCurrentUserUuid } = require('./backend/launcher'); const os = require('os'); ipcMain.handle('get-local-app-data', async () => { @@ -1118,6 +1118,15 @@ ipcMain.handle('download-mod', async (event, modInfo) => { } }); +ipcMain.handle('get-mod-files', async (event, modId) => { + try { + return await getModFiles(modId); + } catch (error) { + console.error('Error getting mod files:', error); + return { success: false, error: error.message }; + } +}); + ipcMain.handle('uninstall-mod', async (event, modId, modsPath) => { try { return await uninstallMod(modId, modsPath); diff --git a/preload.js b/preload.js index f25dc2f..d3e672c 100644 --- a/preload.js +++ b/preload.js @@ -45,6 +45,7 @@ contextBridge.exposeInMainWorld('electronAPI', { loadInstalledMods: (modsPath) => ipcRenderer.invoke('load-installed-mods', modsPath), downloadMod: (modInfo) => ipcRenderer.invoke('download-mod', modInfo), uninstallMod: (modId, modsPath) => ipcRenderer.invoke('uninstall-mod', modId, modsPath), + getModFiles: (modId) => ipcRenderer.invoke('get-mod-files', modId), toggleMod: (modId, modsPath) => ipcRenderer.invoke('toggle-mod', modId, modsPath), selectModFiles: () => ipcRenderer.invoke('select-mod-files'), copyModFile: (sourcePath, modsPath) => ipcRenderer.invoke('copy-mod-file', sourcePath, modsPath),