mirror of
https://github.com/eaglerforge/EaglerForgeInjector
synced 2025-07-22 21:51:17 -09:00
fix more bugs
This commit is contained in:
parent
b0b5a469a4
commit
6349a7e2e9
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
node_modules
|
node_modules
|
||||||
EaglercraftX_1.8_Offline_en_US.html
|
EaglercraftX_1.8_Offline_en_US.html
|
||||||
processed.html
|
processed.html
|
||||||
|
1.12.html
|
46
core/core.js
46
core/core.js
@ -105,13 +105,28 @@ function entriesToStaticVariableProxy(entries, prefix, clinitList) {
|
|||||||
return proxy;
|
return proxy;
|
||||||
}
|
}
|
||||||
async function processClasses(string, parser) {
|
async function processClasses(string, parser) {
|
||||||
|
var assets = {
|
||||||
|
modapi_guikit: null,
|
||||||
|
modapi_postinit: null,
|
||||||
|
modapi_modloader: null,
|
||||||
|
PatchesRegistry: null,
|
||||||
|
EFServer: null,
|
||||||
|
minify: null
|
||||||
|
};
|
||||||
if (globalThis.process) {
|
if (globalThis.process) {
|
||||||
var { modapi_guikit } = require("./modgui");
|
assets.modapi_guikit = require("./modgui").modapi_guikit;
|
||||||
var { modapi_postinit } = require("./postinit");
|
assets.modapi_postinit = require("./postinit").modapi_postinit;
|
||||||
var { modapi_modloader } = require("./modloader");
|
assets.modapi_modloader = require("./modloader").modapi_modloader;
|
||||||
var { PatchesRegistry } = require("./patches");
|
assets.PatchesRegistry = require("./patches").PatchesRegistry;
|
||||||
var { EFServer } = require("./efserver");
|
assets.EFServer = require("./efserver").EFServer;
|
||||||
var { minify } = require("./minify");
|
assets.minify = require("./minify").minify;
|
||||||
|
} else {
|
||||||
|
assets.PatchesRegistry = PatchesRegistry;
|
||||||
|
assets.minify = minify;
|
||||||
|
assets.EFServer = EFServer;
|
||||||
|
assets.modapi_postinit = modapi_postinit;
|
||||||
|
assets.modapi_modloader = modapi_modloader;
|
||||||
|
assets.modapi_guikit = modapi_guikit;
|
||||||
}
|
}
|
||||||
if (string.includes("__eaglerforgeinjector_installation_flag__")) {
|
if (string.includes("__eaglerforgeinjector_installation_flag__")) {
|
||||||
backgroundLog("Detected input containing EFI installation flag.", true);
|
backgroundLog("Detected input containing EFI installation flag.", true);
|
||||||
@ -348,7 +363,7 @@ var main;(function(){`
|
|||||||
|
|
||||||
_status("Applying bonus patches from patch registry...");
|
_status("Applying bonus patches from patch registry...");
|
||||||
await wait(50);
|
await wait(50);
|
||||||
patchedFile = PatchesRegistry.patchFile(patchedFile);
|
patchedFile = assets.PatchesRegistry.patchFile(patchedFile);
|
||||||
|
|
||||||
if (EFIConfig.doMinify) {
|
if (EFIConfig.doMinify) {
|
||||||
_status("Shrinking file...");
|
_status("Shrinking file...");
|
||||||
@ -363,11 +378,11 @@ var main;(function(){`
|
|||||||
patchedFile = patchedFile.replace(
|
patchedFile = patchedFile.replace(
|
||||||
` id="game_frame">`,
|
` id="game_frame">`,
|
||||||
` id="game_frame">
|
` id="game_frame">
|
||||||
\<script id="modapi_patchesreg_events"\>${PatchesRegistry.getEventInjectorCode()};\<\/script\>
|
\<script id="modapi_patchesreg_events"\>${assets.PatchesRegistry.getEventInjectorCode()};\<\/script\>
|
||||||
\<script id="modapi_postinit"\>${modapi_postinit.replace("__modapi_version_code__", EFIConfig.ModAPIVersion)}\<\/script\>
|
\<script id="modapi_postinit"\>${assets.modapi_postinit.replace("__modapi_version_code__", EFIConfig.ModAPIVersion)}\<\/script\>
|
||||||
\<script id="modapi_modloader"\>${modapi_modloader}\<\/script\>
|
\<script id="modapi_modloader"\>${assets.modapi_modloader}\<\/script\>
|
||||||
\<script id="modapi_guikit"\>${modapi_guikit}\<\/script\>
|
\<script id="modapi_guikit"\>${assets.modapi_guikit}\<\/script\>
|
||||||
\<script id="modapi_postinit_data"\>globalThis.modapi_postinit = \`${modapi_postinit.replaceAll("\\", "\\\\")}\`\<\/script\>
|
\<script id="modapi_postinit_data"\>globalThis.modapi_postinit = \`${assets.modapi_postinit.replaceAll("\\", "\\\\")}\`\<\/script\>
|
||||||
\<script id="libserverside"\>{"._|_libserverside_|_."}\<\/script\>
|
\<script id="libserverside"\>{"._|_libserverside_|_."}\<\/script\>
|
||||||
\<script id="__eaglerforgeinjector_installation_flag__"\>console.log("Thank you for using EaglerForge!");\<\/script\>`
|
\<script id="__eaglerforgeinjector_installation_flag__"\>console.log("Thank you for using EaglerForge!");\<\/script\>`
|
||||||
);
|
);
|
||||||
@ -396,8 +411,11 @@ async function patchClient(string, parser) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (EFIConfig.doServerExtras) {
|
if (EFIConfig.doServerExtras) {
|
||||||
if (!EFServer) {
|
var efserv = null;
|
||||||
var { EFServer } = require("./efserver");
|
if (!globalThis.process) {
|
||||||
|
efserv = require("./efserver").EFServer;
|
||||||
|
} else {
|
||||||
|
efserv = EFServer;
|
||||||
}
|
}
|
||||||
patchedFile = patchedFile.replace(`{"._|_libserverside_|_."}`, `(${EFServer.toString()})()`);
|
patchedFile = patchedFile.replace(`{"._|_libserverside_|_."}`, `(${EFServer.toString()})()`);
|
||||||
backgroundLog("[EFSERVER] Injecting libserverside corelib");
|
backgroundLog("[EFSERVER] Injecting libserverside corelib");
|
||||||
|
@ -154,6 +154,8 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- Code assets -->
|
<!-- Code assets -->
|
||||||
|
<script src="core/patches.js"></script>
|
||||||
|
<script src="core/minify.js"></script>
|
||||||
<script src="core/postinit.js"></script>
|
<script src="core/postinit.js"></script>
|
||||||
<script src="core/modloader.js"></script>
|
<script src="core/modloader.js"></script>
|
||||||
<script src="core/modgui.js"></script>
|
<script src="core/modgui.js"></script>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user