Update a0.6-pre-3

calmilamsy · calmilamsy · commit d6583d089ffd · 2019-04-25T21:34:10.000+01:00
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ This list is based off of the old beta launcher.
  - [x] Modpack manager.
  - [x] Fixed login.
  - [x] Discord integration.
+ - [x] MultiMC instance support.
  - [ ] Mod installer system similar to Nexus Mod Manager.
  - [ ] Stupidly lightweight.
 
@@ -50,4 +51,4 @@ Then use pyinstaller on the launcher:
    instead of a colon (`:`) in the `--add-data` arguments.
  - The compiled executable will be put in the dist folder when it is done.
  - To have a console for the launcher, remove the `-w` in the compile arguments when compiling.
- - The final file is pretty big. (~80mb)
+ - The final file is pretty big. (~40mb)
diff --git a/changelog.md b/changelog.md
@@ -64,7 +64,7 @@ The beginning of something awesome.
 \- Python library "appdirs" no longer used. Shaves about 10kb off the file size. /shrug  
 
 ### a0.6-pre2
-ETA unknown. Likely about 1-2 weeks after pre-1.
+Some nice things ive been working on.
 
 \#\+ A proper wiki. (WIP)  
 \#\+\+ Online repo of mods, texturepacks and themes that can be installed.  
@@ -73,6 +73,7 @@ ETA unknown. Likely about 1-2 weeks after pre-1.
 \* Fixed instance settings not loading or saving correctly.  
 
 ### a0.6-pre2.1
+So many bugs. SO MANY MIXINS.
 
 ~ Made it so that more things log to console.  
 \+ EasyMineLauncher is now used to launch minecraft. This uses LaunchWrapper, which allows modders to use mixins.  
@@ -87,20 +88,25 @@ ETA unknown. Likely about 1-2 weeks after pre-1.
 ### Upcoming a0.6-pre3
 What pre2 was meant to be.
 
+\+ Links in the blog section are now clickable. They will open in your default browser.
 \+ Automatic resource downloads when installing instances/modpacks. Will only download missing files. It will not replace modified files.  
-\+ Support for a1.2.6, b1.6.6.  
-\+ Automatic "dumb" mod installing. (just copies contents to mc.jar)    
-\+ The launcher will have a working modpack exporter window.  
-\+ A "create instance" button for creating vanilla instances.  
+\+ A working modpack exporter window. Launch PyMCL with `--export` OR `-e`.  
+\+ MultiMC instance support. This is extremely experimental and may not work with some modpacks.  
+\* Fixed PyMCL not deleting META-INF when needed.  
+\* Fixed random crashes when closing the instance manager for good.  
 
-### Upcoming a0.6
+### Upcoming a0.6-pre4
 Woo!!!11 Automate EVERYTHING!  
 
+\+ Automated instance creation.   
 \#\+\+ Online mod repository with tons of converted mods.  
 \+ Revamped instance manager.  
-\+ Automatic "semi-smart" mod installing. Most likely only gonna support optional classes and folders though.  
+\+ Automatic "dumb" mod installing. (just copies contents to mc.jar)   
 \+ Automatic launcher updates?  
 
+## Upcoming a0.6-pre5
+
+\+ Automatic "semi-smart" mod installing. Most likely only gonna support optional classes and folders though.  
 
 ### Upcoming b1.0+
 
diff --git a/compile_unix.sh b/compile_unix.sh
@@ -16,7 +16,7 @@ chmod a+x venv/bin/activate
 source venv/bin/activate
 
 echo Adding dependencies.
-pip install pyqt5 requests appdirs pyinstaller pypresence
+pip install pyqt5 requests appdirs pyinstaller pypresence mitmproxy
 
 echo Using pyinstaller.
 pyinstaller -y -F -i "favicon.ico" --add-data "background.png":"." --add-data "logo.png":"." --add-data "favicon.ico":"." --add-data "blogbackground.png":"." --add-data "blog.html":"." --add-data "refresh.png":"." --add-data "venv/Lib/site-packages/mitmproxy/addons/onboardingapp":"mitmproxy/addons/onboardingapp" --add-data "EasyMineLauncher.jar":"." pymcl.py
