Merge 1.18 into 1.19.2

embeddedt · embeddedt · commit 7552199f5eb9 · 2023-08-18T14:39:24.000-04:00
diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java
@@ -23,7 +23,7 @@ public class BootstrapMixin {
     @Inject(method = "bootStrap", at = @At("HEAD"))
     private static void doModernFixBootstrap(CallbackInfo ci) {
         if(!isBootstrapped) {
-            LOGGER.info("ModernFix reached bootstrap stage ({} after launch)", TimeFormatter.formatNanos(ManagementFactory.getRuntimeMXBean().getUptime() * 1000L));
+            LOGGER.info("ModernFix reached bootstrap stage ({} after launch)", TimeFormatter.formatNanos(ManagementFactory.getRuntimeMXBean().getUptime() * 1000L * 1000L));
             ModWorkManagerQueue.replace();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class BootstrapMixin {`
`23`	`23`	`@Inject(method = "bootStrap", at = @At("HEAD"))`
`24`	`24`	`private static void doModernFixBootstrap(CallbackInfo ci) {`
`25`	`25`	`if(!isBootstrapped) {`
`26`		`- LOGGER.info("ModernFix reached bootstrap stage ({} after launch)", TimeFormatter.formatNanos(ManagementFactory.getRuntimeMXBean().getUptime() * 1000L));`
	`26`	`+ LOGGER.info("ModernFix reached bootstrap stage ({} after launch)", TimeFormatter.formatNanos(ManagementFactory.getRuntimeMXBean().getUptime() * 1000L * 1000L));`
`27`	`27`	`ModWorkManagerQueue.replace();`
`28`	`28`	`}`
`29`	`29`	`}`