From 06607684789872fbc19009faba4e12dcccb9d493 Mon Sep 17 00:00:00 2001
From: Owen Wang <owenwang2007@icloud.com>
Date: Sun, 7 Nov 2021 21:35:43 -0500
Subject: [PATCH 1/2] GH-4200 Search Eclipse Foundation and Adoptium in
 Registry

---
 launcher/java/JavaUtils.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index c00ee710..d0adf92b 100644
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@@ -265,12 +265,18 @@ QList<QString> JavaUtils::FindJavaPaths()
     QList<JavaInstallPtr> ADOPTOPENJDK64s = this->FindJavaFromRegistryKey(
         KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI");
 
-    // Adoptium (Eclipse)
-    QList<JavaInstallPtr> ECLIPSEJDK32s = this->FindJavaFromRegistryKey(
+    // Foundation (Eclipse)
+    QList<JavaInstallPtr> FOUNDATIONJDK32s = this->FindJavaFromRegistryKey(
         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");
 
+    // 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
     QList<JavaInstallPtr> MICROSOFTJDK64s = this->FindJavaFromRegistryKey(
         KEY_WOW64_64KEY, "SOFTWARE\\Microsoft\\JDK", "Path", "\\hotspot\\MSI");
@@ -297,7 +303,8 @@ QList<QString> JavaUtils::FindJavaPaths()
     java_candidates.append(JDK64s);
     java_candidates.append(NEWJDK64s);
     java_candidates.append(ADOPTOPENJDK64s);
-    java_candidates.append(ECLIPSEJDK64s);
+    java_candidates.append(FOUNDATIONJDK64s);
+    java_candidates.append(ADOPTIUMJDK64s);
     java_candidates.append(MICROSOFTJDK64s);
     java_candidates.append(ZULU64s);
     java_candidates.append(LIBERICA64s);
@@ -311,7 +318,8 @@ QList<QString> JavaUtils::FindJavaPaths()
     java_candidates.append(JDK32s);
     java_candidates.append(NEWJDK32s);
     java_candidates.append(ADOPTOPENJDK32s);
-    java_candidates.append(ECLIPSEJDK32s);
+    java_candidates.append(FOUNDATIONJDK32s);
+    java_candidates.append(ADOPTIUMJDK32s);
     java_candidates.append(ZULU32s);
     java_candidates.append(LIBERICA32s);
     

From 9ccce62f50b10e3ff7fd4bddcd1d19a09f4c9041 Mon Sep 17 00:00:00 2001
From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com>
Date: Sun, 7 Nov 2021 20:48:15 -0800
Subject: [PATCH 2/2] NOISSUE Update manpage to include new `-a / --profile`
 option.

---
 doc/multimc.1.txt                                     |  2 ++
 .../ubuntu/multimc/usr/share/man/man1/multimc.1       | 11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/doc/multimc.1.txt b/doc/multimc.1.txt
index eaf77f8f..da65af2e 100644
--- a/doc/multimc.1.txt
+++ b/doc/multimc.1.txt
@@ -36,6 +36,8 @@ OPTIONS
 
 *-v, --version*::
     Display program version and exit.
+*-a, --profile*='PROFILE'::
+    Use the account specified by 'PROFILE' (only valid in combination with --launch).
 
 EXIT STATUS
 -----------
diff --git a/launcher/package/ubuntu/multimc/usr/share/man/man1/multimc.1 b/launcher/package/ubuntu/multimc/usr/share/man/man1/multimc.1
index b2031aa9..b4af25e3 100644
--- a/launcher/package/ubuntu/multimc/usr/share/man/man1/multimc.1
+++ b/launcher/package/ubuntu/multimc/usr/share/man/man1/multimc.1
@@ -2,12 +2,12 @@
 .\"     Title: multimc
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 10/21/2021
+.\"      Date: 11/07/2021
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "MULTIMC" "1" "10/21/2021" "\ \&" "\ \&"
+.TH "MULTIMC" "1" "11/07/2021" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -66,6 +66,13 @@ Display help text and exit\&.
 .RS 4
 Display program version and exit\&.
 .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"
 .PP
 \fB0\fR