External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-23 12:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'MultiMC:develop' into develop

Browse Source
This commit is contained in:
Sebastian
2021-11-09 12:39:05 -05:00
committed by GitHub
parent 6d22262602 32f9c61c6e
commit 353669dc8a
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/multimc.1.txt
View File

@@ -36,6 +36,8 @@ OPTIONS
*-v, --version*:: *-v, --version*::
Display program version and exit. Display program version and exit.
*-a, --profile*='PROFILE'::
Use the account specified by 'PROFILE' (only valid in combination with --launch).
EXIT STATUS EXIT STATUS
----------- -----------

18
launcher/java/JavaUtils.cpp
View File

@@ -265,12 +265,18 @@ QList<QString> JavaUtils::FindJavaPaths()
QList<JavaInstallPtr> ADOPTOPENJDK64s = this->FindJavaFromRegistryKey( QList<JavaInstallPtr> ADOPTOPENJDK64s = this->FindJavaFromRegistryKey(
KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI"); KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI");
// Adoptium (Eclipse) // Foundation (Eclipse)
QList<JavaInstallPtr> ECLIPSEJDK32s = this->FindJavaFromRegistryKey( QList<JavaInstallPtr> FOUNDATIONJDK32s = this->FindJavaFromRegistryKey(
KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI"); KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI");
QList<JavaInstallPtr> ECLIPSEJDK64s = this->FindJavaFromRegistryKey( QList<JavaInstallPtr> FOUNDATIONJDK64s = this->FindJavaFromRegistryKey(
KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI"); KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI");
// Adoptium (Eclipse)
QList<JavaInstallPtr> ADOPTIUMJDK32s = this->FindJavaFromRegistryKey(
KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI");
QList<JavaInstallPtr> ADOPTIUMJDK64s = this->FindJavaFromRegistryKey(
KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI");
// Microsoft // Microsoft
QList<JavaInstallPtr> MICROSOFTJDK64s = this->FindJavaFromRegistryKey( QList<JavaInstallPtr> MICROSOFTJDK64s = this->FindJavaFromRegistryKey(
KEY_WOW64_64KEY, "SOFTWARE\\Microsoft\\JDK", "Path", "\\hotspot\\MSI"); KEY_WOW64_64KEY, "SOFTWARE\\Microsoft\\JDK", "Path", "\\hotspot\\MSI");
@@ -297,7 +303,8 @@ QList<QString> JavaUtils::FindJavaPaths()
java_candidates.append(JDK64s); java_candidates.append(JDK64s);
java_candidates.append(NEWJDK64s); java_candidates.append(NEWJDK64s);
java_candidates.append(ADOPTOPENJDK64s); java_candidates.append(ADOPTOPENJDK64s);
java_candidates.append(ECLIPSEJDK64s); java_candidates.append(FOUNDATIONJDK64s);
java_candidates.append(ADOPTIUMJDK64s);
java_candidates.append(MICROSOFTJDK64s); java_candidates.append(MICROSOFTJDK64s);
java_candidates.append(ZULU64s); java_candidates.append(ZULU64s);
java_candidates.append(LIBERICA64s); java_candidates.append(LIBERICA64s);
@@ -311,7 +318,8 @@ QList<QString> JavaUtils::FindJavaPaths()
java_candidates.append(JDK32s); java_candidates.append(JDK32s);
java_candidates.append(NEWJDK32s); java_candidates.append(NEWJDK32s);
java_candidates.append(ADOPTOPENJDK32s); java_candidates.append(ADOPTOPENJDK32s);
java_candidates.append(ECLIPSEJDK32s); java_candidates.append(FOUNDATIONJDK32s);
java_candidates.append(ADOPTIUMJDK32s);
java_candidates.append(ZULU32s); java_candidates.append(ZULU32s);
java_candidates.append(LIBERICA32s); java_candidates.append(LIBERICA32s);

11
launcher/package/ubuntu/multimc/usr/share/man/man1/multimc.1
View File

@@ -2,12 +2,12 @@
.\" Title: multimc .\" Title: multimc
.\" Author: [see the "AUTHORS" section] .\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 10/21/2021 .\" Date: 11/07/2021
.\" Manual: \ \& .\" Manual: \ \&
.\" Source: \ \& .\" Source: \ \&
.\" Language: English .\" Language: English
.\" .\"
.TH "MULTIMC" "1" "10/21/2021" "\ \&" "\ \&" .TH "MULTIMC" "1" "11/07/2021" "\ \&" "\ \&"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
@@ -66,6 +66,13 @@ Display help text and exit\&.
.RS 4 .RS 4
Display program version and exit\&. Display program version and exit\&.
.RE .RE
.PP
\fB\-a, \-\-profile\fR=\fIPROFILE\fR
.RS 4
Use the account specified by
\fIPROFILE\fR
(only valid in combination with \-\-launch)\&.
.RE
.SH "EXIT STATUS" .SH "EXIT STATUS"
.PP .PP
\fB0\fR \fB0\fR