Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,17 @@ public class ActualLoadingScreen {

private static boolean enableMemoryDisplay = true;

private static String getGameVersion() {
try {
return FabricLoader.getInstance()
.getModContainer("minecraft")
.map(c -> c.getMetadata().getVersion().getFriendlyString())
.orElse(null);
} catch (Throwable ignored) {
return null;
}
}

public static void startLoadingScreen(boolean fabricReady) {
final Path gameDir = fabricReady ? FabricLoader.getInstance().getGameDir() : Paths.get(".").toAbsolutePath();
final Path runDir = gameDir.resolve(".cache/mod-loading-screen");
Expand Down Expand Up @@ -176,7 +187,9 @@ public static void startLoadingScreen(boolean fabricReady) {
if (fabricReady) {
setFabricTitle();
} else {
dialog.setTitle(runningOnQuilt ? "Loading Quilt Loader" : "Loading Fabric Loader");
final String loaderName = runningOnQuilt ? "Quilt Loader" : "Fabric Loader";
final String gameVersion = getGameVersion();
dialog.setTitle(gameVersion != null ? "Loading " + loaderName + ' ' + gameVersion : "Loading " + loaderName);
}
dialog.setResizable(false);

Expand Down Expand Up @@ -283,12 +296,18 @@ public static void setTitleFromMetadata(String id, String name, String version)
}

private static void setFabricTitle() {
final String gameVersion = getGameVersion();
final String loaderName = runningOnQuilt ? "Quilt" : "Fabric";
for (final ModContainer container : FabricLoader.getInstance().getAllMods()) {
final ModMetadata m = container.getMetadata();
if (!m.getType().equals("builtin")) continue;
setTitleFromMetadata(m.getId(), m.getName(), m.getVersion().getFriendlyString());
if (titleSet) break;
}
if (!titleSet && gameVersion != null) {
titleSet = true;
setTitle("Loading " + loaderName + ' ' + gameVersion);
}
}

private static void setTitle(String title) {
Expand Down Expand Up @@ -598,4 +617,4 @@ public static void main(String[] args) {
}
close();
}
}
}