22
33import com .github .kd_gaming1 .packcore .command .PackCoreCommands ;
44import com .github .kd_gaming1 .packcore .config .PackCoreConfig ;
5+ import com .github .kd_gaming1 .packcore .util .diagnostics .DiagnosticsCollector ;
56import com .github .kd_gaming1 .packcore .gui .screen .PackCoreTitleScreen ;
67import com .github .kd_gaming1 .packcore .gui .screen .SBETitleScreen ;
78import com .github .kd_gaming1 .packcore .gui .screen .WelcomeWizardScreen ;
2324import java .nio .file .Path ;
2425
2526public class PackCore implements ClientModInitializer {
27+
2628 public static final String MOD_ID = "packcore" ;
2729 public static final Logger LOGGER = LoggerFactory .getLogger (MOD_ID );
28-
29- public static final Path PACKCORE_DIR = FabricLoader .getInstance ().getGameDir ().resolve ("packcore" );
30+ public static final Path PACKCORE_DIR =
31+ FabricLoader .getInstance ().getGameDir ().resolve ("packcore" );
3032
3133 public static boolean migratedFromV3 = false ;
3234 private static boolean replacingTitleScreen = false ;
3335
3436 @ Override
3537 public void onInitializeClient () {
36- LOGGER .info ("[PackCore] Initialized" );
38+ LOGGER .info ("[PackCore] Initialized\n {}" , DiagnosticsCollector . buildFullReport () );
3739
3840 RamWarningHelper .init ();
3941 UpdateChecker .checkAsync ();
4042
41- ClientCommandRegistrationCallback .EVENT .register ((dispatcher , registryAccess ) -> PackCoreCommands .register (dispatcher ));
43+ ClientCommandRegistrationCallback .EVENT .register (
44+ (dispatcher , registryAccess ) -> PackCoreCommands .register (dispatcher ));
4245
4346 ScreenEvents .BEFORE_INIT .register ((client , screen , scaledWidth , scaledHeight ) -> {
44- if (!(screen instanceof TitleScreen )) return ;
45- if (screen instanceof PackCoreTitleScreen ) return ;
46-
47+ if (!(screen instanceof TitleScreen ) || screen instanceof PackCoreTitleScreen ) return ;
4748 RamWarningHelper .onMainMenu ();
48-
4949 if (PackCoreConfig .menuStyle != PackCoreConfig .MenuStyle .MINIMAL ) {
5050 scheduleConfiguredTitleScreen (client , screen );
5151 }
5252 });
5353
5454 ScreenEvents .AFTER_INIT .register ((client , screen , scaledWidth , scaledHeight ) -> {
55- if (!(screen instanceof TitleScreen )) return ;
56- if (screen instanceof PackCoreTitleScreen ) return ;
55+ if (!(screen instanceof TitleScreen ) || screen instanceof PackCoreTitleScreen ) return ;
5756 if (!PackCoreConfig .successfulWelcomeWizard ) return ;
5857 if (PackCoreConfig .menuStyle != PackCoreConfig .MenuStyle .MINIMAL ) return ;
59-
6058 PackCoreTitleScreen .decorateExisting ((TitleScreen ) screen , scaledWidth , scaledHeight );
6159 });
6260
63- ClientPlayConnectionEvents .JOIN .register ((handler , sender , client ) -> client .execute (RamWarningHelper ::onWorldJoin ));
61+ ClientPlayConnectionEvents .JOIN .register (
62+ (handler , sender , client ) -> client .execute (RamWarningHelper ::onWorldJoin ));
6463
6564 ClientLifecycleEvents .CLIENT_STARTED .register (client -> PlaytimeTracker .onSessionStart ());
6665 ClientLifecycleEvents .CLIENT_STOPPING .register (client -> PlaytimeTracker .onSessionEnd ());
6766 }
6867
6968 private static void scheduleConfiguredTitleScreen (Minecraft client , Screen screen ) {
70- if (!(screen instanceof TitleScreen ) || screen instanceof PackCoreTitleScreen || replacingTitleScreen ) return ;
71-
69+ if (replacingTitleScreen ) return ;
7270 replacingTitleScreen = true ;
7371 client .execute (() -> {
7472 try {
7573 if (client .screen != screen ) return ;
76-
7774 if (!PackCoreConfig .successfulWelcomeWizard ) {
7875 client .setScreen (new WelcomeWizardScreen (screen ));
7976 return ;
8077 }
81-
8278 switch (PackCoreConfig .menuStyle ) {
83- case MODERN -> client .setScreen (new SBETitleScreen ());
79+ case MODERN -> client .setScreen (new SBETitleScreen ());
8480 case MODERN_MINIMAL -> client .setScreen (new SBETitleScreen (false ));
85- case MINIMAL -> client .setScreen (new PackCoreTitleScreen ());
81+ case MINIMAL -> client .setScreen (new PackCoreTitleScreen ());
8682 }
8783 } finally {
8884 replacingTitleScreen = false ;
8985 }
9086 });
9187 }
92- }
88+ }
0 commit comments