Update a0.6-pre2

Author: calmilamsy

.gitignore

@@ -22,3 +22,5 @@ lib/
 \.PyMCL/
 
 stay\.here
+
+pymcl\.spec

changelog.md

@@ -5,7 +5,7 @@ key:
 - ~ Modified feature.
 - \* Bugfix
 
-Version format: (prefix)major.minor.bugfix
+Version format: \<prefix\>major.minor.bugfix
 - Prefix: Annotates if a version is alpha, beta or release. (a, b, r)
 - Major: Full rewrite/ui change or something drastic like that.
 - Minor: Normal updates. e.g added/remove/modified individual features.
@@ -42,14 +42,14 @@ Prep for a0.4.
 
 ~ Per instance java settings.  
 ~ Better instance manager!  
-~ Optimisation and crash fixes.  
 ~ Rewrite of some functions and general optimisation.  
 ~ Smaller file size! Down to 18mb!  
-~ Fixed unix compile script!  
 \- Can no longer display remote (internet) content.  
 \+ The blog is now themable with a html4 file!  
 \+ Commented code!  
 \+ Discord rich presence.  
+\* Fixed unix compile script!  
+\* Optimisation and crash fixes.  
 
 ### a0.6-pre1
 The beginning of something awesome.
@@ -58,35 +58,42 @@ The beginning of something awesome.
 ~ Hopefully fixed random crashes after modpack installation.  
 ~ Partial rewrite of some functions to support threading. (pymcl is now multithreaded! woo!)  
 ~ Now uses "%appdata%/.PyMCL" on windows, "\~/Library/Application Support/PyMCL" on OSX and "\~/.PyMCL" on anything else.  
-\+ PyMCL is now portable! Create a file named "stay.here" in the same folder pymcl.exe is located to set it to portable mode.  
-\#\+\+ Online repository of modpacks that can be 1-click-installed. Only one modpack available at the moment.  
+\#\+\+ Online repository of modpacks that can be 1-click-installed. 
+\+ PyMCL is now portable! Create a file named "stay.here" in the same folder pymcl.exe is located to set it to portable mode.  Only one modpack available at the moment.  
 \+ Automatic creation of instances from partial jars. Will only initially support b1.7.3 though.  
 \- Python library "appdirs" no longer used. Shaves about 10kb off the file size. /shrug  
 
 ### Upcoming a0.6-pre2
 ETA unknown. Likely about 1-2 weeks after pre-1.
 
-\+ Command line arguments! Allows exporting of instances and overriding of install directory along with some options coming in the future!  
-\+ Automatic resource downloads. Will only download missing files. It will not replace modified files.  
-\+ Support for a1.2.6, b1.6.6.  
+\#\+ A proper wiki. (WIP)  
 \#\+\+ Online repo of mods, texturepacks and themes that can be installed.  
-\+ Automatic "dumb" mod installing. (just copies contents to mc.jar)  
-\#\+ A proper wiki.  
-\+ The launcher will have a working "export modpack" button in the instance manager.  
-\+ A "create instance" button for creating vanilla instances.
+\+ Command line arguments! Allows exporting of instances and overriding of install directory along with some more options coming in the future! Use -h to get started.  
+\+ There is now an instance setting to use a proxy to fix skins, sounds and capes!
+\* Techically a modification, but minecraft now launches via MinecraftApplet.  
+\* Fixed instance settings not loading or saving correctly.  
+
+### Upcoming a0.6-pre3
+What pre2 was meant to be.
+
+\+ 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.  
 
 ### Upcoming a0.6
 Woo!!!11 Automate EVERYTHING!  
 
-\+ Revamped instance manager.  
 \#\+\+ 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 launcher updates?  
 
 
 ### Upcoming b1.0+
 
