Merge pull request #105 from eaglerforge/main

small patch ver for fixes in server & core
This commit is contained in:
ZXMushroom63 2025-05-09 22:03:45 +08:00 committed by GitHub
commit 9dfb7d8631
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 33 deletions

View File

@ -1,3 +1,26 @@
var assets = {
modapi_guikit: null,
modapi_postinit: null,
modapi_modloader: null,
PatchesRegistry: null,
EFServer: null,
minify: null
};
if (globalThis.process) {
assets.modapi_guikit = require("./modgui").modapi_guikit;
assets.modapi_postinit = require("./postinit").modapi_postinit;
assets.modapi_modloader = require("./modloader").modapi_modloader;
assets.PatchesRegistry = require("./patches").PatchesRegistry;
assets.EFServer = require("./efserver").EFServer;
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;
}
var modapi_preinit = `globalThis.ModAPI ||= {};
ModAPI.hooks ||= {};
ModAPI.hooks.freezeCallstack = false;
@ -14,7 +37,7 @@ var modapi_preinit = `globalThis.ModAPI ||= {};
`;
var freezeCallstack = `if(ModAPI.hooks.freezeCallstack){return false};`;
const EFIConfig = {
ModAPIVersion: "v2.7.91", //also change in package.json
ModAPIVersion: "v2.7.92", //also change in package.json
doEaglerforge: true,
verbose: false,
doServerExtras: false,
@ -105,29 +128,6 @@ function entriesToStaticVariableProxy(entries, prefix, clinitList) {
return proxy;
}
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) {
assets.modapi_guikit = require("./modgui").modapi_guikit;
assets.modapi_postinit = require("./postinit").modapi_postinit;
assets.modapi_modloader = require("./modloader").modapi_modloader;
assets.PatchesRegistry = require("./patches").PatchesRegistry;
assets.EFServer = require("./efserver").EFServer;
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;
}
_status("Running EaglerForgeInjector " + EFIConfig.ModAPIVersion);
if (string.includes("__eaglerforgeinjector_installation_flag__")) {
backgroundLog("Detected input containing EFI installation flag.", true);
@ -370,7 +370,7 @@ var main;(function(){`
_status("Shrinking file...");
await wait(50);
if (globalThis.process) {
let _minify = require("./minify").minify;
let _minify = assets.minify;
patchedFile = await _minify(patchedFile, parser, EFIConfig);
} else {
patchedFile = await minify(patchedFile, parser, EFIConfig);
@ -419,13 +419,7 @@ async function patchClient(string, parser) {
}
if (EFIConfig.doServerExtras) {
var efserv = null;
if (!globalThis.process) {
efserv = require("./efserver").EFServer;
} else {
efserv = EFServer;
}
patchedFile = patchedFile.replace(`{"._|_libserverside_|_."}`, `(${EFServer.toString()})()`);
patchedFile = patchedFile.replace(`{"._|_libserverside_|_."}`, `(${assets.EFServer.toString()})()`);
backgroundLog("[EFSERVER] Injecting libserverside corelib");
patchedFile = patchedFile.replace("<title>EFI", "<title>EF Server");
backgroundLog("[EFSERVER] Patching title");

View File

@ -1,6 +1,6 @@
{
"name": "eaglerforgeinjector",
"version": "2.7.91",
"version": "2.7.92",
"description": "Advanced modding API injector for unminified, unobfuscated, unsigned eaglercraft builds.",
"main": "node.js",
"directories": {