From 45d7fe07a5f39330f29f180b9ae934b587c4f3aa Mon Sep 17 00:00:00 2001
From: Joey Eamigh <55670930+JoeyEamigh@users.noreply.github.com>
Date: Thu, 22 Jun 2023 00:27:49 -0400
Subject: [PATCH] more windows tomfoolery

---
 client/client.ps1 | 18 ++----------------
 client/client.py  |  2 +-
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/client/client.ps1 b/client/client.ps1
index 0461693..5ea4cd7 100755
--- a/client/client.ps1
+++ b/client/client.ps1
@@ -4,31 +4,17 @@ $winget = Get-Command winget -ErrorAction SilentlyContinue
 if (!$winget) {
   Write-Host "Error: winget is not installed." -Foreground Red
   Write-Host "This script probably will not work without winget." -Foreground Red
-  Write-Host "Run 'Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe' in to install winget." -Foreground Red
+  Write-Host "Run 'Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe' and then search for 'App Installer' on the Microsoft Store to install winget." -Foreground Red
   Write-Host "If you do install winget, this script should handle the rest." -Foreground Red
 }
 
-# Check that python is installed
-if (-not (Get-Command "python" -ErrorAction SilentlyContinue)) {
-  Write-Host "Error: python is not installed." -Foreground Red
-
-  if ($winget) {
-    Write-Host "Attempting to install python."
-    (winget install --id=Python.Python.3.11  -e) | Out-Null
-  }
-  else {
-    Write-Host "Please install python to continue." -Foreground Red
-    exit 1
-  }
-}
-
 # Check that java is installed
 if (-not (Get-Command "C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot\bin\java" -ErrorAction SilentlyContinue)) {
   Write-Host "Error: java is not installed." -Foreground Red
 
   if ($winget) {
     Write-Host "Attempting to install java."
-    (winget install AdoptOpenJDK.OpenJDK.11) | Out-Null
+    winget install AdoptOpenJDK.OpenJDK.11
   }
   else {
     Write-Host "Please install java to continue." -Foreground Red
diff --git a/client/client.py b/client/client.py
index 0fab366..1f375d9 100644
--- a/client/client.py
+++ b/client/client.py
@@ -25,7 +25,7 @@ if OS == "linux":
     INSTANCE_DIR = f"{MULTIMC_DIR}/instances/FishPogPixelmon"
 
 if OS == "win32":
-    MULTIMC_PARENT_DIR = f"{os.getenv('APPDATA')}\\FishPog"
+    MULTIMC_PARENT_DIR = f"C:\\Users\\{os.getlogin()}\\AppData\\Roaming\\FishPog"
     MULTIMC_DIR = f"{MULTIMC_PARENT_DIR}\\MultiMC"
     INSTANCE_DIR = f"{MULTIMC_DIR}\\instances\\FishPogPixelmon"