Merge branch 'main' into enabledmods

1 files changed, 12 insertions, 4 deletions

diff --git a/src/index.js b/src/index.js
index 3f50840..a06cf69 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,7 +8,7 @@ const events = new Emitter();
 
 const utils = require("./utils");
 const cli = require("./cli");
-const requests = require("./requests");
+const requests = require("./extras/requests");
 
 // Starts the actual BrowserWindow, which is only run when using the
 // GUI, for the CLI this function is never called.
@@ -43,9 +43,13 @@ function start() {
 
 	ipcMain.on("exit", () => {process.exit(0)})
 	ipcMain.on("minimize", () => {win.minimize()})
+	ipcMain.on("installfromurl", (event, url) => {utils.mods.installFromURL(url)})
 	ipcMain.on("winLog", (event, ...args) => {win.webContents.send("log", ...args)});
 	ipcMain.on("winAlert", (event, ...args) => {win.webContents.send("alert", ...args)});
 	ipcMain.on("ns-update-event", (event) => win.webContents.send("ns-update-event", event));
+	ipcMain.on("failedmod", (event, modname) => {win.webContents.send("failedmod", modname)});
+	ipcMain.on("removedmod", (event, modname) => {win.webContents.send("removedmod", modname)});
+	ipcMain.on("installedmod", (event, modname) => {win.webContents.send("installedmod", modname)});
 	ipcMain.on("guigetmods", (event, ...args) => {win.webContents.send("mods", utils.mods.list())});
 
 	win.webContents.on("dom-ready", () => {
@@ -87,9 +91,13 @@ ipcMain.on("launchVanilla", (event) => {utils.launch("vanilla")})
 ipcMain.on("update", (event) => {utils.update()})
 ipcMain.on("setpathcli", (event) => {utils.setpath()});
 ipcMain.on("setpath", (event, value) => {
-	if (!value) {
-		utils.setpath(win);
-	} else if (!win.isVisible()) {
+	if (! value) {
+		if (! win.isVisible()) {
+			utils.setpath(win);
+		} else {
+			utils.setpath(win, true);
+		}
+	} else if (! win.isVisible()) {
 		win.show();
 	}
 });