Update 0.4

Finally. Took long enough. Changelog will be made soon.

Author: calmilamsy

launcher.py

@@ -3,9 +3,9 @@
 from json import loads, dumps
 from math import ceil
 from os.path import abspath, exists
-from os import makedirs, listdir, startfile, chdir
+from os import makedirs, listdir, startfile, chdir, environ
 from requests import get as reqGet
-from subprocess import Popen
+import subprocess
 import sys
 import threading
 import shutil
@@ -16,7 +16,7 @@
 from PyQt5.QtWebEngineWidgets import QWebEngineView
 from PyQt5.QtCore import pyqtSlot, Qt, QUrl
 from PyQt5.QtGui import QIcon, QPixmap
-from PyQt5.QtWidgets import QApplication, QWidget, QPushButton, QLabel, QLineEdit, QMessageBox, QDialog, QTabWidget, QComboBox, QScrollArea
+from PyQt5.QtWidgets import QApplication, QWidget, QPushButton, QLabel, QLineEdit, QMessageBox, QDialog, QTabWidget, QComboBox, QScrollArea, QVBoxLayout
 
 class mainWindow(QWidget):
     guiElements = []
@@ -224,13 +224,19 @@ def launch(self):
                 raise TypeError
             elif not username.isalnum():
                 raise TypeError
-            print("java " + launcherConfig["javaargs"] + " -Xms" + launcherConfig["minram"] + " -Xmx" + launcherConfig["maxram"] + " -cp \"" + config.MC_DIR + "/instances/" + currentInstance + "/bin/minecraft.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/bin/jinput.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/bin/lwjgl.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/bin/lwjgl_util.jar\" " + "-Duser.home=\"" + config.MC_DIR + "/instances/" + currentInstance + "\" -Dminecraft.applet.targetDirectory=\"" + config.MC_DIR + "/instances/" + currentInstance + "\" -Djava.library.path=\"" + config.MC_DIR + "/instances/" + currentInstance + "/bin/natives\" net.minecraft.client.Minecraft " + self.loginBox.text())
-            prc = Popen("java " + launcherConfig["javaargs"] + " -Xms" + launcherConfig["minram"] + " -Xmx" + launcherConfig["maxram"] + " -cp \"" + config.MC_DIR + "/instances/" + currentInstance + "/bin/minecraft.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/bin/jinput.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/bin/lwjgl.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/bin/lwjgl_util.jar\" " + "-Duser.home=\"" + config.MC_DIR + "/instances/" + currentInstance + "\" -Dminecraft.applet.targetDirectory=\"" + config.MC_DIR + "/instances/" + currentInstance + "\" -Djava.library.path=\"" + config.MC_DIR + "/instances/" + currentInstance + "/bin/natives\" net.minecraft.client.Minecraft " + self.loginBox.text())
+            # This better damn well work.
+            print(platform.platform())
+            if platform.platform().startswith("Windows"):
+                environ["APPDATA"] = config.MC_DIR + "/instances/" + currentInstance
+                prc = subprocess.Popen("java " + launcherConfig["javaargs"] + " -Xms" + launcherConfig["minram"] + " -Xmx" + launcherConfig["maxram"] + " -cp \"" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/minecraft.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/jinput.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/lwjgl.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/lwjgl_util.jar\" " + "-Djava.library.path=\"" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/natives\" net.minecraft.client.Minecraft " + self.loginBox.text(), env=dict(environ, APPDATA=config.MC_DIR + "/instances/" + currentInstance))
+            elif platform.platform().startswith("Darwin"):
+                prc = subprocess.Popen("java " + launcherConfig["javaargs"] + " -Xms" + launcherConfig["minram"] + " -Xmx" + launcherConfig["maxram"] + " -cp \"" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/minecraft.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/jinput.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/lwjgl.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/lwjgl_util.jar\" " + "-Djava.library.path=\"" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/natives\" net.minecraft.client.Minecraft " + self.loginBox.text(), env=dict(environ, HOME=config.MC_DIR + "/instances/" + currentInstance))
+            else:
+                prc = subprocess.Popen("java " + launcherConfig["javaargs"] + " -Xms" + launcherConfig["minram"] + " -Xmx" + launcherConfig["maxram"] + " -cp \"" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/minecraft.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/jinput.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/lwjgl.jar;" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/lwjgl_util.jar\" " + "-Duser.home=\"" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "\" -Dminecraft.applet.targetDirectory=\"" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "\" -Djava.library.path=\"" + config.MC_DIR + "/instances/" + currentInstance + "/.minecraft" + "/bin/natives\" net.minecraft.client.Minecraft " + self.loginBox.text())
             launcherConfig["lastusedname"] = self.loginBox.text()
             utils.saveSettings(launcherConfig)
         except Exception as e:
