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

Merge 1.20 into 1.21

Browse Source
This commit is contained in:
embeddedt 2024-07-07 09:14:46 -04:00
commit d7bfeedc62
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/java/org/embeddedt/modernfix/world/IntegratedWatchdog.java
View File

@ -45,6 +45,7 @@ public class IntegratedWatchdog extends Thread {
if(delta > MAX_TICK_DELTA) { if(delta > MAX_TICK_DELTA) {
LOGGER.error("A single server tick has taken {}, more than {} milliseconds", delta, MAX_TICK_DELTA); LOGGER.error("A single server tick has taken {}, more than {} milliseconds", delta, MAX_TICK_DELTA);
LOGGER.error(ThreadDumper.obtainThreadDump()); LOGGER.error(ThreadDumper.obtainThreadDump());
delta = 0;
} }
try { try {
Thread.sleep(MAX_TICK_DELTA - delta); Thread.sleep(MAX_TICK_DELTA - delta);

2
neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java
View File

@ -25,7 +25,6 @@ import org.apache.commons.lang3.tuple.Pair;
import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFix;
import org.embeddedt.modernfix.core.ModernFixMixinPlugin; import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
import org.embeddedt.modernfix.neoforge.ModernFixConfig; import org.embeddedt.modernfix.neoforge.ModernFixConfig;
import org.embeddedt.modernfix.neoforge.classloading.ClassLoadHack;
import org.embeddedt.modernfix.neoforge.classloading.ModFileScanDataDeduplicator; import org.embeddedt.modernfix.neoforge.classloading.ModFileScanDataDeduplicator;
import org.embeddedt.modernfix.neoforge.config.NightConfigFixer; import org.embeddedt.modernfix.neoforge.config.NightConfigFixer;
@ -47,7 +46,6 @@ public class ModernFixForge {
} }
modContainer.registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG); modContainer.registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG);
ModFileScanDataDeduplicator.deduplicate(); ModFileScanDataDeduplicator.deduplicate();
ClassLoadHack.loadModClasses();
//ConfigFixer.replaceConfigHandlers(); //ConfigFixer.replaceConfigHandlers();
} }