diff --git a/config.py b/config.py
@@ -31,7 +31,7 @@
 }
 """
 
-VER = "v0.6 Alpha Pre 2"
+VER = "v0.6 Alpha Pre 3"
 
 # Sets minecraft install dir. DO NOT TOUCH UNLESS YOU KNOW WHAT YOU ARE DOING.
 # Touching this can cause unintended file deletion/overwrites/etc.
diff --git a/exportlauncher.py b/exportlauncher.py
@@ -3,19 +3,30 @@
 import os
 import sys
 import requests
+import json
+import traceback
+import shutil
+import distutils
+import configparser
 
 from PyQt5.QtGui import QIcon
 from PyQt5.QtWidgets import QWidget, QComboBox, QLabel, QPushButton, QCheckBox, QApplication
 
+
 class exportWindow(QWidget):
     currentInstance = ""
+    currentInstanceVersion = None
+    doSoundRemoval = False
+    makePyMCLModpack = False
+    doClassRemoval = False
+    doLWJGLRemoval = False
 
     # Same drill. Does background things.
     def __init__(self, parent=None):
         super().__init__(parent)
         screen_resolution = app.desktop().screenGeometry()
-        self.title = config.NAME + " " + config.VER + " Modpack Installer"
-        config.ICON = utils.loadImage("favicon.ico", self.currentInstance)
+        self.title = config.NAME + " " + config.VER + " Modpack Exporter"
+        config.ICON = utils.loadImage("favicon.ico", "")
         self.setWindowIcon(QIcon(config.ICON))
         self.left = screen_resolution.width() / 2 - 450
         self.top = screen_resolution.height() / 2 - 220
@@ -39,40 +50,211 @@ def createButtons(self):
             item = self.instanceSelect.findText(self.currentInstance)
         self.instanceSelect.setCurrentIndex(item)
         self.currentInstance = self.instanceSelect.currentText()
+        self.instanceSelect.activated[str].connect(self.setInstance)
+        self.instanceSelect.move(5, 5)
 
         self.createModpackButton = QPushButton(self)
         self.createModpackButton.clicked.connect(self.createModpack)
         self.createModpackButton.setText("Export Modpack")
-        self.createModpackButton.move(50, 50)
+        self.createModpackButton.move(5, 175)
+        self.createLabel = QLabel(self, text="Program will stop responding for a few seconds. Keep an eye on the console.")
+        self.createLabel.move(5, 200)
 
     def createCheckBoxes(self):
-        self.doDefaultSoundRemoval = QCheckBox(self)
-        self.doDefaultSoundRemoval.move(100, 20)
-        self.doDefaultSoundRemoval.clicked.connect(lambda: print(self.doDefaultSoundRemoval.isChecked()))
+        self.doSoundRemovalCheckbox = QCheckBox(self)
+        self.doSoundRemovalCheckbox.move(5, 30)
+        self.doSoundRemovalCheckbox.clicked.connect(self.updateSoundRemoval)
+        self.label1 = QLabel(self, text="Do vanilla resources removal. Keeps any changed resource files.")
+        self.label1.move(30, 30)
+
+        self.doClassRemovalCheckbox = QCheckBox(self)
+        self.doClassRemovalCheckbox.move(5, 50)
+        self.doClassRemovalCheckbox.clicked.connect(self.updateClassRemoval)
+        self.label2 = QLabel(self, text="Do vanilla class removal. Keeps any changed class files.")
+        self.label2.move(30, 50)
+
+        self.doLWJGLRemovalCheckbox = QCheckBox(self)
+        self.doLWJGLRemovalCheckbox.move(5, 70)
+        self.doLWJGLRemovalCheckbox.clicked.connect(self.updateLWJGLRemoval)
+        self.label3 = QLabel(self, text="Do LWJGL removal.")
+        self.label3.move(30, 70)
+
+        self.makePyMCLModpackCheckbox = QCheckBox(self)
+        self.makePyMCLModpackCheckbox.move(5, 100)
+        self.makePyMCLModpackCheckbox.clicked.connect(self.updateMakePyMCLModpack)
+        self.label4 = QLabel(self, text="Make PyMCL modpack.")
+        self.label4.move(30, 100)
+
+    def setInstance(self, instance):
+        self.currentInstance = instance
+        try:
+            with open(config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft/modpack.json") as file:
+                self.currentInstanceVersion = json.loads(file.read())["mcver"]
+        except:
+            self.currentInstanceVersion = None
+
+    def updateSoundRemoval(self):
+        self.doSoundRemoval = self.doSoundRemovalCheckbox.isChecked()
+        if self.doLWJGLRemoval and self.doSoundRemoval and self.doClassRemoval:
+            self.makePyMCLModpack = True
+            self.makePyMCLModpackCheckbox.setChecked(True)
+        else:
+            self.makePyMCLModpack = False
+            self.makePyMCLModpackCheckbox.setChecked(False)
+
+    def updateClassRemoval(self):
+        self.doClassRemoval = self.doClassRemovalCheckbox.isChecked()
+        if self.doLWJGLRemoval and self.doSoundRemoval and self.doClassRemoval:
+            self.makePyMCLModpack = True
+            self.makePyMCLModpackCheckbox.setChecked(True)
+        else:
+            self.makePyMCLModpack = False
+            self.makePyMCLModpackCheckbox.setChecked(False)
+
+    def updateLWJGLRemoval(self):
+        self.doLWJGLRemoval = self.doLWJGLRemovalCheckbox.isChecked()
+        if self.doLWJGLRemoval and self.doSoundRemoval and self.doClassRemoval:
+            self.makePyMCLModpack = True
+            self.makePyMCLModpackCheckbox.setChecked(True)
+        else:
+            self.makePyMCLModpack = False
+            self.makePyMCLModpackCheckbox.setChecked(False)
+
+
+    def updateMakePyMCLModpack(self):
+        isChecked = self.makePyMCLModpackCheckbox.isChecked()
+        self.makePyMCLModpack = isChecked
+        self.doLWJGLRemovalCheckbox.setChecked(isChecked)
+        self.doLWJGLRemoval = isChecked
+        self.doClassRemovalCheckbox.setChecked(isChecked)
+        self.doClassRemoval = isChecked
+        self.doSoundRemovalCheckbox.setChecked(isChecked)
+        self.doSoundRemoval = isChecked
 
     def createModpack(self):
-        soundsMD5 = self.getSoundXML()
-        print(soundsMD5)
+        print("Copying instance to ~/tmp")
+        shutil.copytree(config.MC_DIR + "/instances/" + self.currentInstance, config.MC_DIR + "/tmp/" + self.currentInstance)
+        print("Copied.")
+        binpath = config.MC_DIR + "/tmp/" + self.currentInstance + "/.minecraft/bin/"
+        mcpath = config.MC_DIR + "/tmp/" + self.currentInstance + "/.minecraft/"
+
+        if self.doSoundRemoval or self.makePyMCLModpack:
+            print("Getting sound MD5")
+            try:
+                soundsMD5 = self.getSoundMD5()
+                print("MD5 retrieved.\nCulling vanilla resources")
+                self.cull("resources", soundsMD5)
+                print("Vanilla resources removed.")
+            except:
+                traceback.print_exc()
+                print("An error occurred when trying to remove vanilla resources.")
+
+        if self.doClassRemoval or self.makePyMCLModpack:
+            print("Extracting minecraft.jar")
+            try:
+                shutil.unpack_archive(binpath + "minecraft.jar", binpath + "minecraft", "zip")
+                print("Extracted.\nGetting class md5")
+                classMD5 = self.getClassMD5()
+                print("MD5 Retrieved.\nCulling vanilla classes")
+                self.cull("bin/minecraft", classMD5)
+                print("Vanilla classes removed.\nRepacking jar")
+                shutil.make_archive(binpath + "minecraft", "zip", binpath + "minecraft")
+                try:
+                    os.unlink(binpath + "minecraft.jar")
+                except:
+                    traceback.print_exc()
+                os.rename(binpath + "minecraft.zip", binpath + "minecraft.jar")
+                shutil.rmtree(binpath + "minecraft")
+            except:
+                traceback.print_exc()
+                print("An error occurred when trying to remove vanilla resources.")
+
+        if self.doLWJGLRemoval or self.makePyMCLModpack:
+            print("Removing LWJGL files.")
+            try:
+                os.unlink(binpath + "lwjgl.jar")
+            except:
+                pass
+            try:
+                os.unlink(binpath + "lwjgl_util.jar")
+            except:
+                pass
+            try:
+                os.unlink(binpath + "jinput.jar")
+            except:
+                pass
+            try:
+                os.unlink(binpath + "license.txt")
+            except:
+                pass
+            try:
+                shutil.rmtree(binpath + "natives")
+            except:
+                pass
+            print("LWJGL files removed, if any existed.")
+        print("Creating modpack.")
+        shutil.make_archive(config.MC_DIR + "/tmp/" + self.currentInstance, "zip", config.MC_DIR + "/tmp/" + self.currentInstance)
+        print("Modpack created.\nMoving to export folder.")
+
+        utils.areYouThere(config.MC_DIR + "/modpackzips/export/")
+        if os.path.exists(config.MC_DIR + "/modpackzips/export/" + self.currentInstance + ".zip"):
+            os.unlink(config.MC_DIR + "/modpackzips/export/" + self.currentInstance + ".zip")
+
+        shutil.move(config.MC_DIR + "/tmp/" + self.currentInstance + ".zip", config.MC_DIR + "/modpackzips/export")
+
+        print("Modpack created.\nBe sure to make a modpack.json file for the modpack!")
+
 
     # Screw XML. It's terrible. I chose to use it because I only had to add a single 10 character line to my minecraft resources php file. Fight me.
     @staticmethod
-    def getSoundXML():
-        md5Array = []
+    def getSoundMD5():
+        md5Array = {}
         with requests.get("http://resourceproxy.pymcl.net/MinecraftResources") as response:
             trip = False
             for string in response.text.split("<Key>"):
                 if trip:
-                    md5Array.append([string.split("</Key>")[0], string.split("<MD5>")[1].split("</MD5>")[0]])
+                    md5Array[string.split("</Key>")[0]] = string.split("<MD5>")[1].split("</MD5>")[0]
                 else:
                     trip = True
 
         return md5Array
 
-    def md5Recursive(self, pathininstance):
-        for root, dirs, files in os.walk(config.MC_DIR + "/" + self.currentInstance + "/" + pathininstance):
+    def getClassMD5(self):
+
+        print("https://files.pymcl.net/client/" + self.currentInstanceVersion + "/classmd5.json")
+        try:
+            with requests.get("https://files.pymcl.net/client/" + self.currentInstanceVersion + "/classmd5.json") as response:
+                classMD5 = json.loads(response.content)
+        except:
+            traceback.print_exc()
+            classMD5 = None
+
+        return classMD5
+
+    def cull(self, pathininstance, md5List):
+        base = (config.MC_DIR + "/tmp/" + self.currentInstance + "/.minecraft/" + pathininstance).replace("\\", "/") + "/"
+        print(base)
+        for root, dirs, files in os.walk(base):
+            root = root.replace("\\", "/") + "/"
+
+            root = root.replace("//", "/")
             for file in files:
-                utils.md5(root + "/" + file)
+                try:
+                    if utils.md5(root + file) == md5List[root.replace(base, "") + file]:
+                        os.unlink(root + file)
+                except KeyError:
+                    pass
+
+
+    def closeEvent(self, QCloseEvent):
+        shutil.rmtree(config.MC_DIR + "/tmp")
+
 
+try:
+    shutil.rmtree(config.MC_DIR + "/tmp")
+except:
+    pass
+utils.areYouThere(config.MC_DIR + "/tmp")
 
 app = QApplication([])
 exportWin = exportWindow()
diff --git a/mainlauncher.py b/mainlauncher.py
@@ -15,7 +15,7 @@
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QIcon, QFont
-from PyQt5.QtWidgets import QPushButton, QWidget, QComboBox, QLineEdit, QLabel, QMessageBox, QDialog, QCheckBox, QVBoxLayout, QGroupBox, QTextEdit, QTabWidget, QScrollArea, QFileDialog, QApplication
+from PyQt5.QtWidgets import QPushButton, QWidget, QComboBox, QLineEdit, QLabel, QMessageBox, QDialog, QCheckBox, QVBoxLayout, QGroupBox, QTextBrowser, QTabWidget, QScrollArea, QFileDialog, QApplication, QTextEdit
 
 
 class mainWindow(QWidget):
@@ -181,10 +181,11 @@ def createLogo(self):
 
     # Doesnt actually anymore, but I liked the name, so it stays.
     def createTheInternet(self):
-        self.theInternet = QTextEdit(self)
+        self.theInternet = QTextBrowser(self)
         with open(config.BLOG, "r", encoding="utf-8") as file:
             content = file.read()
         self.theInternet.setHtml(content.replace("&background&", urllib.parse.quote(config.BLOG_BACKGROUND.replace("\\", "/"))))
+        self.theInternet.setOpenExternalLinks(True)
         self.theInternet.show()
         self.theInternet.setReadOnly(True)
 
@@ -744,12 +745,12 @@ def closeEvent(self, event, *args, **kwargs):
         # Wouldnt want to try and launch a non-existant instance now, do we?
         if not os.path.exists(config.MC_DIR + "/instances/" + mainWin.currentInstance):
             try:
-                mainWin.currentInstance = os.listdir(config.MC_DIR + "/instances")[0]
+                mainWin.currentInstance = os.listdir(config.MC_DIR + "/instances")[1]
             except:
                 mainWin.currentInstance = ""
 
-            mainWin.setInstance(mainWin, mainWin.currentInstance)
-            mainWin.createDropdowns(mainWin)
+        mainWin.createDropdowns()
+        mainWin.setInstance(mainWin.currentInstance)
 
 
 class installWindow(QDialog):
diff --git a/pymcl.py b/pymcl.py
diff --git a/start_win.bat b/start_win.bat
diff --git a/utils.py b/utils.py

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`}`
`32`	`32`	`"""`
`33`	`33`
`34`		`-VER = "v0.6 Alpha Pre 2"`
	`34`	`+VER = "v0.6 Alpha Pre 3"`
`35`	`35`
`36`	`36`	`# Sets minecraft install dir. DO NOT TOUCH UNLESS YOU KNOW WHAT YOU ARE DOING.`
`37`	`37`	`# Touching this can cause unintended file deletion/overwrites/etc.`