-            self.error(
-                "Minecraft is unable to start. Make sure you have java and minecraft installed and an alphanumeric username set.")
+            self.error("Minecraft is unable to start. Make sure you have java and minecraft installed and an alphanumeric username set.")
             traceback.print_exc()
 
     def error(self, err):
@@ -329,37 +335,49 @@ def initUI(self):
         self.setWindowTitle(self.title)
         self.setGeometry(self.left, self.top, 480, 240)
         self.setFixedSize(self.size())
-        #self.listInstances()
+        self.listInstances()
         self.createButtons()
+        self.createInput()
 
     def listInstances(self):
-        try:
-            for widget in self.widgets:
+        for widget in self.widgets:
+            try:
                 widget.deleteLater()
-        except: pass
-
-        listBox = QVBoxLayout(self)
-        self.setLayout(listBox)
-
+            except:pass
+        self.widgets=[]
+        box = QVBoxLayout(self)
+        self.setLayout(box)
         scroll = QScrollArea(self)
-        listBox.addWidget(scroll)
+        box.addWidget(scroll)
         scroll.setWidgetResizable(True)
         scrollContent = QWidget(scroll)
-
         scrollLayout = QVBoxLayout(scrollContent)
         scrollContent.setLayout(scrollLayout)
-        for item in items:
-            scrollLayout.addWidget(item)
+        for instance in listdir(config.MC_DIR+"/instances"):
+            widget = QPushButton(self, text="Delete " + instance + ".")
+            widget.clicked.connect(lambda: utils.rmModpack(instance, widget, self))
+            scrollLayout.addWidget(widget)
+            self.widgets.append(widget)
         scroll.setWidget(scrollContent)
 
     def createButtons(self):
         self.openDirButton = QPushButton("Open " + config.NAME + " Install Dir", self)
-        self.openDirButton.resize(70, 22)
-        self.openDirButton.move(20, 20)
-        self.openDirButton.clicked.connect(self.installModpack)
+        self.openDirButton.resize(150, 22)
+        self.openDirButton.move(self.width()-155, 5)
+        self.openDirButton.clicked.connect(self.openDir)
+
+        self.installModpackButton = QPushButton("Install Local Modpack", self)
+        self.installModpackButton.resize(150, 22)
+        self.installModpackButton.move(5, 5)
+        self.installModpackButton.clicked.connect(self.installModpack)
+
+    def createInput(self):
+        self.modpackZipDir = QLineEdit(self)
+        self.modpackZipDir.resize(170, 22)
+        self.modpackZipDir.move(155, 5)
 
     def installModpack(self):
-        utils.installModpack(utils.getModapackFS("D:\Downloads\LowMango Pack b1.7.3 (Feb 2019 Update).zip"))
+        utils.installModpack(utils.getModapackFS(self.modpackZipDir.text()))
 
     def openDir(self):
         path = config.MC_DIR

setup and compile.bat

@@ -12,4 +12,4 @@ echo Creating venv.
 %pythonver% -m venv venv
 
 echo Activating venv.
-venv\Scripts\activate & echo Adding dependencies. & pip install pyqt5 requests appdirs & echo Using pyinstaller. & pyinstaller -y -F -w -i "favicon.ico" --add-data "background.png";"." --add-data "logo.png";"." launcher.py & echo Complete! & PAUSE
+venv\Scripts\activate & echo Adding dependencies. & pip install pyqt5 requests appdirs & echo Using pyinstaller. & pyinstaller -y -F -w -i "favicon.ico" --add-data "background.png";"." --add-data "logo.png";"." --add-data "favicon.ico";"." launcher.py & echo Complete! & PAUSE

setup and compile.sh

@@ -17,7 +17,7 @@ echo Adding dependencies.
 pip install pyqt5 requests appdirs
 
 echo Using pyinstaller.
