From 2b52cf01f5999db4a8b1ea009cb5d24dd4eb4e1c Mon Sep 17 00:00:00 2001
From: Kenneth Chew <kenneth.c0@protonmail.com>
Date: Sat, 14 May 2022 19:51:23 -0400
Subject: [PATCH 1/9] Build Windows installer

---
 .github/workflows/build.yml  |  17 +++-
 program_info/win_install.nsi | 169 +++++++++++++++++++++++++++++++++++
 2 files changed, 185 insertions(+), 1 deletion(-)
 create mode 100644 program_info/win_install.nsi

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0590b348..7ab30d45 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,6 +63,7 @@ jobs:
             ninja:p
             qt5:p
             ccache:p
+            nsis:p
 
       - name: Setup ccache
         if: runner.os != 'Windows' && inputs.build_type == 'Debug'
@@ -100,7 +101,7 @@ jobs:
         run: |
          brew update
          brew install qt@5 ninja
-         
+
       - name: Update Qt (AppImage)
         if: runner.os == 'Linux' && matrix.appimage == true
         run: |
@@ -190,6 +191,13 @@ jobs:
           cp -r ${{ env.INSTALL_DIR }} ${{ env.INSTALL_PORTABLE_DIR }}  # cmake install on Windows is slow, let's just copy instead
           cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable
 
+      - name: Package (Windows, installer)
+        if: runner.os == 'Windows'
+        shell: msys2 {0}
+        run: |
+          cd ${{ env.INSTALL_PORTABLE_DIR }}
+          makensis -NOCD "-DVERSION=${{ env.VERSION }}" "-DMUI_ICON=${{ github.workspace }}/program_info/polymc.ico" "-XOutFile ${{ github.workspace }}/PolyMC-Setup.exe" "${{ github.workspace }}/program_info/win_install.nsi"
+
       - name: Package (Linux)
         if: runner.os == 'Linux' && matrix.appimage != true
         run: |
