mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-07-03 03:18:46 +00:00
Code Issues Projects Releases Wiki Activity

hotfix:Generate Java Version 21 Error in logs

Browse Source
This commit is contained in:
TacoGS 2024-05-17 21:52:46 -03:00
parent d4247bf3ae
commit bb04cb09a3
No known key found for this signature in database
GPG Key ID: CD50EBB3F0B91B50
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/minecraft/VersionFilterData.cpp
View File

@ -69,6 +69,7 @@ VersionFilterData::VersionFilterData()
java8BeginsDate = timeFromS3Time("2017-03-30T09:32:19+00:00");
java16BeginsDate = timeFromS3Time("2021-05-12T11:19:15+00:00");
java17BeginsDate = timeFromS3Time("2021-11-16T17:04:48+00:00");
java21BeginsDate = timeFromS3Time("2024-04-03T11:49:39+00:00");
quickPlayBeginsDate = timeFromS3Time("2023-04-05T12:05:17+00:00");
liteLoaderEndsDate = timeFromS3Time("2017-09-18T08:39:46+00:00");
fabricBeginsDate = timeFromS3Time("2019-04-23T14:52:44+00:00");

2
launcher/minecraft/VersionFilterData.h
View File

@ -27,6 +27,8 @@ struct VersionFilterData
QDateTime java16BeginsDate;
// release data of first version to require Java 17 (1.18 Pre Release 2)
QDateTime java17BeginsDate;
// Release data of the first version to require java 21 (24w14a)
QDateTime java21BeginsDate;
// release date of first version to use --quickPlayMultiplayer instead of --server/--port for directly joining servers
QDateTime quickPlayBeginsDate;
// release date of last version to support LiteLoader (1.12.2)

9
launcher/minecraft/launch/VerifyJavaInstall.cpp
View File

@ -34,6 +34,15 @@ void VerifyJavaInstall::executeTask() {
auto javaVersion = m_inst->getJavaVersion();
auto minecraftComponent = m_inst->getPackProfile()->getComponent("net.minecraft");
// Java 21 Requirement
if (minecraftComponent->getReleaseDateTime() >= g_VersionFilterData.java21BeginsDate) {
if (javaVersion.major() < 21) {
emit logLine("Minecraft 24w14a and above require the use of Java 21",
MessageLevel::Fatal);
emitFailed(tr("Minecraft 24w14a and above require the use of Java 21"));
return;
}
}
// Java 17 requirement
if (minecraftComponent->getReleaseDateTime() >= g_VersionFilterData.java17BeginsDate) {
if (javaVersion.major() < 17) {