-pyinstaller -y -F -w -i "favicon.ico" --add-data "background.png":"." --add-data "logo.png":"." launcher.py
+pyinstaller -y -F -w -i "favicon.ico" --add-data "background.png":"." --add-data "logo.png":"." --add-data "favicon.ico":"." launcher.py
 
 echo Complete!
 read -p "Press enter to continue..."

utils.py

@@ -10,6 +10,8 @@
 import urllib
 from distutils.dir_util import copy_tree, remove_tree
 
+from PyQt5.QtWidgets import QMessageBox
+
 
 def resourcePath(relative_path):
     base_path = getattr(sys, '_MEIPASS', os.path.dirname(os.path.abspath(__file__)))
@@ -99,12 +101,15 @@ def getModpackURL(modpackURL):
 
 
 def getModapackFS(modpackDir):
-    if not os.path.exists(config.MC_DIR+"/modpackzips/"):
-        os.makedirs(config.MC_DIR+"/modpackzips/")
-    modpackName = os.path.splitext(os.path.basename(modpackDir))[0]
-    if os.path.exists(config.MC_DIR + "/modpackzips/" + modpackName + ".zip"):
-        os.remove(config.MC_DIR + "/modpackzips/" + modpackName + ".zip")
-    shutil.copy(modpackDir, config.MC_DIR + "/modpackzips/"+modpackName + ".zip")
+    try:
+        if not os.path.exists(config.MC_DIR+"/modpackzips/"):
+            os.makedirs(config.MC_DIR+"/modpackzips/")
+        modpackName = os.path.splitext(os.path.basename(modpackDir))[0]
+        if os.path.exists(config.MC_DIR + "/modpackzips/" + modpackName + ".zip"):
+            os.remove(config.MC_DIR + "/modpackzips/" + modpackName + ".zip")
+        shutil.copy(modpackDir, config.MC_DIR + "/modpackzips/"+modpackName + ".zip")
+    except:
+        modpackName = "Error"
     return modpackName
 
 
@@ -130,22 +135,29 @@ def installModpack(modpackName):
         if not os.path.exists(config.MC_DIR + "/instances/" + modpackJsonName):
             os.makedirs(config.MC_DIR + "/instances/" + modpackJsonName)
 
-        copy_tree(config.MC_DIR + "/tmp/" + modpackName + "/.minecraft", config.MC_DIR + "/instances/" + modpackJsonName)
+        copy_tree(config.MC_DIR + "/tmp/" + modpackName, config.MC_DIR + "/instances/" + modpackJsonName)
         print("Finding Readmes")
-        files = [f for f in os.listdir(config.MC_DIR + "/tmp/" + modpackName) if os.path.isfile(config.MC_DIR + "/tmp/" + modpackName + "/" + f)]
+        files = [f for f in os.listdir(config.MC_DIR + "/tmp/" + modpackName) if os.path.isfile(config.MC_DIR + "/instances/" + modpackJsonName + "/" + f)]
         try:
             for file in files:
                 if (file.lower().__contains__("readme") or file.lower().__contains__("read me") or file.lower().__contains__("contains") or file.lower().__contains__("included")) and file.lower().endswith(".txt"):
                     if sys.platform.startswith('darwin'):
-                        subprocess.call(('open', config.MC_DIR + "/tmp/" + modpackName + "/" + file))
+                        subprocess.call(('open', config.MC_DIR + "/instances/" + modpackJsonName + "/" + file))
                     elif os.name == 'nt':
-                        os.startfile(config.MC_DIR + "/tmp/" + modpackName + "/" + file)
+                        os.startfile(config.MC_DIR + "/instances/" + modpackJsonName + "/" + file)
                     elif os.name == 'posix':
-                        subprocess.call(('xdg-open', config.MC_DIR + "/tmp/" + modpackName + "/" + file))
+                        subprocess.call(('xdg-open', config.MC_DIR + "/instances/" + modpackJsonName + "/" + file))
         except Exception as e:
             print("There was a problem opening readmes.")
             print(e)
         remove_tree(config.MC_DIR + "/tmp/" + modpackName)
     except Exception as e:
         print("Modpack install failed. Try installing again.")
         print(e)
+
+
+def rmModpack(modpackName, widget, parent):
+    confirm = QMessageBox.question(parent, "Are you sure?", "Are you sure?", QMessageBox.Yes | QMessageBox.No, QMessageBox.No)
+    if confirm == QMessageBox.Yes:
+        remove_tree(config.MC_DIR + "/instances/" + modpackName)
+        widget.deleteLater()