@@ -257,6 +265,13 @@ jobs:
           name: PolyMC-${{ matrix.name }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: ${{ env.INSTALL_PORTABLE_DIR }}/**
 
+      - name: Upload installer (Windows)
+        if: runner.os == 'Windows'
+        uses: actions/upload-artifact@v3
+        with:
+          name: PolyMC-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}-Setup
+          path: PolyMC-Setup.exe
+
       - name: Upload binary tarball (Linux)
         if: runner.os == 'Linux' && matrix.appimage != true
         uses: actions/upload-artifact@v3
diff --git a/program_info/win_install.nsi b/program_info/win_install.nsi
new file mode 100644
index 00000000..2b0d9760
--- /dev/null
+++ b/program_info/win_install.nsi
@@ -0,0 +1,169 @@
+!define MULTIUSER_EXECUTIONLEVEL Highest
+!define MULTIUSER_MUI
+!define MULTIUSER_INSTALLMODE_COMMANDLINE
+
+!define MULTIUSER_INSTALLMODE_INSTDIR PolyMC
+!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY Software\PolyMC
+!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME InstallDir
+
+!include "FileFunc.nsh"
+!include "MUI2.nsh"
+!include "MultiUser.nsh"
+
+Name "PolyMC"
+RequestExecutionLevel highest
+
+;--------------------------------
+
+; Pages
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MULTIUSER_PAGE_INSTALLMODE
+!define MUI_COMPONENTSPAGE_NODESC
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!define MUI_FINISHPAGE_RUN "$InstDir\polymc.exe"
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+;--------------------------------
+
+; The stuff to install
+Section "PolyMC"
+
+  SectionIn RO
+
+  nsExec::Exec /TIMEOUT=2000 'TaskKill /IM polymc.exe /F'
+
+  SetOutPath $INSTDIR
+
+  File "polymc.exe"
+  File "qt.conf"
+  File *.dll
+  File /r "iconengines"
+  File /r "imageformats"
+  File /r "jars"
+  File /r "platforms"
+  File /r "styles"
+
+  ; Write the installation path into the registry
+  WriteRegStr SHCTX SOFTWARE\PolyMC "InstallDir" "$INSTDIR"
+
+  ; Write the uninstall keys for Windows
+  !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\PolyMC"
+  WriteRegStr SHCTX "${UNINST_KEY}" "DisplayName" "PolyMC"
+  WriteRegStr SHCTX "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\polymc.exe"
+  WriteRegStr SHCTX "${UNINST_KEY}" "UninstallString" '"$INSTDIR\uninstall.exe" /$MultiUser.InstallMode'
+  WriteRegStr SHCTX "${UNINST_KEY}" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /$MultiUser.InstallMode /S'
+  WriteRegStr SHCTX "${UNINST_KEY}" "InstallLocation" "$INSTDIR"
+  WriteRegStr SHCTX "${UNINST_KEY}" "Publisher" "PolyMC Contributors"
+  WriteRegStr SHCTX "${UNINST_KEY}" "ProductVersion" "${VERSION}"
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0
+  WriteRegDWORD SHCTX "${UNINST_KEY}" "EstimatedSize" "$0"
+  WriteRegDWORD SHCTX "${UNINST_KEY}" "NoModify" 1
+  WriteRegDWORD SHCTX "${UNINST_KEY}" "NoRepair" 1
+  WriteUninstaller "$INSTDIR\uninstall.exe"
+
+SectionEnd
+
+Section "Start Menu Shortcuts"
+
+  CreateShortcut "$SMPROGRAMS\PolyMC.lnk" "$INSTDIR\polymc.exe" "" "$INSTDIR\polymc.exe" 0
+
+SectionEnd
+
+Section /o "Portable"
+
+  SetOutPath $INSTDIR
+  File "portable.txt"
+
+SectionEnd
+
+;--------------------------------
+
+; Uninstaller
+
+Section "Uninstall"
+
+  nsExec::Exec /TIMEOUT=2000 'TaskKill /IM polymc.exe /F'
+
+  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\PolyMC"
+  DeleteRegKey SHCTX SOFTWARE\PolyMC
+
+  Delete $INSTDIR\polymc.exe
+  Delete $INSTDIR\uninstall.exe
+  Delete $INSTDIR\portable.txt
+
+  Delete $INSTDIR\libbrotlicommon.dll
+  Delete $INSTDIR\libbrotlidec.dll
+  Delete $INSTDIR\libbz2-1.dll
+  Delete $INSTDIR\libcrypto-1_1-x64.dll
+  Delete $INSTDIR\libcrypto-1_1.dll
+  Delete $INSTDIR\libdouble-conversion.dll
+  Delete $INSTDIR\libfreetype-6.dll
+  Delete $INSTDIR\libgcc_s_seh-1.dll
+  Delete $INSTDIR\libgcc_s_dw2-1.dll
+  Delete $INSTDIR\libglib-2.0-0.dll
+  Delete $INSTDIR\libgraphite2.dll
+  Delete $INSTDIR\libharfbuzz-0.dll
+  Delete $INSTDIR\libiconv-2.dll
+  Delete $INSTDIR\libicudt69.dll
+  Delete $INSTDIR\libicuin69.dll
+  Delete $INSTDIR\libicuuc69.dll
+  Delete $INSTDIR\libintl-8.dll
+  Delete $INSTDIR\libjasper-4.dll
+  Delete $INSTDIR\libjpeg-8.dll
+  Delete $INSTDIR\libmd4c.dll
+  Delete $INSTDIR\libpcre-1.dll
+  Delete $INSTDIR\libpcre2-16-0.dll
+  Delete $INSTDIR\libpng16-16.dll
+  Delete $INSTDIR\libssl-1_1-x64.dll
+  Delete $INSTDIR\libssl-1_1.dll
+  Delete $INSTDIR\libssp-0.dll
+  Delete $INSTDIR\libstdc++-6.dll
+  Delete $INSTDIR\libwebp-7.dll
+  Delete $INSTDIR\libwebpdemux-2.dll
+  Delete $INSTDIR\libwebpmux-3.dll
+  Delete $INSTDIR\libwinpthread-1.dll
+  Delete $INSTDIR\libzstd.dll
+  Delete $INSTDIR\Qt5Core.dll
+  Delete $INSTDIR\Qt5Gui.dll
+  Delete $INSTDIR\Qt5Network.dll
+  Delete $INSTDIR\Qt5Qml.dll
+  Delete $INSTDIR\Qt5QmlModels.dll
+  Delete $INSTDIR\Qt5Quick.dll
+  Delete $INSTDIR\Qt5Svg.dll
+  Delete $INSTDIR\Qt5WebSockets.dll
+  Delete $INSTDIR\Qt5Widgets.dll
+  Delete $INSTDIR\Qt5Xml.dll
+  Delete $INSTDIR\zlib1.dll
+
+  Delete $INSTDIR\qt.conf
+
+  RMDir /r $INSTDIR\iconengines
+  RMDir /r $INSTDIR\imageformats
+  RMDir /r $INSTDIR\jars
+  RMDir /r $INSTDIR\platforms
+  RMDir /r $INSTDIR\styles
+
+  Delete "$SMPROGRAMS\PolyMC.lnk"
+
+  RMDir "$INSTDIR"
+
+SectionEnd
+
+; Multi-user
+
+Function .onInit
+  !insertmacro MULTIUSER_INIT
+FunctionEnd
+
+Function un.onInit
+  !insertmacro MULTIUSER_UNINIT
+FunctionEnd

From 2993318d195812f4b03c703aa9e68aeff941aece Mon Sep 17 00:00:00 2001
From: Kenneth Chew <kenneth.c0@protonmail.com>
Date: Mon, 16 May 2022 15:29:37 -0400
Subject: [PATCH 2/9] Remove admin requirement (no multi-user install option)

---
 program_info/win_install.nsi | 54 +++++++++++++-----------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

diff --git a/program_info/win_install.nsi b/program_info/win_install.nsi
index 2b0d9760..18a1b64e 100644
--- a/program_info/win_install.nsi
+++ b/program_info/win_install.nsi
@@ -1,24 +1,16 @@
-!define MULTIUSER_EXECUTIONLEVEL Highest
-!define MULTIUSER_MUI
-!define MULTIUSER_INSTALLMODE_COMMANDLINE
-
-!define MULTIUSER_INSTALLMODE_INSTDIR PolyMC
-!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY Software\PolyMC
-!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME InstallDir
-
 !include "FileFunc.nsh"
 !include "MUI2.nsh"
-!include "MultiUser.nsh"
 
 Name "PolyMC"
-RequestExecutionLevel highest
+InstallDir "$LOCALAPPDATA\PolyMC"
+InstallDirRegKey HKCU "Software\PolyMC" "InstallDir"
+RequestExecutionLevel user
 
 ;--------------------------------
 
 ; Pages
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MULTIUSER_PAGE_INSTALLMODE
 !define MUI_COMPONENTSPAGE_NODESC
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
@@ -29,6 +21,10 @@ RequestExecutionLevel highest
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
 
+;--------------------------------
+
+; Languages
+
 !insertmacro MUI_LANGUAGE "English"
 
 ;--------------------------------
@@ -52,22 +48,22 @@ Section "PolyMC"
   File /r "styles"
 
   ; Write the installation path into the registry
-  WriteRegStr SHCTX SOFTWARE\PolyMC "InstallDir" "$INSTDIR"
+  WriteRegStr HKCU Software\PolyMC "InstallDir" "$INSTDIR"
 
   ; Write the uninstall keys for Windows
   !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\PolyMC"
-  WriteRegStr SHCTX "${UNINST_KEY}" "DisplayName" "PolyMC"
-  WriteRegStr SHCTX "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\polymc.exe"
-  WriteRegStr SHCTX "${UNINST_KEY}" "UninstallString" '"$INSTDIR\uninstall.exe" /$MultiUser.InstallMode'
-  WriteRegStr SHCTX "${UNINST_KEY}" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /$MultiUser.InstallMode /S'
-  WriteRegStr SHCTX "${UNINST_KEY}" "InstallLocation" "$INSTDIR"
-  WriteRegStr SHCTX "${UNINST_KEY}" "Publisher" "PolyMC Contributors"
-  WriteRegStr SHCTX "${UNINST_KEY}" "ProductVersion" "${VERSION}"
+  WriteRegStr HKCU "${UNINST_KEY}" "DisplayName" "PolyMC"
+  WriteRegStr HKCU "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\polymc.exe"
+  WriteRegStr HKCU "${UNINST_KEY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKCU "${UNINST_KEY}" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /S'
+  WriteRegStr HKCU "${UNINST_KEY}" "InstallLocation" "$INSTDIR"
+  WriteRegStr HKCU "${UNINST_KEY}" "Publisher" "PolyMC Contributors"
+  WriteRegStr HKCU "${UNINST_KEY}" "ProductVersion" "${VERSION}"
   ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
   IntFmt $0 "0x%08X" $0
-  WriteRegDWORD SHCTX "${UNINST_KEY}" "EstimatedSize" "$0"
-  WriteRegDWORD SHCTX "${UNINST_KEY}" "NoModify" 1
-  WriteRegDWORD SHCTX "${UNINST_KEY}" "NoRepair" 1
+  WriteRegDWORD HKCU "${UNINST_KEY}" "EstimatedSize" "$0"
+  WriteRegDWORD HKCU "${UNINST_KEY}" "NoModify" 1
+  WriteRegDWORD HKCU "${UNINST_KEY}" "NoRepair" 1
   WriteUninstaller "$INSTDIR\uninstall.exe"
 
 SectionEnd
@@ -93,8 +89,8 @@ Section "Uninstall"
 
   nsExec::Exec /TIMEOUT=2000 'TaskKill /IM polymc.exe /F'
 
-  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\PolyMC"
-  DeleteRegKey SHCTX SOFTWARE\PolyMC
+  DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\PolyMC"
+  DeleteRegKey HKCU SOFTWARE\PolyMC
 
   Delete $INSTDIR\polymc.exe
   Delete $INSTDIR\uninstall.exe
@@ -157,13 +153,3 @@ Section "Uninstall"
   RMDir "$INSTDIR"
 
 SectionEnd
-
-; Multi-user
-
-Function .onInit
-  !insertmacro MULTIUSER_INIT
-FunctionEnd
-
-Function un.onInit
-  !insertmacro MULTIUSER_UNINIT
-FunctionEnd

From 85ec9d95a43cc884224095477e7321b84d2cc99f Mon Sep 17 00:00:00 2001
From: Kenneth Chew <kenneth.c0@protonmail.com>
Date: Mon, 16 May 2022 19:28:04 -0400
Subject: [PATCH 3/9] Support installer languages other than English

---
 program_info/win_install.nsi | 68 ++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/program_info/win_install.nsi b/program_info/win_install.nsi
index 18a1b64e..ce13b8b0 100644
--- a/program_info/win_install.nsi
+++ b/program_info/win_install.nsi
@@ -1,6 +1,8 @@
 !include "FileFunc.nsh"
 !include "MUI2.nsh"
 
+Unicode true
+
 Name "PolyMC"
 InstallDir "$LOCALAPPDATA\PolyMC"
 InstallDirRegKey HKCU "Software\PolyMC" "InstallDir"
@@ -26,6 +28,72 @@ RequestExecutionLevel user
 ; Languages
 
 !insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "SpanishInternational"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "TradChinese"
+!insertmacro MUI_LANGUAGE "Japanese"
+!insertmacro MUI_LANGUAGE "Korean"
+!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Dutch"
+!insertmacro MUI_LANGUAGE "Danish"
+!insertmacro MUI_LANGUAGE "Swedish"
+!insertmacro MUI_LANGUAGE "Norwegian"
+!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
+!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "Greek"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "Ukrainian"
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Slovak"
+!insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_LANGUAGE "Bulgarian"
+!insertmacro MUI_LANGUAGE "Hungarian"
+!insertmacro MUI_LANGUAGE "Thai"
+!insertmacro MUI_LANGUAGE "Romanian"
+!insertmacro MUI_LANGUAGE "Latvian"
+!insertmacro MUI_LANGUAGE "Macedonian"
+!insertmacro MUI_LANGUAGE "Estonian"
+!insertmacro MUI_LANGUAGE "Turkish"
+!insertmacro MUI_LANGUAGE "Lithuanian"
+!insertmacro MUI_LANGUAGE "Slovenian"
+!insertmacro MUI_LANGUAGE "Serbian"
+!insertmacro MUI_LANGUAGE "SerbianLatin"
+!insertmacro MUI_LANGUAGE "Arabic"
+!insertmacro MUI_LANGUAGE "Farsi"
+!insertmacro MUI_LANGUAGE "Hebrew"
+!insertmacro MUI_LANGUAGE "Indonesian"
+!insertmacro MUI_LANGUAGE "Mongolian"
+!insertmacro MUI_LANGUAGE "Luxembourgish"
+!insertmacro MUI_LANGUAGE "Albanian"
+!insertmacro MUI_LANGUAGE "Breton"
+!insertmacro MUI_LANGUAGE "Belarusian"
+!insertmacro MUI_LANGUAGE "Icelandic"
+!insertmacro MUI_LANGUAGE "Malay"
+!insertmacro MUI_LANGUAGE "Bosnian"
+!insertmacro MUI_LANGUAGE "Kurdish"
+!insertmacro MUI_LANGUAGE "Irish"
+!insertmacro MUI_LANGUAGE "Uzbek"
+!insertmacro MUI_LANGUAGE "Galician"
+!insertmacro MUI_LANGUAGE "Afrikaans"
+!insertmacro MUI_LANGUAGE "Catalan"
+!insertmacro MUI_LANGUAGE "Esperanto"
+!insertmacro MUI_LANGUAGE "Asturian"
+!insertmacro MUI_LANGUAGE "Basque"
+!insertmacro MUI_LANGUAGE "Pashto"
+!insertmacro MUI_LANGUAGE "ScotsGaelic"
+!insertmacro MUI_LANGUAGE "Georgian"
+!insertmacro MUI_LANGUAGE "Vietnamese"
+!insertmacro MUI_LANGUAGE "Welsh"
+!insertmacro MUI_LANGUAGE "Armenian"
+!insertmacro MUI_LANGUAGE "Corsican"
+!insertmacro MUI_LANGUAGE "Tatar"
+!insertmacro MUI_LANGUAGE "Hindi"
 
 ;--------------------------------
 

From cbc8c1aed63e9cd106b468ae720aa650beec646a Mon Sep 17 00:00:00 2001
From: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
Date: Fri, 20 May 2022 15:56:13 -0400
Subject: [PATCH 4/9] Use consistent naming scheme

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ab30d45..d12f176c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -269,7 +269,7 @@ jobs:
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v3
         with:
-          name: PolyMC-${{ matrix.name }}-${{ env.VERSION }}-${{ inputs.build_type }}-Setup
+          name: PolyMC-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PolyMC-Setup.exe
 
       - name: Upload binary tarball (Linux)

From 2bc6da038dea701699ba9fc46eb68b3a74d5f488 Mon Sep 17 00:00:00 2001
From: Kenneth Chew <kenneth.c0@protonmail.com>
Date: Fri, 20 May 2022 17:09:26 -0400
Subject: [PATCH 5/9] Add installer to release workflow

---
 .github/workflows/trigger_release.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
index ff0d2b3f..91cd0474 100644
--- a/.github/workflows/trigger_release.yml
+++ b/.github/workflows/trigger_release.yml
@@ -43,10 +43,12 @@ jobs:
           for d in PolyMC-Windows-*; do
             cd "${d}" || continue
             ARCH="$(echo -n ${d} | cut -d '-' -f 3)"
+            INST="$(echo -n ${d} | grep -o Setup || true)"
             PORT="$(echo -n ${d} | grep -o Portable || true)"
             NAME="PolyMC-Windows-${ARCH}"
             test -z "${PORT}" || NAME="${NAME}-Portable"
-            zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
+            test -z "${INST}" || mv PolyMC-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
+            test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
             cd ..
           done
 
@@ -66,7 +68,9 @@ jobs:
             PolyMC-Linux-${{ env.VERSION }}-x86_64.AppImage
             PolyMC-Windows-i686-${{ env.VERSION }}.zip
             PolyMC-Windows-i686-Portable-${{ env.VERSION }}.zip
+            PolyMC-Windows-i686-Setup-${{ env.VERSION }}.exe
             PolyMC-Windows-x86_64-${{ env.VERSION }}.zip
             PolyMC-Windows-x86_64-Portable-${{ env.VERSION }}.zip
+            PolyMC-Windows-x86_64-Setup-${{ env.VERSION }}.exe
             PolyMC-macOS-${{ env.VERSION }}.tar.gz
             PolyMC-${{ env.VERSION }}.tar.gz

From 12cadf3af0a4e3a01330283fae2d6267d3c3f525 Mon Sep 17 00:00:00 2001
From: Kenneth Chew <kenneth.c0@protonmail.com>
Date: Fri, 20 May 2022 17:09:42 -0400
Subject: [PATCH 6/9] Add `/NoUninstaller` parameter for Windows installer

---
 program_info/win_install.nsi | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/program_info/win_install.nsi b/program_info/win_install.nsi
index ce13b8b0..2d3f0f57 100644
--- a/program_info/win_install.nsi
+++ b/program_info/win_install.nsi
@@ -1,4 +1,5 @@
 !include "FileFunc.nsh"
+!include "LogicLib.nsh"
 !include "MUI2.nsh"
 
 Unicode true
@@ -119,20 +120,24 @@ Section "PolyMC"
   WriteRegStr HKCU Software\PolyMC "InstallDir" "$INSTDIR"
 
   ; Write the uninstall keys for Windows
-  !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\PolyMC"
-  WriteRegStr HKCU "${UNINST_KEY}" "DisplayName" "PolyMC"
-  WriteRegStr HKCU "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\polymc.exe"
-  WriteRegStr HKCU "${UNINST_KEY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
-  WriteRegStr HKCU "${UNINST_KEY}" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /S'
-  WriteRegStr HKCU "${UNINST_KEY}" "InstallLocation" "$INSTDIR"
-  WriteRegStr HKCU "${UNINST_KEY}" "Publisher" "PolyMC Contributors"
-  WriteRegStr HKCU "${UNINST_KEY}" "ProductVersion" "${VERSION}"
-  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
-  IntFmt $0 "0x%08X" $0
-  WriteRegDWORD HKCU "${UNINST_KEY}" "EstimatedSize" "$0"
-  WriteRegDWORD HKCU "${UNINST_KEY}" "NoModify" 1
-  WriteRegDWORD HKCU "${UNINST_KEY}" "NoRepair" 1
-  WriteUninstaller "$INSTDIR\uninstall.exe"
+  ${GetParameters} $R0
+  ${GetOptions} $R0 "/NoUninstaller" $R1
+  ${If} ${Errors}
+    !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\PolyMC"
+    WriteRegStr HKCU "${UNINST_KEY}" "DisplayName" "PolyMC"
+    WriteRegStr HKCU "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\polymc.exe"
+    WriteRegStr HKCU "${UNINST_KEY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+    WriteRegStr HKCU "${UNINST_KEY}" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /S'
+    WriteRegStr HKCU "${UNINST_KEY}" "InstallLocation" "$INSTDIR"
+    WriteRegStr HKCU "${UNINST_KEY}" "Publisher" "PolyMC Contributors"
+    WriteRegStr HKCU "${UNINST_KEY}" "ProductVersion" "${VERSION}"
+    ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+    IntFmt $0 "0x%08X" $0
+    WriteRegDWORD HKCU "${UNINST_KEY}" "EstimatedSize" "$0"
+    WriteRegDWORD HKCU "${UNINST_KEY}" "NoModify" 1
+    WriteRegDWORD HKCU "${UNINST_KEY}" "NoRepair" 1
+    WriteUninstaller "$INSTDIR\uninstall.exe"
+  ${EndIf}
 
 SectionEnd
 

From cdd83c279cafdacee6c863d7fb0ae94a6bf34e3e Mon Sep 17 00:00:00 2001
From: Kenneth Chew <kenneth.c0@protonmail.com>
Date: Fri, 20 May 2022 17:12:08 -0400
Subject: [PATCH 7/9] Remove portable option in Windows installer

---
 .github/workflows/build.yml  | 2 +-
 program_info/win_install.nsi | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d12f176c..53db7d76 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -195,7 +195,7 @@ jobs:
         if: runner.os == 'Windows'
         shell: msys2 {0}
         run: |
-          cd ${{ env.INSTALL_PORTABLE_DIR }}
+          cd ${{ env.INSTALL_DIR }}
           makensis -NOCD "-DVERSION=${{ env.VERSION }}" "-DMUI_ICON=${{ github.workspace }}/program_info/polymc.ico" "-XOutFile ${{ github.workspace }}/PolyMC-Setup.exe" "${{ github.workspace }}/program_info/win_install.nsi"
 
       - name: Package (Linux)
diff --git a/program_info/win_install.nsi b/program_info/win_install.nsi
index 2d3f0f57..a47d4ae3 100644
--- a/program_info/win_install.nsi
+++ b/program_info/win_install.nsi
@@ -147,13 +147,6 @@ Section "Start Menu Shortcuts"
 
 SectionEnd
 
-Section /o "Portable"
-
-  SetOutPath $INSTDIR
-  File "portable.txt"
-
-SectionEnd
-
 ;--------------------------------
 
 ; Uninstaller

From 1ec7878c07a8ba7d04a9fe860761872547fd5a0d Mon Sep 17 00:00:00 2001
From: Kenneth Chew <kenneth.c0@protonmail.com>
Date: Fri, 20 May 2022 17:22:30 -0400
Subject: [PATCH 8/9] Add `/NoShortcuts` parameter for Windows installer

---
 program_info/win_install.nsi | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/program_info/win_install.nsi b/program_info/win_install.nsi
index a47d4ae3..7d48ccf2 100644
--- a/program_info/win_install.nsi
+++ b/program_info/win_install.nsi
@@ -141,7 +141,7 @@ Section "PolyMC"
 
 SectionEnd
 
-Section "Start Menu Shortcuts"
+Section "Start Menu Shortcuts" SHORTCUTS
 
   CreateShortcut "$SMPROGRAMS\PolyMC.lnk" "$INSTDIR\polymc.exe" "" "$INSTDIR\polymc.exe" 0
 
@@ -219,3 +219,15 @@ Section "Uninstall"
   RMDir "$INSTDIR"
 
 SectionEnd
+
+;--------------------------------
+
+; Extra command line parameters
+
+Function .onInit
+${GetParameters} $R0
+${GetOptions} $R0 "/NoShortcuts" $R1
+${IfNot} ${Errors}
+  !insertmacro UnselectSection ${SHORTCUTS}
+${EndIf}
+FunctionEnd

From 3cab0e69f1c299e385330d97ab5159a0c8c904ec Mon Sep 17 00:00:00 2001
From: Kenneth Chew <kenneth.c0@protonmail.com>
Date: Fri, 20 May 2022 17:23:11 -0400
Subject: [PATCH 9/9] Fix default install location

---
 program_info/win_install.nsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/program_info/win_install.nsi b/program_info/win_install.nsi
index 7d48ccf2..4ca4de1a 100644
--- a/program_info/win_install.nsi
+++ b/program_info/win_install.nsi
@@ -5,7 +5,7 @@
 Unicode true
 
 Name "PolyMC"
-InstallDir "$LOCALAPPDATA\PolyMC"
+InstallDir "$LOCALAPPDATA\Programs\PolyMC"
 InstallDirRegKey HKCU "Software\PolyMC" "InstallDir"
 RequestExecutionLevel user