Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge b840479258 into 958d400ff5

Browse Source
This commit is contained in:
Даниїл Григор'єв 2024-05-27 18:13:27 -05:00 committed by GitHub
commit 230014857d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 78 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
electron/index.js
View File

@ -347,17 +347,24 @@ ipcMain.handle("open-mods-folder", async () => {
console.log("Loading mods ..."); console.log("Loading mods ...");
function loadMods() { /**
* Scans the mods directory (unless in safe mode) and --load-mod argument.
* @returns {string[]} Array of absolute paths of mod files
*/
function scanMods() {
if (safeMode) { if (safeMode) {
console.log("Safe Mode enabled for mods, skipping mod search"); console.log("Safe Mode enabled for mods, skipping mod search");
} else {
console.log("Scanning mods from", modsPath);
} }
console.log("Loading mods from", modsPath);
let modFiles = safeMode let modFiles = [];
? [] if (!safeMode) {
: fs modFiles = fs
.readdirSync(modsPath) .readdirSync(modsPath)
.filter(filename => filename.endsWith(".js")) .filter(filename => filename.endsWith(".js"))
.map(filename => path.join(modsPath, filename)); .map(filename => path.join(modsPath, filename));
}
if (externalMod) { if (externalMod) {
console.log("Adding external mod source:", externalMod); console.log("Adding external mod source:", externalMod);
@ -365,25 +372,37 @@ function loadMods() {
modFiles = modFiles.concat(externalModPaths); modFiles = modFiles.concat(externalModPaths);
} }
return modFiles.map(filename => fs.readFileSync(filename, "utf8")); return modFiles;
} }
let mods = []; /**
try { * Loads the specified mod files from the file system and returns their source
mods = loadMods(); * code.
console.log("Loaded", mods.length, "mods"); * @param {string[]} files Absolute file paths of mods to load.
} catch (ex) { */
console.error("Failed to load mods"); function loadMods(files = []) {
dialog.showErrorBox("Failed to load mods:", ex); return files.map(filename => fs.readFileSync(filename, "utf8"));
} }
const modFiles = scanMods();
ipcMain.handle("get-mods", async () => { ipcMain.handle("get-mods", async () => {
let mods = [];
try {
mods = loadMods(modFiles);
console.log("Loaded", mods.length, "mods");
} catch (ex) {
console.error("Failed to load mods");
dialog.showErrorBox("Failed to load mods:", ex);
}
return mods; return mods;
}); });
steam.init(isDev); steam.init(isDev);
// Only allow achievements and puzzle DLC if no mods are loaded // Only allow achievements and puzzle DLC if no mods are loaded
if (mods.length === 0) { if (modFiles.length === 0) {
steam.listen(); steam.listen();
} }

52
electron_gog/index.js
View File

@ -346,17 +346,24 @@ ipcMain.handle("open-mods-folder", async () => {
console.log("Loading mods ..."); console.log("Loading mods ...");
function loadMods() { /**
* Scans the mods directory (unless in safe mode) and --load-mod argument.
* @returns {string[]} Array of absolute paths of mod files
*/
function scanMods() {
if (safeMode) { if (safeMode) {
console.log("Safe Mode enabled for mods, skipping mod search"); console.log("Safe Mode enabled for mods, skipping mod search");
} else {
console.log("Scanning mods from", modsPath);
} }
console.log("Loading mods from", modsPath);
let modFiles = safeMode let modFiles = [];
? [] if (!safeMode) {
: fs modFiles = fs
.readdirSync(modsPath) .readdirSync(modsPath)
.filter(filename => filename.endsWith(".js")) .filter(filename => filename.endsWith(".js"))
.map(filename => path.join(modsPath, filename)); .map(filename => path.join(modsPath, filename));
}
if (externalMod) { if (externalMod) {
console.log("Adding external mod source:", externalMod); console.log("Adding external mod source:", externalMod);
@ -364,18 +371,37 @@ function loadMods() {
modFiles = modFiles.concat(externalModPaths); modFiles = modFiles.concat(externalModPaths);
} }
return modFiles.map(filename => fs.readFileSync(filename, "utf8")); return modFiles;
} }
let mods = []; /**
try { * Loads the specified mod files from the file system and returns their source
mods = loadMods(); * code.
console.log("Loaded", mods.length, "mods"); * @param {string[]} files Absolute file paths of mods to load.
} catch (ex) { */
console.error("Failed to load mods"); function loadMods(files = []) {
dialog.showErrorBox("Failed to load mods:", ex); return files.map(filename => fs.readFileSync(filename, "utf8"));
} }
const modFiles = scanMods();
ipcMain.handle("get-mods", async () => { ipcMain.handle("get-mods", async () => {
let mods = [];
try {
mods = loadMods(modFiles);
console.log("Loaded", mods.length, "mods");
} catch (ex) {
console.error("Failed to load mods");
dialog.showErrorBox("Failed to load mods:", ex);
}
return mods; return mods;
}); });
steam.init(isDev);
// Only allow achievements and puzzle DLC if no mods are loaded
if (modFiles.length === 0) {
steam.listen();
}