Finish of ModGUI on init

eaglerforge · Sep 18, 2024 · a355bb4 · a355bb4
1 parent 6aa2451
commit a355bb4
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 7 deletions.
diff --git a/injector.js b/injector.js
@@ -238,7 +238,6 @@ document.querySelector("#giveme").addEventListener("click", () => {
     ) {
         return;
     }
-
     // @type File
     var file = document.querySelector("input").files[0];
     var fileType = file.name.split(".");
@@ -259,7 +258,6 @@ document.querySelector("#givemeserver").addEventListener("click", () => {
     ) {
         return;
     }
-
     // @type File
     var file = document.querySelector("input").files[0];
     var fileType = file.name.split(".");

diff --git a/modgui.injector.js b/modgui.injector.js
@@ -42,7 +42,7 @@ globalThis.modapi_guikit = `// ModAPI GUI made by TheIdiotPlays
         <button class="button" onclick="window.modapi_uploadmod()">Upload Mod (.js)</button>
         <button class="button" onclick="window.modapi_addmod()">Add Mod From URL</button>
         <button class="button" style="text-shadow: 0px 0px 10px rgba(255, 0, 0, 0.5)" onclick="window.modapi_clearmods()">Clear All Mods</button>
-        <button class="button" onclick="this.parentElement.parentElement.remove(); main();">Done</button>
+        <button class="button _doneButton" onclick="this.parentElement.parentElement.remove();">Done</button>
       </div>
 
       <span>(reload to apply changes)</span>
@@ -168,7 +168,7 @@ globalThis.modapi_guikit = `// ModAPI GUI made by TheIdiotPlays
       fr.readAsDataURL(file);
     });
   }
-  window.modapi_displayModGui = async function () {
+  window.modapi_displayModGui = async function (cb) {
     if (!getMods) {
       return;
     }
@@ -248,7 +248,19 @@ globalThis.modapi_guikit = `// ModAPI GUI made by TheIdiotPlays
       tr.appendChild(button);
       tbody.appendChild(tr);
     });
+    var once = false;
+    if (cb) {
+      document.querySelector("#modapi_gui_container ._doneButton").addEventListener("mousedown", ()=>{
+        if (once) {
+          return;
+        }
+        once = true;
+        cb();
+        document.querySelector("#modapi_gui_container").remove();
+      })
+    }
   }
+  
   window.modapi_clearmods = async () => {
     await resetMods();
     window.modapi_displayModGui();
@@ -277,4 +289,5 @@ globalThis.modapi_guikit = `// ModAPI GUI made by TheIdiotPlays
     });
     f.click();
   }
-})();`;
+})();
+`;
diff --git a/modgui.js b/modgui.js
@@ -42,7 +42,7 @@
         <button class="button" onclick="window.modapi_uploadmod()">Upload Mod (.js)</button>
         <button class="button" onclick="window.modapi_addmod()">Add Mod From URL</button>
         <button class="button" style="text-shadow: 0px 0px 10px rgba(255, 0, 0, 0.5)" onclick="window.modapi_clearmods()">Clear All Mods</button>
-        <button class="button" onclick="this.parentElement.parentElement.remove(); main();">Done</button>
+        <button class="button _doneButton" onclick="this.parentElement.parentElement.remove();">Done</button>
       </div>
 
       <span>(reload to apply changes)</span>
@@ -168,7 +168,7 @@
       fr.readAsDataURL(file);
     });
   }
-  window.modapi_displayModGui = async function () {
+  window.modapi_displayModGui = async function (cb) {
     if (!getMods) {
       return;
     }
@@ -248,7 +248,19 @@
       tr.appendChild(button);
       tbody.appendChild(tr);
     });
+    var once = false;
+    if (cb) {
+      document.querySelector("#modapi_gui_container ._doneButton").addEventListener("mousedown", ()=>{
+        if (once) {
+          return;
+        }
+        once = true;
+        cb();
+        document.querySelector("#modapi_gui_container").remove();
+      })
+    }
   }
+
   window.modapi_clearmods = async () => {
     await resetMods();
     window.modapi_displayModGui();

diff --git a/postinit.injector.js b/postinit.injector.js
@@ -749,4 +749,13 @@ globalThis.modapi_postinit = `(() => {
         var x = originalCrashMethod.apply(this, args);
         return x;
     }
+    var inited = false;
+    const originalMainMethod = ModAPI.hooks.methods[ModAPI.util.getMethodFromPackage("net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain", "_main")];
+    ModAPI.hooks.methods[ModAPI.util.getMethodFromPackage("net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain", "_main")] = function (...args) {
+        if (!inited) {
+            return modapi_displayModGui(originalMainMethod);
+        } else {
+            return originalMainMethod.apply(this, args);
+        }
+    }
 })();`;
diff --git a/postinit.js b/postinit.js
@@ -749,4 +749,14 @@
         var x = originalCrashMethod.apply(this, args);
         return x;
     }
+    var inited = false;
+    const originalMainMethod = ModAPI.hooks.methods[ModAPI.util.getMethodFromPackage("net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain", "_main")];
+    ModAPI.hooks.methods[ModAPI.util.getMethodFromPackage("net.lax1dude.eaglercraft.v1_8.internal.teavm.ClientMain", "_main")] = function (...args) {
+        if (!inited) {
+            inited = true;
+            return modapi_displayModGui(globalThis.main);
+        } else {
+            return originalMainMethod.apply(this, args);
+        }
+    }
 })();