Suche läuft …
';
+ try {
+ const res = await window.api.modpackSearch({
+ query, gameVersion, sort, limit: 30, offset: 0, art: 'modpack',
+ });
+ if (res.error) {
+ st.textContent = 'Fehler: ' + res.error;
+ box.innerHTML = 'Suche fehlgeschlagen.
';
+ return;
+ }
+ const hits = res.hits || [];
+ st.textContent = hits.length
+ ? (res.total + ' Treffer' + (gameVersion ? ' für ' + gameVersion : ''))
+ : 'Keine Treffer.';
+ box.innerHTML = '';
+ if (!hits.length) {
+ box.innerHTML = 'Keine Modpacks gefunden.
';
+ return;
+ }
+ for (const h of hits) {
+ const item = document.createElement('div');
+ item.className = 'mod-item';
+ const meta = [
+ h.author ? ('von ' + h.author) : '',
+ h.downloads != null ? (fmtDownloads(h.downloads) + ' Downloads') : '',
+ ].filter(Boolean).join(' · ');
+ const cats = (h.displayCategories || h.categories || []).slice(0, 4).join(', ');
+ item.innerHTML =
+ `${h.iconUrl ? `})
` : '📦'}
+
+
+ `;
+ const btn = document.createElement('button');
+ btn.className = 'btn btn-primary btn-mini';
+ btn.textContent = 'Installieren';
+ btn.addEventListener('click', () => installModpackFromSearch(h, btn));
+ item.querySelector('.mod-action').appendChild(btn);
+ box.appendChild(item);
+ }
+ } catch (err) {
+ st.textContent = 'Fehler: ' + (err.message || err);
+ box.innerHTML = '${escapeHtml(h.title || h.slug || h.projectId)}
+
+
+ Suche fehlgeschlagen.
';
+ }
+}
+
+async function installModpackFromSearch(hit, btn) {
+ if (!hit || !hit.projectId) return;
+ const gameVersion = el('mp-mc').value.trim();
+ const prev = btn ? btn.textContent : '';
+ if (btn) { btn.disabled = true; btn.textContent = '…'; }
+ status('Installiere Modpack: ' + (hit.title || hit.slug || '') + ' …');
+ try {
+ const res = await window.api.modpackInstallFromModrinth({
+ projectId: hit.projectId,
+ title: hit.title || hit.slug,
+ gameVersion,
+ });
+ status('Bereit'); el('status-right').textContent = '';
+ if (res.ok) {
+ await reload();
+ hide('modal-import');
+ toast(`Modpack installiert: ${res.instance.name} (${res.fileCount || 0} Dateien)`);
+ if (currentDetailId !== res.instance.id) {
+ try { await selectInstance(res.instance.id); } catch { /* egal */ }
+ }
+ return;
+ }
+ toast(res.message || 'Installation fehlgeschlagen.', true);
+ } catch (err) {
+ status('Bereit'); el('status-right').textContent = '';
+ toast('Installation fehlgeschlagen: ' + (err.message || err), true);
+ } finally {
+ if (btn) { btn.disabled = false; btn.textContent = prev || 'Installieren'; }
+ }
+}
+
async function scanMc() {
const folder = el('mc-path').value.trim();
el('mc-status').textContent = 'Suche Launcher-Profile …';
@@ -1689,14 +1782,14 @@ async function selectInstance(id) {
let launching = false;
-async function launch(id, accountId) {
+async function launch(id, accountId, launchOpts) {
if (launching) return;
launching = true;
status('Vorbereiten …');
el('status-right').textContent = '';
appendConsole('\n=== Start: ' + new Date().toLocaleTimeString('de-DE') + ' ===\n');
try {
- const res = await window.api.launchInstance(id, accountId);
+ const res = await window.api.launchInstance(id, accountId, launchOpts || null);
if (res.ok) {
status('Läuft (PID ' + res.pid + ')');
toast('Minecraft gestartet.');
@@ -1847,6 +1940,37 @@ async function renderServers() {
`;
const aktionen = item.querySelector('.mod-action');
+ const starten = document.createElement('button');
+ starten.className = 'btn btn-primary btn-mini';
+ starten.textContent = 'Starten';
+ starten.title = 'Instanz starten und direkt diesem Server beitreten (Quick Play, ab MC 1.20)';
+ starten.addEventListener('click', () => {
+ hide('modal-servers');
+ launch(currentDetailId, null, { quickPlayServer: s.ip });
+ });
+ aktionen.appendChild(starten);
+
+ const umbenennen = document.createElement('button');
+ umbenennen.className = 'btn btn-mini';
+ umbenennen.textContent = 'Umbenennen';
+ umbenennen.title = 'Anzeigenamen ändern';
+ umbenennen.addEventListener('click', async () => {
+ const aktuell = s.name || s.ip;
+ const eingabe = await askPrompt({
+ title: 'Server umbenennen',
+ text: 'Adresse: ' + s.ip,
+ label: 'Name',
+ value: aktuell,
+ okLabel: 'Speichern',
+ });
+ if (eingabe == null) return; // abgebrochen
+ const res = await window.api.serversRename(currentDetailId, s.ip, eingabe);
+ if (!res.ok) { toast(res.message || 'Umbenennen fehlgeschlagen.', true); return; }
+ if (!res.unveraendert) toast('Umbenannt: ' + eingabe.trim());
+ await renderServers();
+ });
+ aktionen.appendChild(umbenennen);
+
const kopieren = document.createElement('button');
kopieren.className = 'btn btn-mini';
kopieren.textContent = 'Übertragen…';
@@ -2184,34 +2308,80 @@ function openConsole() {
// ---------- Welten & Ressourcenpakete ----------
async function openContent() {
const inst = await window.api.getInstance(currentDetailId);
- el('content-title').textContent = 'Welten & Ressourcenpakete – ' + inst.name;
+ el('content-title').textContent = 'Welten, Ressourcen- & Datenpakete – ' + inst.name;
await renderContentLists();
show('modal-content');
}
async function renderContentLists() {
renderContentList('content-worlds', await window.api.worlds(currentDetailId), 'saves', '🌍');
renderContentList('content-rp', await window.api.resourcepacks(currentDetailId), 'resourcepacks', '🎨');
+ renderContentList('content-dp', await window.api.datapacks(currentDetailId), 'datapacks', '📜');
}
// ---------- Screenshots ----------
+let screenSelected = new Set();
+
+function updateScreensSelectionUi() {
+ const n = screenSelected.size;
+ const btn = el('screens-delete-sel');
+ if (btn) {
+ btn.disabled = n === 0;
+ btn.textContent = n ? (n + ' löschen') : 'Auswahl löschen';
+ }
+ const hint = el('screens-sel-hint');
+ if (hint) hint.textContent = n ? (n + ' ausgewählt – Doppelklick öffnet das Bild') : 'Klick auf Vorschaubild zum Auswählen · Doppelklick öffnet';
+ document.querySelectorAll('#screens-grid .screen-thumb').forEach((t) => {
+ const name = t.dataset.name;
+ const on = name && screenSelected.has(name);
+ t.classList.toggle('selected', !!on);
+ const cb = t.querySelector('.screen-check');
+ if (cb) cb.checked = !!on;
+ });
+}
+
async function openScreens() {
const inst = await window.api.getInstance(currentDetailId);
el('screens-title').textContent = 'Screenshots – ' + inst.name;
const grid = el('screens-grid');
grid.innerHTML = 'Lade …
';
+ screenSelected = new Set();
+ updateScreensSelectionUi();
show('modal-screens');
const shots = await window.api.screenshots(currentDetailId);
grid.innerHTML = '';
- if (!shots.length) { grid.innerHTML = 'Keine Screenshots vorhanden.
'; return; }
+ if (!shots.length) {
+ grid.innerHTML = 'Keine Screenshots vorhanden.
';
+ updateScreensSelectionUi();
+ return;
+ }
for (const s of shots) {
const thumb = document.createElement('div');
thumb.className = 'screen-thumb';
+ thumb.dataset.name = s.name;
thumb.innerHTML =
- `${escapeHtml(s.name)}
+ `
+ ${escapeHtml(s.name)}
`;
const img = thumb.querySelector('img');
window.api.screenshotData(currentDetailId, s.name).then((d) => { if (d) img.src = d; });
- img.addEventListener('click', () => window.api.openScreenshot(currentDetailId, s.name));
+
+ const toggle = () => {
+ if (screenSelected.has(s.name)) screenSelected.delete(s.name);
+ else screenSelected.add(s.name);
+ updateScreensSelectionUi();
+ };
+ thumb.querySelector('.screen-check').addEventListener('click', (e) => {
+ e.stopPropagation();
+ toggle();
+ });
+ thumb.addEventListener('click', (e) => {
+ if (e.target.closest('.screen-del') || e.target.closest('.screen-check')) return;
+ toggle();
+ });
+ img.addEventListener('dblclick', (e) => {
+ e.stopPropagation();
+ window.api.openScreenshot(currentDetailId, s.name);
+ });
thumb.querySelector('.screen-del').addEventListener('click', (e) => {
e.stopPropagation();
askConfirm('Screenshot löschen', `„${s.name}" löschen?`, '🗑 Löschen', async () => {
@@ -2221,6 +2391,22 @@ async function openScreens() {
});
grid.appendChild(thumb);
}
+ updateScreensSelectionUi();
+}
+
+async function deleteSelectedScreenshots() {
+ const names = [...screenSelected];
+ if (!names.length || !currentDetailId) return;
+ const label = names.length === 1
+ ? `„${names[0]}" löschen?`
+ : `${names.length} Screenshots unwiderruflich löschen?`;
+ askConfirm('Screenshots löschen', label, '🗑 Löschen', async () => {
+ for (const name of names) {
+ await window.api.deleteContent(currentDetailId, 'screenshots', name);
+ }
+ toast(names.length === 1 ? 'Screenshot gelöscht.' : names.length + ' Screenshots gelöscht.');
+ openScreens();
+ });
}
function renderContentList(boxId, items, sub, emoji) {
@@ -2457,28 +2643,52 @@ async function loadCatalog(append) {
if (ART_BRAUCHT_LOADER[modArt] && inst.minecraft.loader === 'vanilla') return;
const box = el('m-results');
if (!append) { modOffset = 0; box.innerHTML = 'Lade …
'; el('m-more').classList.add('hidden'); }
+ const source = (el('m-source') && el('m-source').value) || 'modrinth';
+ if (el('m-category')) el('m-category').disabled = source === 'curseforge' || modArt !== 'mod';
try {
const res = await window.api.modSearch({
query: el('m-query').value.trim(),
gameVersion: inst.minecraft.version,
loader: inst.minecraft.loader,
- category: modArt === 'mod' ? el('m-category').value : '',
+ category: (source === 'modrinth' && modArt === 'mod') ? el('m-category').value : '',
sort: el('m-sort').value,
limit: 30,
offset: modOffset,
art: modArt,
+ source,
});
if (!append) box.innerHTML = '';
- if (!res.hits.length && !append) {
+ if (res && (res.error || res.needKey)) {
+ if (!append) {
+ box.innerHTML = `${escapeHtml(res.error || 'Suche nicht möglich.')}
`;
+ if (res.needKey || /API-Key|Weiterleitung reicht/i.test(res.error || '')) {
+ const wrap = document.createElement('div');
+ wrap.className = 'mods-empty';
+ const btn = document.createElement('button');
+ btn.className = 'btn btn-mini';
+ btn.textContent = 'Zu den Netzwerk-Einstellungen';
+ btn.addEventListener('click', () => { hide('modal-mods'); openSettings('pane-network'); });
+ wrap.appendChild(btn);
+ box.appendChild(wrap);
+ }
+ }
+ el('m-more').classList.add('hidden');
+ return;
+ }
+ const hits = (res && res.hits) || [];
+ if (!hits.length && !append) {
box.innerHTML = 'Nichts gefunden.
';
el('m-more').classList.add('hidden');
return;
}
- for (const mod of res.hits) box.appendChild(buildResultItem(mod));
- modOffset += res.hits.length;
- el('m-more').classList.toggle('hidden', res.hits.length < 30 || modOffset >= res.total);
+ for (const mod of hits) box.appendChild(buildResultItem(mod));
+ modOffset += hits.length;
+ el('m-more').classList.toggle('hidden', hits.length < 30 || modOffset >= (res.total || 0));
} catch (e) {
- if (!append) box.innerHTML = `Fehler: ${escapeHtml(e.message)}
`;
+ if (!append) {
+ const msg = (e && e.message) ? e.message : String(e);
+ box.innerHTML = `Fehler: ${escapeHtml(msg)}
`;
+ }
}
}
@@ -2502,7 +2712,7 @@ function buildResultItem(mod) {
info.innerHTML =
`${escapeHtml(mod.title)}
${escapeHtml(mod.description || '')}
- `;
+ `;
const action = document.createElement('div');
action.className = 'mod-action';
@@ -3119,6 +3329,31 @@ function onAuthCode(code) {
}
// ---------- Bestätigung ----------
+
+let promptResolver = null;
+function askPrompt({ title, text, label, value, okLabel } = {}) {
+ return new Promise((resolve) => {
+ // falls schon ein Prompt offen ist
+ if (promptResolver) { promptResolver(null); promptResolver = null; }
+ promptResolver = resolve;
+ el('prompt-title').textContent = title || 'Eingabe';
+ el('prompt-text').textContent = text || '';
+ el('prompt-text').classList.toggle('hidden', !text);
+ el('prompt-label').textContent = label || 'Wert';
+ el('prompt-ok').textContent = okLabel || 'OK';
+ const input = el('prompt-input');
+ input.value = value != null ? String(value) : '';
+ show('modal-prompt');
+ setTimeout(() => { input.focus(); input.select(); }, 30);
+ });
+}
+function closePrompt(wert) {
+ hide('modal-prompt');
+ const r = promptResolver;
+ promptResolver = null;
+ if (r) r(wert);
+}
+
function askConfirm(title, text, okLabel, action) {
el('confirm-title').textContent = title;
el('confirm-text').textContent = text;
@@ -3189,10 +3424,20 @@ function wire() {
tab.addEventListener('click', async () => {
setImportKind(tab.dataset.kind);
if (tab.dataset.kind === 'mc') await ensureDefaultMcScan();
+ if (tab.dataset.kind === 'modpack') {
+ const box = el('mp-results');
+ if (box && !box.dataset.loaded) {
+ box.dataset.loaded = '1';
+ searchModpacks();
+ }
+ }
});
});
el('import-zip-do').addEventListener('click', runZipImport);
el('import-modpack-do').addEventListener('click', runModpackImport);
+ el('mp-search-btn').addEventListener('click', searchModpacks);
+ el('mp-query').addEventListener('keydown', (e) => { if (e.key === 'Enter') searchModpacks(); });
+ el('mp-mc').addEventListener('keydown', (e) => { if (e.key === 'Enter') searchModpacks(); });
el('mc-pick').addEventListener('click', async () => {
const p = await window.api.mcPickFolder();
if (p) { el('mc-path').value = p; await scanMc(); }
@@ -3375,12 +3620,25 @@ function wire() {
el('content-open-worlds').addEventListener('click', () => window.api.openSubdir(currentDetailId, 'saves'));
el('content-open-rp').addEventListener('click', () => window.api.openSubdir(currentDetailId, 'resourcepacks'));
el('screens-open').addEventListener('click', () => window.api.openSubdir(currentDetailId, 'screenshots'));
+ el('screens-select-all').addEventListener('click', () => {
+ document.querySelectorAll('#screens-grid .screen-thumb').forEach((t) => {
+ if (t.dataset.name) screenSelected.add(t.dataset.name);
+ });
+ updateScreensSelectionUi();
+ });
+ el('screens-select-none').addEventListener('click', () => {
+ screenSelected.clear();
+ updateScreensSelectionUi();
+ });
+ el('screens-delete-sel').addEventListener('click', () => deleteSelectedScreenshots());
+ el('content-open-dp').addEventListener('click', () => window.api.openSubdir(currentDetailId, 'datapacks'));
// Mod-Dialog
el('m-search-btn').addEventListener('click', () => loadCatalog(false));
el('m-query').addEventListener('keydown', (e) => { if (e.key === 'Enter') loadCatalog(false); });
el('m-sort').addEventListener('change', () => loadCatalog(false));
el('m-category').addEventListener('change', () => loadCatalog(false));
+ if (el('m-source')) el('m-source').addEventListener('change', () => loadCatalog(false));
el('m-more').addEventListener('click', () => loadCatalog(true));
el('m-tab-catalog').addEventListener('click', () => switchModTab('catalog'));
el('m-tab-installed').addEventListener('click', () => switchModTab('installed'));
@@ -3447,6 +3705,25 @@ function wire() {
el('s-backup-global').addEventListener('click', runGlobalBackup);
el('s-restore-global').addEventListener('click', promptGlobalRestore);
el('btn-save-settings').addEventListener('click', saveSettings);
+ if (el('s-cf-test')) {
+ el('s-cf-test').addEventListener('click', async () => {
+ const st = el('s-cf-test-status');
+ const key = el('s-cf-key').value.trim();
+ st.textContent = 'Prüfe bei CurseForge …';
+ try {
+ const res = await window.api.curseforgeTestKey(key);
+ st.textContent = (res.ok ? '✓ ' : '✖ ') + (res.message || '');
+ if (res.proben) {
+ st.textContent += ' [' + res.proben.map((p) => p.name + ':' + p.status).join(', ') + ']';
+ }
+ if (res.siehtAusWieCurseForge === false && key) {
+ st.textContent += ' Hinweis: Erwartet wird ein Studios-Key (cfc_pat_…) oder ein klassischer Key ($2a$10$…).';
+ }
+ } catch (err) {
+ st.textContent = '✖ ' + (err.message || err);
+ }
+ });
+ }
document.querySelectorAll('.snav').forEach((b) => b.addEventListener('click', () => setSettingsPane(b.dataset.pane)));
el('s-open-accounts').addEventListener('click', () => { hide('modal-settings'); openLogin(); });
el('s-add-account').addEventListener('click', () => { hide('modal-settings'); openLogin().then(addAccount); });
@@ -3484,6 +3761,27 @@ function wire() {
});
// Bestätigung
+ el('prompt-ok').addEventListener('click', () => {
+ const v = el('prompt-input').value;
+ closePrompt(v);
+ });
+ el('prompt-input').addEventListener('keydown', (e) => {
+ if (e.key === 'Enter') {
+ e.preventDefault();
+ closePrompt(el('prompt-input').value);
+ }
+ });
+ // Abbrechen / Schließen des Prompt-Dialogs liefert null
+ el('modal-prompt').querySelectorAll('[data-close]').forEach((b) => {
+ b.addEventListener('click', (e) => {
+ e.stopPropagation();
+ closePrompt(null);
+ });
+ });
+ el('modal-prompt').addEventListener('mousedown', (e) => {
+ if (e.target === el('modal-prompt')) closePrompt(null);
+ });
+
el('confirm-ok').addEventListener('click', async () => {
hide('modal-confirm');
if (confirmAction) { const a = confirmAction; confirmAction = null; await a(); }
@@ -3491,12 +3789,22 @@ function wire() {
// generisches Schließen
document.querySelectorAll('[data-close]').forEach((b) =>
- b.addEventListener('click', () => b.closest('.modal').classList.add('hidden')));
+ b.addEventListener('click', () => {
+ const m = b.closest('.modal');
+ if (!m) return;
+ if (m.id === 'modal-prompt') { closePrompt(null); return; }
+ m.classList.add('hidden');
+ }));
document.querySelectorAll('.modal').forEach((m) =>
- m.addEventListener('mousedown', (e) => { if (e.target === m) m.classList.add('hidden'); }));
+ m.addEventListener('mousedown', (e) => {
+ if (e.target !== m) return;
+ if (m.id === 'modal-prompt') { closePrompt(null); return; }
+ m.classList.add('hidden');
+ }));
document.addEventListener('keydown', (e) => {
if (e.key === 'Escape') {
if (!el('ctx-menu').classList.contains('hidden')) { closeContextMenu(); return; }
+ if (!el('modal-prompt').classList.contains('hidden')) { closePrompt(null); return; }
const open = [...document.querySelectorAll('.modal:not(.hidden)')].pop();
if (open) open.classList.add('hidden');
}
diff --git a/src/servers.js b/src/servers.js
index 99afe63..bc90795 100644
--- a/src/servers.js
+++ b/src/servers.js
@@ -135,6 +135,23 @@ function entferne(gameDir, ip) {
return schreibe(gameDir, liste);
}
+/*
+ * Nur den Anzeigenamen ändern – die Adresse bleibt gleich.
+ * ip identifiziert den Eintrag (wie beim Entfernen).
+ */
+function benenneUm(gameDir, ip, neuerName) {
+ const name = String(neuerName || '').trim();
+ if (!name) return { ok: false, message: 'Bitte einen Namen angeben.' };
+ const gelesen = lies(gameDir);
+ if (!gelesen.ok) return gelesen;
+ const liste = gelesen.server;
+ const treffer = liste.find((s) => s.ip.toLowerCase() === String(ip || '').toLowerCase());
+ if (!treffer) return { ok: false, message: 'Server nicht gefunden.' };
+ if (treffer.name === name) return { ok: true, unveraendert: true };
+ treffer.name = name;
+ return schreibe(gameDir, liste);
+}
+
/*
* Einen Server in eine andere Instanz übertragen – der eigentliche Zweck:
* denselben Server nicht in jeder Instanz neu eintippen zu müssen.
@@ -143,4 +160,4 @@ function uebertrage(zielGameDir, eintrag) {
return fuegeHinzu(zielGameDir, eintrag);
}
-module.exports = { lies, schreibe, fuegeHinzu, entferne, uebertrage, pruefeAdresse, datei };
+module.exports = { lies, schreibe, fuegeHinzu, entferne, benenneUm, uebertrage, pruefeAdresse, datei };
diff --git a/src/services.js b/src/services.js
index d771ce9..43ba32e 100644
--- a/src/services.js
+++ b/src/services.js
@@ -236,6 +236,7 @@ const INHALTSARTEN = {
mod: { projectType: 'mod', ordner: 'mods', label: 'Mods', loaderNoetig: true },
resourcepack: { projectType: 'resourcepack', ordner: 'resourcepacks', label: 'Ressourcenpakete', loaderNoetig: false },
shader: { projectType: 'shader', ordner: 'shaderpacks', label: 'Shader', loaderNoetig: false },
+ modpack: { projectType: 'modpack', ordner: null, label: 'Modpacks', loaderNoetig: false },
};
function inhaltsArt(art) {
@@ -270,8 +271,12 @@ async function modrinthSearch({ query = '', gameVersion = '', loader = '', categ
description: h.description,
author: h.author,
downloads: h.downloads,
+ follows: h.follows || 0,
iconUrl: h.icon_url || '',
categories: h.categories || [],
+ // bei Modpacks hilfreich: welche Spielversionen/Loader das Projekt angibt
+ versions: h.versions || [],
+ displayCategories: h.display_categories || h.categories || [],
})),
};
}
@@ -302,6 +307,38 @@ async function modrinthResolveFile({ projectId, gameVersion, loader, art = 'mod'
};
}
+/*
+ * Neueste passende Modpack-Version von Modrinth.
+ * gameVersion optional – ohne Filter kommt die neueste Version.
+ */
+async function modrinthResolveModpack({ projectId, gameVersion = '' } = {}) {
+ const url = new URL(MODRINTH + '/project/' + projectId + '/version');
+ if (gameVersion) url.searchParams.set('game_versions', JSON.stringify([gameVersion]));
+ const res = await fetch(url, { headers: { 'User-Agent': UA } });
+ if (!res.ok) throw new Error('Modpack-Versionen fehlgeschlagen: HTTP ' + res.status);
+ const versions = await res.json();
+ if (!Array.isArray(versions) || !versions.length) return null;
+ const v = versions[0];
+ const file = (v.files || []).find((f) => f.primary) || (v.files || [])[0];
+ if (!file || !file.url) return null;
+ return {
+ versionId: v.id,
+ versionNumber: v.version_number,
+ name: v.name || v.version_number,
+ filename: file.filename,
+ url: file.url,
+ size: file.size || 0,
+ gameVersions: v.game_versions || [],
+ loaders: v.loaders || [],
+ };
+}
+
+async function downloadBuffer(url, extraHeaders) {
+ const res = await fetch(url, { headers: Object.assign({ 'User-Agent': UA }, extraHeaders || {}) });
+ if (!res.ok) throw new Error('Download fehlgeschlagen: HTTP ' + res.status);
+ return Buffer.from(await res.arrayBuffer());
+}
+
// extraHeaders: z. B. der CurseForge-API-Key, den das CDN seit Juli 2026 verlangt
async function downloadFile(url, destPath, extraHeaders) {
const res = await fetch(url, { headers: Object.assign({ 'User-Agent': UA }, extraHeaders || {}) });
@@ -408,16 +445,42 @@ const STANDARD_TOKEN = String(BUILD_VORGABEN.curseforgeProxyToken || '');
* kein fremdes Kontingent.
* -> { modus, basis, kopfzeilen, downloadAdresse(url) } oder null
*/
+/*
+ * CurseForge kennt zwei Schlüsselarten:
+ * - Klassisch (console.curseforge.com): Header x-api-key, oft $2a$10$…
+ * - Studios / Profil-PAT: Header "Authorization: Key cfc_pat_…"
+ */
+function cfAuthHeaders(apiKey) {
+ let key = String(apiKey || '').trim();
+ if ((key.startsWith('"') && key.endsWith('"')) || (key.startsWith("'") && key.endsWith("'"))) {
+ key = key.slice(1, -1).trim();
+ }
+ key = key.replace(/[\r\n\t]/g, '').trim();
+ // Komplette Kopfzeile eingefügt?
+ const m = key.match(/^authorization\s*:\s*key\s+(.+)$/i);
+ if (m) key = m[1].trim();
+ if (key.toLowerCase().startsWith('key ')) key = key.slice(4).trim();
+
+ if (!key) return null;
+
+ // Neues Studios-Format
+ if (/^cfc_pat_/i.test(key) || /^cf[a-z]_/i.test(key)) {
+ return { key, headers: { Authorization: 'Key ' + key } };
+ }
+ // Klassisch
+ return { key, headers: { 'x-api-key': key } };
+}
+
function curseforgeZugang(settings) {
const s = settings || {};
- const key = String(s.curseforgeApiKey || '').trim();
- if (key) {
+ const auth = cfAuthHeaders(s.curseforgeApiKey);
+ if (auth) {
return {
modus: 'direkt',
basis: CURSEFORGE,
- kopfzeilen: { 'x-api-key': key },
+ kopfzeilen: auth.headers,
downloadAdresse: (url) => url,
- downloadKopfzeilen: { 'x-api-key': key },
+ downloadKopfzeilen: auth.headers,
};
}
const eigeneAdresse = String(s.curseforgeProxyUrl || '').trim().replace(/\/+$/, '');
@@ -451,6 +514,250 @@ function forgeCdnUrl(fileId, fileName) {
return `https://edge.forgecdn.net/files/${s.slice(0, 4)}/${Number(s.slice(4))}/${encodeURIComponent(fileName)}`;
}
+const CF_LOADER = { forge: 1, fabric: 4, quilt: 5, neoforge: 6 };
+const CF_CLASS = { mod: 6, resourcepack: 12, shader: 6552 };
+
+function cfLoaderType(loader) {
+ return CF_LOADER[String(loader || '').toLowerCase()] || 0;
+}
+
+/*
+ * CurseForge-Katalogsuche. Braucht direkten API-Key (modus === 'direkt').
+ * Die Weiterleitung deckt absichtlich nur Dateiauflösung und Download ab.
+ */
+
+/*
+ * Prüft einen API-Key direkt gegen CurseForge (ohne den gespeicherten Stand).
+ * Drei Proben: games, Minecraft, Modsuche – damit man sieht, ob der Key
+ * grundsätzlich gilt oder nur für bestimmte Bereiche fehlt.
+ */
+async function curseforgeTestKey(apiKey) {
+ const auth = cfAuthHeaders(apiKey);
+ if (!auth) {
+ return { ok: false, message: 'Kein API-Key angegeben.' };
+ }
+ const key = auth.key;
+ const headers = Object.assign({ Accept: 'application/json', 'User-Agent': UA }, auth.headers);
+ const proben = [
+ { name: 'games', url: CURSEFORGE + '/games' },
+ { name: 'minecraft', url: CURSEFORGE + '/games/432' },
+ { name: 'suche', url: CURSEFORGE + '/mods/search?gameId=432&classId=6&pageSize=1&index=0' },
+ ];
+ const ergebnisse = [];
+ for (const p of proben) {
+ try {
+ const res = await fetch(p.url, { headers });
+ let text = '';
+ try { text = (await res.text()).replace(/\s+/g, ' ').trim().slice(0, 120); } catch { /* egal */ }
+ ergebnisse.push({ name: p.name, status: res.status, ok: res.ok, text: res.ok ? 'ok' : text });
+ } catch (err) {
+ ergebnisse.push({ name: p.name, status: 0, ok: false, text: err.message });
+ }
+ }
+
+ const alleOk = ergebnisse.every((e) => e.ok);
+ const alle403 = ergebnisse.every((e) => e.status === 401 || e.status === 403);
+ let message;
+ if (alleOk) {
+ message = 'Schlüssel wird akzeptiert – Katalog und Downloads sollten funktionieren.';
+ } else if (alle403) {
+ message = 'CurseForge lehnt diesen Schlüssel ab (HTTP 403/401). Entweder ist er falsch kopiert, '
+ + 'wurde neu erzeugt („Regenerate“ macht den alten ungültig), oder das Organisationskonto '
+ + 'ist bei CurseForge noch nicht für die API freigeschaltet.';
+ } else {
+ const suche = ergebnisse.find((e) => e.name === 'suche');
+ if (suche && !suche.ok && ergebnisse.filter((e) => e.name !== 'suche').every((e) => e.ok)) {
+ message = 'Der Schlüssel gilt grundsätzlich, aber die Modsuche wird abgelehnt. '
+ + 'Für den Katalog wird der Organisationsschlüssel benötigt (nicht nur ein per-game Key).';
+ } else {
+ message = 'Gemischtes Ergebnis: ' + ergebnisse.map((e) => e.name + '=' + e.status).join(', ');
+ }
+ }
+
+ return {
+ ok: alleOk,
+ message,
+ laenge: key.length,
+ beginntMit: key.slice(0, 7),
+ siehtAusWieCurseForge: /^\$2[aby]\$\d{2}\$/.test(key) || /^cfc_pat_/i.test(key),
+ format: /^cfc_pat_/i.test(key) ? 'studios-pat' : (/^\$2[aby]\$/.test(key) ? 'klassisch' : 'unbekannt'),
+ proben: ergebnisse,
+ };
+}
+
+async function curseforgeSearch(zugang, {
+ query = '', gameVersion = '', loader = '', sort = 'popularity',
+ limit = 30, offset = 0, art = 'mod',
+} = {}) {
+ if (!zugang || zugang.modus !== 'direkt') {
+ return {
+ total: 0,
+ hits: [],
+ needKey: true,
+ error: 'Für die CurseForge-Suche brauchst du einen eigenen API-Key in den Netzwerk-Einstellungen. '
+ + 'Die Weiterleitung reicht für Downloads, nicht für den Katalog.',
+ };
+ }
+ const classId = CF_CLASS[art] || CF_CLASS.mod;
+ const url = new URL(CURSEFORGE + '/mods/search');
+ url.searchParams.set('gameId', '432');
+ url.searchParams.set('classId', String(classId));
+ if (query) url.searchParams.set('searchFilter', query);
+ if (gameVersion) url.searchParams.set('gameVersion', gameVersion);
+ const lt = cfLoaderType(loader);
+ // Loader-Filter nur bei Mods sinnvoll
+ if (art === 'mod' && lt) url.searchParams.set('modLoaderType', String(lt));
+ // sortField: 1=Featured 2=Popularity 3=LastUpdated 4=Name 5=Author 6=TotalDownloads
+ const sortMap = { popularity: 2, relevance: 2, downloads: 6, updated: 3, newest: 3, follows: 2 };
+ url.searchParams.set('sortField', String(sortMap[sort] || 2));
+ url.searchParams.set('sortOrder', 'desc');
+ url.searchParams.set('pageSize', String(Math.min(50, limit || 30)));
+ url.searchParams.set('index', String(offset || 0));
+
+ const res = await fetch(url, {
+ headers: Object.assign({
+ Accept: 'application/json',
+ 'User-Agent': UA,
+ }, zugang.kopfzeilen),
+ });
+ if (!res.ok) {
+ let detail = '';
+ try { detail = (await res.text()).replace(/\s+/g, ' ').trim().slice(0, 160); } catch { /* egal */ }
+ if (res.status === 401 || res.status === 403) {
+ return {
+ total: 0,
+ hits: [],
+ needKey: true,
+ error: 'CurseForge lehnt den API-Key ab (HTTP ' + res.status + '). '
+ + 'Bitte unter Optionen → Netzwerk einen gültigen Schlüssel von console.curseforge.com eintragen. '
+ + 'Das Proxy-Token ist kein API-Key.'
+ + (detail ? ' (' + detail + ')' : ''),
+ };
+ }
+ throw new Error('CurseForge-Suche fehlgeschlagen: HTTP ' + res.status + (detail ? ' – ' + detail : ''));
+ }
+ const data = await res.json();
+ const hits = (data.data || []).map((m) => {
+ const author = (m.authors && m.authors[0] && m.authors[0].name) || '';
+ const logo = (m.logo && (m.logo.thumbnailUrl || m.logo.url)) || '';
+ return {
+ projectId: 'cf-' + m.id,
+ cfId: m.id,
+ slug: m.slug,
+ title: m.name,
+ description: m.summary || '',
+ author,
+ downloads: m.downloadCount || 0,
+ iconUrl: logo,
+ categories: (m.categories || []).map((c) => c.name).filter(Boolean),
+ source: 'curseforge',
+ };
+ });
+ const total = (data.pagination && data.pagination.totalCount) || hits.length;
+ return { total, hits };
+}
+
+function cfFileMatches(file, gameVersion, loader, art) {
+ if (!file || file.isAvailable === false) return false;
+ const gvs = file.gameVersions || [];
+ if (gameVersion && !gvs.some((v) => String(v).toLowerCase() === String(gameVersion).toLowerCase())) {
+ // manche Einträge trennen Version und Loader in gameVersions
+ const hasVer = gvs.some((v) => String(v) === gameVersion);
+ if (!hasVer) return false;
+ }
+ if (art === 'mod' && loader && loader !== 'vanilla') {
+ const want = String(loader).toLowerCase();
+ const ok = gvs.some((v) => String(v).toLowerCase() === want)
+ || (file.sortableGameVersions || []).some((s) => {
+ const name = String(s.gameVersionName || s.gameVersion || '').toLowerCase();
+ return name === want;
+ });
+ // Wenn gar kein Loader in den Tags steht, trotzdem erlauben (manche Dateien)
+ const anyLoader = gvs.some((v) => /fabric|forge|quilt|neoforge/i.test(String(v)))
+ || (file.sortableGameVersions || []).some((s) => /fabric|forge|quilt|neoforge/i.test(String(s.gameVersionName || '')));
+ if (anyLoader && !ok) return false;
+ }
+ return true;
+}
+
+async function curseforgePickFile(zugang, modId, gameVersion, loader, art) {
+ if (!zugang || zugang.modus !== 'direkt') {
+ const err = new Error('CurseForge-Dateiauswahl braucht einen eigenen API-Key.');
+ err.code = 'need-key';
+ throw err;
+ }
+ const url = new URL(CURSEFORGE + '/mods/' + modId + '/files');
+ url.searchParams.set('pageSize', '50');
+ url.searchParams.set('index', '0');
+ if (gameVersion) url.searchParams.set('gameVersion', gameVersion);
+ const lt = cfLoaderType(loader);
+ if (art === 'mod' && lt) url.searchParams.set('modLoaderType', String(lt));
+
+ const res = await fetch(url, {
+ headers: Object.assign({ Accept: 'application/json', 'User-Agent': UA }, zugang.kopfzeilen),
+ });
+ if (!res.ok) throw new Error('CurseForge-Dateien fehlgeschlagen: HTTP ' + res.status);
+ const data = await res.json();
+ const files = data.data || [];
+ const match = files.find((f) => cfFileMatches(f, gameVersion, loader, art)) || files[0];
+ if (!match) return null;
+ const name = match.fileName || ('file-' + match.id + '.jar');
+ let dl = match.downloadUrl || null;
+ if (!dl) dl = forgeCdnUrl(match.id, name);
+ return {
+ fileId: match.id,
+ filename: name,
+ url: dl,
+ versionNumber: match.displayName || match.fileName || String(match.id),
+ dependencies: match.dependencies || [],
+ };
+}
+
+async function curseforgeInstall({ zugang, projectId, title, gameVersion, loader, modsDir, art = 'mod' }) {
+ if (!zugang) return { ok: false, message: 'Kein CurseForge-Zugang eingerichtet.' };
+ const rawId = String(projectId || '').replace(/^cf-/, '');
+ const modId = Number(rawId);
+ if (!modId) return { ok: false, message: 'Ungültige CurseForge-Projekt-ID.' };
+
+ const file = await curseforgePickFile(zugang, modId, gameVersion, loader, art);
+ if (!file || !file.url) {
+ return {
+ ok: false,
+ reason: 'no-match',
+ message: `Keine passende Datei für ${gameVersion || '?'} / ${loader || 'any'} gefunden.`,
+ };
+ }
+
+ const dest = path.join(modsDir, file.filename);
+ // Download: direkt mit Key oder über Weiterleitung
+ const url = zugang.downloadAdresse ? zugang.downloadAdresse(file.url) : file.url;
+ const headers = Object.assign({}, zugang.downloadKopfzeilen || {});
+ const bytes = await downloadFile(url, dest, headers);
+
+ // Pflicht-Abhängigkeiten (relationType 3 = RequiredDependency)
+ const depIds = (file.dependencies || [])
+ .filter((d) => d.relationType === 3 && d.modId)
+ .map((d) => d.modId);
+
+ return {
+ ok: true,
+ dependencies: depIds.map((id) => ({ projectId: 'cf-' + id, required: true })),
+ entry: {
+ projectId: 'cf-' + modId,
+ title: title || file.filename,
+ filename: file.filename,
+ versionId: String(file.fileId),
+ versionNumber: file.versionNumber,
+ gameVersion,
+ loader,
+ source: 'curseforge',
+ bytes,
+ },
+ };
+}
+
+
+
/*
* Löst die Dateien eines CurseForge-Modpacks auf.
* zugang: aus curseforgeZugang(); files: [{ projectID, fileID }]
@@ -504,7 +811,7 @@ async function modrinthProjectTitle(projectId) {
module.exports = {
scanJava, probeJava, setCacheDir, setManagedJavaDir, pruefeSpeicher,
getMcVersions,
- modrinthSearch, modrinthResolveFile, modrinthInstall, modrinthProjectTitle,
- modrinthFindUpdates, downloadFile, inhaltsArt, INHALTSARTEN,
- curseforgeResolveFiles, forgeCdnUrl, curseforgeZugang,
+ modrinthSearch, modrinthResolveFile, modrinthResolveModpack, modrinthInstall, modrinthProjectTitle,
+ modrinthFindUpdates, downloadFile, downloadBuffer, inhaltsArt, INHALTSARTEN,
+ curseforgeResolveFiles, curseforgeSearch, curseforgeInstall, curseforgeTestKey, forgeCdnUrl, curseforgeZugang,
};
diff --git a/src/styles.css b/src/styles.css
index 51fdf8f..5c9e11d 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -24,6 +24,7 @@ body{display:grid;grid-template-rows:auto 1fr auto;height:100vh;overflow:hidden}
--text:#e4e4e6; --dim:#9a9aa2;
--sel:#0e639c; --sel-br:#1177bb; --link:#4ea6ff; --accent:#1177bb;
--danger:#e06c6c; --play:#5cb85c;
+ --input:#1e1e1e;
}
:root[data-theme="dark"] body{background:var(--win)}
:root[data-theme="dark"] .search-wrap input,
@@ -65,7 +66,8 @@ body{display:grid;grid-template-rows:auto 1fr auto;height:100vh;overflow:hidden}
:root[data-theme="dark"] .field>span{color:var(--text)}
:root[data-theme="dark"] #btn-console svg{color:#c8c8cc}
:root[data-theme="dark"] .acct-av svg{color:#c8c8cc}
-:root[data-theme="dark"] .mods-filters select{background:#1e1e1e;color:var(--text);border-color:var(--border)}
+:root[data-theme="dark"] .mods-filters select,
+:root[data-theme="dark"] .mods-search select{background:#1e1e1e;color:var(--text);border-color:var(--border)}
:root[data-theme="dark"] .upd-notes{background:#1e1e1e;color:var(--text)}
:root[data-theme="dark"] .modal-close{color:#aaa}
:root[data-theme="dark"] .modal-close:hover{color:#fff}
@@ -160,6 +162,8 @@ body{display:grid;grid-template-rows:auto 1fr auto;height:100vh;overflow:hidden}
/* ---------- Modals ---------- */
.modal{position:fixed;inset:0;background:rgba(0,0,0,.35);display:flex;align-items:center;justify-content:center;z-index:50}
+/* Bestätigungsdialog immer über anderen Dialogen (z. B. Screenshots) */
+#modal-confirm,#modal-prompt{z-index:120}
.modal-card{width:560px;max-width:calc(100vw - 40px);max-height:calc(100vh - 60px);background:#f6f6f6;border:1px solid #a9a9a9;border-radius:4px;box-shadow:0 10px 30px rgba(0,0,0,.3);display:flex;flex-direction:column;overflow:hidden}
.modal-sm{width:420px}.modal-lg{width:820px}
#modal-settings .modal-card{width:960px;max-width:calc(100vw - 32px)}
@@ -224,9 +228,17 @@ body{display:grid;grid-template-rows:auto 1fr auto;height:100vh;overflow:hidden}
/* Mods */
.mods-body{min-height:420px}
.mods-warn{background:#fdecea;border:1px solid #e0b4b0;color:#a5342a;border-radius:3px;padding:10px 12px;margin-bottom:12px}
-.mods-search{display:flex;gap:8px;margin-bottom:10px}
+.mods-search{display:flex;gap:8px;margin-bottom:10px;align-items:stretch}
+.mods-search select{
+ flex:0 0 auto;min-width:140px;max-width:180px;
+ padding:7px 10px;border:1px solid var(--border);border-radius:3px;
+ background:var(--input,#fff);color:var(--text);
+ font-family:inherit;font-size:12px;
+}
+.mods-search select:focus{outline:none;border-color:var(--accent)}
.mods-filters{display:flex;gap:8px;margin-bottom:12px}
.mods-filters select{flex:1;padding:6px 8px;border:1px solid var(--border);border-radius:3px;background:var(--input,#fff);color:var(--text);font-family:inherit;font-size:12px}
+.mods-filters select:focus{outline:none;border-color:var(--accent)}
#m-more{display:block;width:100%;margin-top:8px}
.mods-search input{flex:1;padding:7px 10px;border:1px solid var(--border);border-radius:3px;background:#fff;color:var(--text)}
.mods-search input:focus{outline:none;border-color:var(--accent)}
@@ -311,6 +323,10 @@ img.account-av{object-fit:cover;image-rendering:auto}
.screen-thumb .screen-name{font-size:11px;color:var(--dim);padding:4px 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
.screen-thumb .screen-del{position:absolute;top:4px;right:4px;opacity:0;background:var(--danger);color:#fff;border:none;border-radius:3px;width:24px;height:24px;cursor:pointer}
.screen-thumb:hover .screen-del{opacity:1}
+.screen-thumb.selected{outline:2px solid var(--sel-br);outline-offset:1px;background:var(--sel)}
+.screen-thumb .screen-check{position:absolute;top:4px;left:4px;width:18px;height:18px;margin:0;cursor:pointer;z-index:2}
+.screens-toolbar{display:flex;align-items:center;gap:8px;margin-bottom:10px;flex-wrap:wrap}
+.screens-toolbar .hint{font-size:11px}
.screens-empty{color:var(--dim);text-align:center;padding:30px;grid-column:1/-1}
/* Konsole (dunkel wie ein Log) */