commodore
/
sandboxels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #120 from GGodPL/main 

elementsManager and betterModManager bug fixes
This commit is contained in:
slweeb 2023-08-01 16:51:29 -04:00 committed by GitHub
parent 7256aab393 18980f8da8
commit 989ac0d3da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/betterModManager.js
View File

@ -126,8 +126,8 @@ if (enabledMods.includes("mods/betterMenuScreens.js")) {
modManagerUrl.value = ""; modManagerUrl.value = "";
showingMenu = false; showingMenu = false;
}, },
onClose: showModManager, onClose: () => {showModManager();},
loader: updateModManager loader: () => {updateModManager();}
} }
} else { } else {
closeMenu = function() { closeMenu = function() {

7
mods/elementsManager.js
View File

@ -397,6 +397,9 @@ if (enabledMods.includes(mod)) {
} }
const parseColor = (colorString) => { 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(")) { if (colorString.startsWith("rgb(")) {
const color = colorString.replace("rgb(", "").replace(")", ""); const color = colorString.replace("rgb(", "").replace(")", "");
return `#${color.split(",").map(a => parseInt(a).toString(16)).join("")}`; return `#${color.split(",").map(a => parseInt(a).toString(16)).join("")}`;
@ -603,7 +606,7 @@ if (enabledMods.includes(mod)) {
el.onchange = (ev) => { el.onchange = (ev) => {
const elementData = Storage.get("newElement", {}); const elementData = Storage.get("newElement", {});
if (prop.type == "number") elementData[prop.name] = parseFloat(ev.target.value); 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; else if (prop.type == "string") elementData[prop.name] = ev.target.value;
Storage.set("newElement", elementData); Storage.set("newElement", elementData);
} }
@ -984,11 +987,9 @@ if (enabledMods.includes(mod)) {
elementData[prop.name] = "POWDER_OLD"; elementData[prop.name] = "POWDER_OLD";
} else { } else {
el.setAttribute("value", default_[prop.type]); el.setAttribute("value", default_[prop.type]);
elementData[prop.name] = default_[prop.type];
} }
if (prop.type == "boolean") { if (prop.type == "boolean") {
el.setAttribute("state", "0") el.setAttribute("state", "0")
elementData[prop.name] = false;
} }
} }
} }