R3944Realms/ModernFix-fix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move auditing to happen later in launch

Browse Source
This commit is contained in:
embeddedt 2026-04-11 14:19:22 -04:00
parent 5acb5115b9
commit 438ceb1984
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/embeddedt/modernfix/ModernFix.java
View File

@ -12,6 +12,7 @@ import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
import org.embeddedt.modernfix.platform.ModernFixPlatformHooks; import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
import org.embeddedt.modernfix.resources.ReloadExecutor; import org.embeddedt.modernfix.resources.ReloadExecutor;
import org.embeddedt.modernfix.util.ClassInfoManager; import org.embeddedt.modernfix.util.ClassInfoManager;
import org.spongepowered.asm.mixin.MixinEnvironment;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
@ -45,6 +46,15 @@ public class ModernFix {
return resourceReloadService; return resourceReloadService;
} }
public static void runAuditIfRequested() {
boolean auditAndExit = Boolean.getBoolean("modernfix.auditAndExit");
if (auditAndExit || Boolean.getBoolean("modernfix.auditMixinsAtStart")) {
MixinEnvironment.getCurrentEnvironment().audit();
if (auditAndExit) {
System.exit(0);
}
}
}
public ModernFix() { public ModernFix() {
INSTANCE = this; INSTANCE = this;

8
src/main/java/org/embeddedt/modernfix/common/mixin/core/BootstrapMixin.java
View File

@ -8,7 +8,6 @@ import org.embeddedt.modernfix.forge.load.ModWorkManagerQueue;
import org.embeddedt.modernfix.util.TimeFormatter; import org.embeddedt.modernfix.util.TimeFormatter;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.MixinEnvironment;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@ -28,13 +27,6 @@ public class BootstrapMixin {
LOGGER.info("ModernFix reached bootstrap stage ({} after launch)", TimeFormatter.formatNanos(ManagementFactory.getRuntimeMXBean().getUptime() * 1000L * 1000L)); LOGGER.info("ModernFix reached bootstrap stage ({} after launch)", TimeFormatter.formatNanos(ManagementFactory.getRuntimeMXBean().getUptime() * 1000L * 1000L));
ModWorkManagerQueue.replace(); ModWorkManagerQueue.replace();
ManifestCompactor.compactManifests(); ManifestCompactor.compactManifests();
boolean auditAndExit = Boolean.getBoolean("modernfix.auditAndExit");
if (auditAndExit || Boolean.getBoolean("modernfix.auditMixinsAtStart")) {
MixinEnvironment.getCurrentEnvironment().audit();
if (auditAndExit) {
System.exit(0);
}
}
} }
} }

1
src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java
View File

@ -129,6 +129,7 @@ public class ModernFixForge {
} }
ObjectHolderClearer.clearThrowables(); ObjectHolderClearer.clearThrowables();
event.enqueueWork(ObjectHolderClearer::removeRedundantHolders); event.enqueueWork(ObjectHolderClearer::removeRedundantHolders);
event.enqueueWork(ModernFix::runAuditIfRequested);
} }
@SubscribeEvent(priority = EventPriority.LOWEST) @SubscribeEvent(priority = EventPriority.LOWEST)
public void onServerDead(ServerStoppedEvent event) { public void onServerDead(ServerStoppedEvent event) {