aboutsummaryrefslogtreecommitdiff
path: root/launcher/java
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-10-18 00:47:02 +0200
committerPetr Mrázek <peterix@gmail.com>2021-10-21 00:47:53 +0200
commit5b3dffce62f7e4c00436adeca33c5f2fc4a21db4 (patch)
tree01a0eb2d994a9b0622697a6dbb124966692e692a /launcher/java
parent297d4b4196c9bd1d9c4dd422dd88aaec620038d6 (diff)
downloadPrismLauncher-5b3dffce62f7e4c00436adeca33c5f2fc4a21db4.tar.gz
PrismLauncher-5b3dffce62f7e4c00436adeca33c5f2fc4a21db4.tar.bz2
PrismLauncher-5b3dffce62f7e4c00436adeca33c5f2fc4a21db4.zip
NOISSUE continue debranding...
Diffstat (limited to 'launcher/java')
-rw-r--r--launcher/java/launch/CheckJava.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/launcher/java/launch/CheckJava.cpp b/launcher/java/launch/CheckJava.cpp
index f58602f0..fb338231 100644
--- a/launcher/java/launch/CheckJava.cpp
+++ b/launcher/java/launch/CheckJava.cpp
@@ -48,7 +48,7 @@ void CheckJava::executeTask()
}
else
{
- emit logLine("Java path is:\n" + m_javaPath + "\n\n", MessageLevel::MultiMC);
+ emit logLine("Java path is:\n" + m_javaPath + "\n\n", MessageLevel::Launcher);
}
QFileInfo javaInfo(realJavaPath);
@@ -62,7 +62,7 @@ void CheckJava::executeTask()
if (javaUnixTime != storedUnixTime || storedVersion.size() == 0 || storedArchitecture.size() == 0 || storedVendor.size() == 0)
{
m_JavaChecker = new JavaChecker();
- emit logLine(QString("Checking Java version..."), MessageLevel::MultiMC);
+ emit logLine(QString("Checking Java version..."), MessageLevel::Launcher);
connect(m_JavaChecker.get(), &JavaChecker::checkFinished, this, &CheckJava::checkJavaFinished);
m_JavaChecker->m_path = realJavaPath;
m_JavaChecker->performCheck();
@@ -87,7 +87,7 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
// Error message displayed if java can't start
emit logLine(QString("Could not start java:"), MessageLevel::Error);
emit logLines(result.errorLog.split('\n'), MessageLevel::Error);
- emit logLine("\nCheck your MultiMC Java settings.", MessageLevel::MultiMC);
+ emit logLine("\nCheck your MultiMC Java settings.", MessageLevel::Launcher);
printSystemInfo(false, false);
emitFailed(QString("Could not start java!"));
return;
@@ -96,7 +96,7 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
{
emit logLine(QString("Java checker returned some invalid data MultiMC doesn't understand:"), MessageLevel::Error);
emit logLines(result.outLog.split('\n'), MessageLevel::Warning);
- emit logLine("\nMinecraft might not start properly.", MessageLevel::MultiMC);
+ emit logLine("\nMinecraft might not start properly.", MessageLevel::Launcher);
printSystemInfo(false, false);
emitSucceeded();
return;
@@ -117,7 +117,7 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
void CheckJava::printJavaInfo(const QString& version, const QString& architecture, const QString & vendor)
{
- emit logLine(QString("Java is version %1, using %2-bit architecture, from %3.\n\n").arg(version, architecture, vendor), MessageLevel::MultiMC);
+ emit logLine(QString("Java is version %1, using %2-bit architecture, from %3.\n\n").arg(version, architecture, vendor), MessageLevel::Launcher);
printSystemInfo(true, architecture == "64");
}