-~ UI overhaul. Some of the UI isnt fit for use anymore.  
+~ UI overhaul. Some of the UI isnt fit for purpose anymore.  
 ~ Yet another rewrite. I have learned a lot about how pyqt5 works and I cant bear to look at some of my old code.  
 ~ Launching minecraft via [launchwrapper](https://github.com/Mojang/LegacyLauncher) to allow for mixins.  
 ~ Better theming system.  

compile_unix.sh

@@ -1,4 +1,5 @@
 echo Change the 4th line in this batch file to your python install.
+
 # CHANGE THIS TO WHAT YOUR PYTHON 3.6+ INSTALL IS (e.g.: C:\Program Files\python\scripts\python.exe
 export pythonver=python3
 
@@ -18,7 +19,6 @@ echo Adding dependencies.
 pip install pyqt5 requests appdirs pyinstaller pypresence
 
 echo Using pyinstaller.
-pyinstaller -y -F -w -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":"." launcher.py
-
+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" pymcl.py
 echo Complete!
 read -p "Press enter to continue..."

compile_win.bat

@@ -8,8 +8,6 @@ echo Is "%pythonver%" the correct python 3.6+ directory?
 echo Close the window if incorrect.
 PAUSE
 
-echo Creating venv.
-%pythonver% -m venv venv
-
-echo Activating venv.
-venv\Scripts\activate && echo Adding dependencies. && pip install pyqt5 requests appdirs pypresence && 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";"." --hidden-import pypresence launcher.py && echo Complete! & PAUSE
+echo Activating venv. && venv\scripts\activate && echo Adding dependencies. && pip install pyqt5 requests appdirs 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" pymcl.py
+echo Complete!
+PAUSE

config.py

@@ -12,23 +12,30 @@
 BLOG_BACKGROUND = "blogbackground.png"
 BLOG = ""
 
+# THIS IS IN JSON, NOT PYTHON
 DEFAULT_LAUNCHER_CONFIG = """
 {
     "lastusedname": ""
 }
 """
 
+# THIS IS IN JSON, NOT PYTHON
 DEFAULT_INSTANCE_CONFIG = """
 {
     "maxram": "512m",
     "minram": "256m",
-    "javaargs": ""
+    "javaargs": "",
+    "proxyskin": false,
+    "proxysound": false,
+    "proxycape": false
 }
 """
 
-VER = "v0.6 Alpha Pre 1"
-
+VER = "v0.6 Alpha Pre 2"
 
+# Sets minecraft install dir. DO NOT TOUCH UNLESS YOU KNOW WHAT YOU ARE DOING.
+# Touching this can cause unintended file deletion/overwrites/etc.
+# I have tried to mitigate the risks, but seriously, NO TOUCHIE
 if platform.platform().startswith("Windows"):
     MC_DIR = os.getenv("APPDATA") + "/.PyMCL"
     OS = "windows"

exportlauncher.py

@@ -0,0 +1,80 @@
+import config
+import utils
+import os
+import sys
+import requests
+
+from PyQt5.QtGui import QIcon
+from PyQt5.QtWidgets import QWidget, QComboBox, QLabel, QPushButton, QCheckBox, QApplication
+
+class exportWindow(QWidget):
+    currentInstance = ""
+
+    # 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.setWindowIcon(QIcon(config.ICON))
+        self.left = screen_resolution.width() / 2 - 450
+        self.top = screen_resolution.height() / 2 - 220
+        self.initUI()
+
+    def initUI(self):
+        self.setWindowTitle(self.title)
+        self.setGeometry(self.left, self.top, 450, 220)
+        self.setFixedSize(self.size())
+        self.createButtons()
+        self.createCheckBoxes()
+        self.show()
+
+    def createButtons(self):
+        self.instanceSelect = QComboBox(self)
+        item = 0
+        self.instanceSelect.clear()
+        for instance in os.listdir(config.MC_DIR + "/instances"):  # Instances will be verified before being listed in the future,
+            self.instanceSelect.addItem(instance)
+        if os.path.exists(config.MC_DIR + "/instances/" + self.currentInstance):
+            item = self.instanceSelect.findText(self.currentInstance)
+        self.instanceSelect.setCurrentIndex(item)
+        self.currentInstance = self.instanceSelect.currentText()
+
+        self.createModpackButton = QPushButton(self)
+        self.createModpackButton.clicked.connect(self.createModpack)
+        self.createModpackButton.setText("Export Modpack")
+        self.createModpackButton.move(50, 50)
+
+    def createCheckBoxes(self):
+        self.doDefaultSoundRemoval = QCheckBox(self)
+        self.doDefaultSoundRemoval.move(100, 20)
+        self.doDefaultSoundRemoval.clicked.connect(lambda: print(self.doDefaultSoundRemoval.isChecked()))
+
+    def createModpack(self):
+        soundsMD5 = self.getSoundXML()
+        print(soundsMD5)
+
+    # 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 = []
+        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]])
+                else:
+                    trip = True
+
+        return md5Array
+
+    def md5Recursive(self, pathininstance):
+        for root, dirs, files in os.walk(config.MC_DIR + "/" + self.currentInstance + "/" + pathininstance):
+            for file in files:
+                utils.md5(root + "/" + file)
+
+
+app = QApplication([])
+exportWin = exportWindow()
+
+sys.exit(app.exec_())