From 93c902cc78172985d3dab213a6800bf0b13a23b1 Mon Sep 17 00:00:00 2001 From: GGodPL <46885632+GGodPL@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:46:07 +0200 Subject: [PATCH 1/3] elementsManager fix --- mods/elementsManager.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mods/elementsManager.js b/mods/elementsManager.js index 194e1285..c067222a 100644 --- a/mods/elementsManager.js +++ b/mods/elementsManager.js @@ -397,6 +397,7 @@ if (enabledMods.includes(mod)) { } const parseColor = (colorString) => { + if (typeof colorString != "string") return "#ffffff"; if (colorString.startsWith("rgb(")) { const color = colorString.replace("rgb(", "").replace(")", ""); return `#${color.split(",").map(a => parseInt(a).toString(16)).join("")}`; @@ -603,7 +604,7 @@ if (enabledMods.includes(mod)) { el.onchange = (ev) => { const elementData = Storage.get("newElement", {}); if (prop.type == "number") elementData[prop.name] = parseFloat(ev.target.value); - else if (prop.type == "color" || prop.type[0] == "color") elementData[prop.name] = hexToRGB(ev.target.value); + else if (prop.type == "color" || prop.type[0] == "color") elementData[prop.name] = parseColor(ev.target.value); else if (prop.type == "string") elementData[prop.name] = ev.target.value; Storage.set("newElement", elementData); } @@ -984,11 +985,9 @@ if (enabledMods.includes(mod)) { elementData[prop.name] = "POWDER_OLD"; } else { el.setAttribute("value", default_[prop.type]); - elementData[prop.name] = default_[prop.type]; } if (prop.type == "boolean") { el.setAttribute("state", "0") - elementData[prop.name] = false; } } } From 0048a99dfcb871adb27defad8d4dbf344129b50c Mon Sep 17 00:00:00 2001 From: GGodPL <46885632+GGodPL@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:46:57 +0200 Subject: [PATCH 2/3] betterModManager fix --- mods/betterModManager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/betterModManager.js b/mods/betterModManager.js index 2f517c59..548fd7ff 100644 --- a/mods/betterModManager.js +++ b/mods/betterModManager.js @@ -126,8 +126,8 @@ if (enabledMods.includes("mods/betterMenuScreens.js")) { modManagerUrl.value = ""; showingMenu = false; }, - onClose: showModManager, - loader: updateModManager + onClose: () => {showModManager();}, + loader: () => {updateModManager();} } } else { closeMenu = function() { From 18980f8da899ba2fc1c8c153f57c81cfcc60d504 Mon Sep 17 00:00:00 2001 From: GGodPL <46885632+GGodPL@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:50:09 +0200 Subject: [PATCH 3/3] Update elementsManager.js --- mods/elementsManager.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/elementsManager.js b/mods/elementsManager.js index c067222a..781f593a 100644 --- a/mods/elementsManager.js +++ b/mods/elementsManager.js @@ -397,6 +397,8 @@ if (enabledMods.includes(mod)) { } const parseColor = (colorString) => { + // technically color arrays are handled differently, but ill add it just in case + if (colorString instanceof Array) return parseColor(colorString[0]); if (typeof colorString != "string") return "#ffffff"; if (colorString.startsWith("rgb(")) { const color = colorString.replace("rgb(", "").replace(")", "");