Update a0.6-pre2.1

Author: calmilamsy

EasyMineLauncher.jar

@@ -19,6 +19,6 @@ echo Adding dependencies.
 pip install pyqt5 requests appdirs pyinstaller 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":"." --add-data "venv/Lib/site-packages/mitmproxy/addons/onboardingapp":"mitmproxy/addons/onboardingapp" pymcl.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" --add-data "EasyMineLauncher.jar":"." pymcl.py
 echo Complete!
 read -p "Press enter to continue..."

compile_unix.sh

@@ -8,6 +8,6 @@ echo Is "%pythonver%" the correct python 3.6+ directory?
 echo Close the window if incorrect.
 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 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" --add-data "EasyMineLauncher.jar";"." pymcl.py
 echo Complete!
 PAUSE

compile_win.bat

@@ -96,7 +96,7 @@ def login(self):
             else:
                 self.error("Invalid credidentials.")
         else:
-            self.creds = self.loginBox.text()
+            self.creds = " --username=" + self.loginBox.text()
             self.launch()
 
         self.loginButton.setText("Force Quit")
@@ -302,16 +302,14 @@ def launch(self):
                 self.proxy.start()
                 self.proxiedArgs += " -Dhttp.proxyHost=localhost -Dhttp.proxyPort=25560 -Dhttps.proxyHost=localhost -Dhttps.proxyPort=25560"
 
-            # If windows, then only override appdata. Otherwise override them all. because compatibility, amirite?
-            if platform.platform().startswith("Windows"):
-                os.environ["APPDATA"] = config.MC_DIR + "/instances/" + self.currentInstance
-            else:
-                os.environ["APPDATA"] = config.MC_DIR + "/instances/" + self.currentInstance
-                os.environ["USER.HOME"] = config.MC_DIR + "/instances/" + self.currentInstance
-                os.environ["HOME"] = config.MC_DIR + "/instances/" + self.currentInstance
-            # Launch the game. I ONLY DEAL IN ABSOLUTES. (Lies!)
-            print("java " + self.proxiedArgs + " -Xms" + self.instanceConfig["minram"] + " -Xmx" + self.instanceConfig["maxram"] + " -cp \"" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/minecraft.jar;" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/jinput.jar;" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/lwjgl.jar;" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/lwjgl_util.jar\" " + "-Djava.library.path=\"" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/natives\" net.minecraft.client.Minecraft " + self.creds)
-            self.prc = subprocess.Popen("java " + self.proxiedArgs + " -Xms" + self.instanceConfig["minram"] + " -Xmx" + self.instanceConfig["maxram"] + " -cp \"" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/minecraft.jar;" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/jinput.jar;" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/lwjgl.jar;" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/lwjgl_util.jar\" " + "-Djava.library.path=\"" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/natives\" net.minecraft.client.Minecraft " + self.creds, env=dict(os.environ))
+            # Overrides all references to %appdata%, $user.home and $home
+            os.environ["APPDATA"] = config.MC_DIR + "/instances/" + self.currentInstance
+            os.environ["USER.HOME"] = config.MC_DIR + "/instances/" + self.currentInstance
+            os.environ["HOME"] = config.MC_DIR + "/instances/" + self.currentInstance
+
+            # Launch the game. I ONLY DEAL IN ABSOLUTES.
+            print("java " + self.proxiedArgs + " -Xms" + self.instanceConfig["minram"] + " -Xmx" + self.instanceConfig["maxram"] + " -jar \"" + utils.resourcePath("EasyMineLauncher.jar") + "\" --lwjgl-dir=\"" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft/bin" + "\" --jar=\"" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft/bin/minecraft.jar" + "\" --native-dir=\"" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/natives\"" + " --height=520 --width=870 --x=" + str(int((app.desktop().screenGeometry().width() / 2) - 435)) + " --y=" + str(int((app.desktop().screenGeometry().height() / 2) - 270)) + self.creds)
+            self.prc = subprocess.Popen("java " + self.proxiedArgs + " -Xms" + self.instanceConfig["minram"] + " -Xmx" + self.instanceConfig["maxram"] + " -jar \"" + utils.resourcePath("EasyMineLauncher.jar") + "\" --lwjgl-dir=\"" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft/bin" + "\" --jar=\"" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft/bin/minecraft.jar" + "\" --native-dir=\"" + config.MC_DIR + "/instances/" + self.currentInstance + "/.minecraft" + "/bin/natives\"" + " --height=520 --width=870 --x=" + str(int((app.desktop().screenGeometry().width() / 2) - 435)) + " --y=" + str(int((app.desktop().screenGeometry().height() / 2) - 270)) + self.creds, env=dict(os.environ))
 
             self.launcherConfig["lastusedname"] = self.loginBox.text()
             utils.saveSettings(self.launcherConfig)
@@ -346,9 +344,6 @@ def forceQuit(self):
     # Fires whe the launcher is closed.
     def closeEvent(self, event):
         global checkAliveTimer
-        # Deletes the tmp folder. Gotta keep those directories clean!
-        if os.path.exists(config.MC_DIR + "/tmp"):
-            shutil.rmtree(config.MC_DIR + "/tmp")
         checkAliveTimer.cancel()
         try:
             self.pres.close()
@@ -359,6 +354,10 @@ def closeEvent(self, event):
         except:
             pass
 
+        # Deletes the tmp folder. Gotta keep those directories clean!
+        if os.path.exists(config.MC_DIR + "/tmp"):
+            shutil.rmtree(config.MC_DIR + "/tmp")
+
 
 # The option window. (Duh!)
 class optionWindow(QDialog):
@@ -680,7 +679,7 @@ def modpackInstallDone(self):
 
     def installModpackWrapper(self, modpackName):
         self.installModpack.stop()
-        self.installModpack = utils.installModpack(modpackName=modpackName)
+        self.installModpack = utils.installModpack(modpackName)
         self.installModpack.done.connect(self.modpackInstallDone)
         self.installModpack.starting.connect(self.progressWinWrapper)
         self.installModpack.updateIStatus.connect(self.updateIStatus)
@@ -689,15 +688,15 @@ def installModpackWrapper(self, modpackName):
 
     def getModpackURLWrapper(self, modpackURL):
         self.getModpackURL.stop()
-        self.getModpackURL = utils.getModpackURL(modpackURL=modpackURL)
+        self.getModpackURL = utils.getModpackURL(modpackURL)
         self.getModpackURL.starting.connect(self.progressWinWrapper)
         self.getModpackURL.installModpack.connect(self.installModpackWrapper)
         self.getModpackURL.updateIStatus.connect(self.updateIStatus)
         self.getModpackURL.start()
 
     def getModpackFSWrapper(self, modpackDir):
         self.getModpackFS.stop()
-        self.getModpackFS = utils.getModpackFS(modpackDir=modpackDir)
+        self.getModpackFS = utils.getModpackFS(modpackDir)
         self.getModpackFS.starting.connect(self.progressWinWrapper)
         self.getModpackFS.installModpack.connect(self.installModpackWrapper)
         self.getModpackFS.start()
@@ -725,6 +724,7 @@ def updateStatus(self, text="", color="black", bgcolor="lightgrey"):
         self.status.setStyleSheet("color: " + color + "; background-color: " + bgcolor + ";")
 
     def updateIStatus(self, text):
+        print(text)
         try:
             if text.startswith("[") and self.progressWin.status.toPlainText().split("\n")[len(self.progressWin.status.toPlainText().split("\n"))-2].startswith("["):
                 newtext = self.progressWin.status.toPlainText().split("\n")

mainlauncher.py

@@ -11,27 +11,31 @@ class AddHeader:
     def request(flow):
         if flow.request.pretty_host == "s3.amazonaws.com":
 
-            if doSoundFix == True:
+            if doSoundFix:
                 if flow.request.path.__contains__("MinecraftResources"):
                     flow.request.host = "resourceproxy.pymcl.net"
 
-            if doSkinFix == True:
+            if doSkinFix:
                 if flow.request.path.__contains__("MinecraftSkins"):
-                    response = requests.get("http://api.mojang.com/users/profiles/minecraft", verify=False)
-                    uid = json.loads(response.content)["id"]
-                    img64 = requests.get("http://sessionserver.mojang.com/session/minecraft/profile/" + uid, verify=False)
-                    img = requests.get(base64.decode(img64)["textures"]["SKIN"])
-                    flow.response = http.HTTPResponse.make(
-                        200,
-                        img,
-                        {"Content-Type": "image/png"}
-                    )
+                    flow.request.host = "resourceproxy.pymcl.net"
+                    flow.request.path = "/skinapi.php?user=" + flow.request.path.split("/")[2].split(".")[0]
 
-            if doCapeFix == True:
+            if doCapeFix:
                 if flow.request.path.__contains__("MinecraftCloaks"):
                     flow.request.host = "resourceproxy.pymcl.net"
                     flow.request.path = "/capeapi.php?user=" + flow.request.path.split("/")[2].split(".")[0]
 
+        if flow.request.pretty_host.__contains__("minecraft.net"):
+            if doSkinFix:
+                if flow.request.path.__contains__("skin"):
+                    flow.request.host = "resourceproxy.pymcl.net"
+                    flow.request.path = "/skinapi.php?user=" + flow.request.path.split("/")[2].split(".")[0]
+
+            if doCapeFix:
+                if flow.request.path.__contains__("cloak"):
+                    flow.request.host = "resourceproxy.pymcl.net"
+                    flow.request.path = "/capeapi.php?user=" + flow.request.path.split("=")[1]
+
 
 def start():
     myaddon = AddHeader()

proxy-standalone.py

@@ -119,12 +119,11 @@ def login(username, password):
     }
 
     data = requests.post("https://authserver.mojang.com/authenticate", json=data)
-    print(data.content)
     data = json.loads(data.content)
 
     try:
-        return True, data["selectedProfile"]["name"] + " " + data["accessToken"]
-    except AttributeError:
+        return True, " --username=" + data["selectedProfile"]["name"] + " --session-id=" + data["accessToken"]
+    except KeyError:
         return False, None
 
 
@@ -203,15 +202,16 @@ def stop(self):
 class getModpackFS(QThread):
     installModpack = pyqtSignal(str)
     starting = pyqtSignal()
+    updateIStatus = pyqtSignal(str)
+    updateStatus = pyqtSignal(str)
 
-    def __init__(self, win=None, modpackDir=None):
+    def __init__(self, modpackDir=None):
         super().__init__()
-        self.win = win
-        self.modpackName = modpackDir
+        self.modpackDir = modpackDir
 
     def run(self):
         self.starting.emit()
-        if not self.modpackDir or not self.win:
+        if not self.modpackDir:
             modpackName = "Error"
         else:
             self.updateIStatus.emit("Retrieving modpack from path...")
@@ -226,7 +226,10 @@ def run(self):
             try:
                 shutil.copy(self.modpackDir, config.MC_DIR + "/modpackzips/"+modpackName + ".zip")
             except:
+                traceback.print_exc()
                 modpackName = "Error"
+        self.updateStatus.emit("Modpack cached. Starting install.")
+        self.updateIStatus.emit("Modpack cached. Starting install.")
         self.installModpack.emit(modpackName)
 
     def stop(self):
@@ -283,12 +286,13 @@ def run(self):
         print("Installing modpack")
         try:
             if self.modpackName == "Error" or self.modpackName is None:
+                traceback.print_exc()
                 raise IOError("Modpack does not exist in directory?")
             if not os.path.exists(config.MC_DIR + "/tmp/" + self.modpackName):
                 os.makedirs(config.MC_DIR + "/tmp/" + self.modpackName)
 
             # Extracts the zip file to the temp dir.
-                self.updateIStatus.emit("Extracting modpack...")
+            self.updateIStatus.emit("Extracting modpack...")
             with zipfile.ZipFile(config.MC_DIR + "/modpackzips/" + self.modpackName + ".zip", "r") as zip:
                 zip.extractall(config.MC_DIR + "/tmp/" + self.modpackName)
 
@@ -303,6 +307,7 @@ def run(self):
                     except:
                         mcVer = None
             except:
+                traceback.print_exc()
                 self.updateIStatus.emit("No modpack name found. Using zip file name. Get the modpack author to create a \"modpack.json\" file in his/her modpack.")
                 modpackJsonName = self.modpackName
                 mcVer = None
@@ -338,7 +343,7 @@ def run(self):
 
             # Gotta stay clean!
             self.updateIStatus.emit("Deleting temp files...")
-            remove_tree(config.MC_DIR + "/tmp/" + self.modpackName)
+            #remove_tree(config.MC_DIR + "/tmp/" + self.modpackName)
             self.updateStatus.emit("Modpack installed!", "green")
 
         # And in case the zip didnt exist in the first place.
@@ -362,6 +367,8 @@ def makeModpack(self, mcVer):
         if response.content is None:
             raise ConnectionError("Something went very wrong.")
 
+        areYouThere(config.MC_DIR + "/tmp/" + self.modpackName + "/.minecraft/bin")
+
         self.updateIStatus.emit("Started connection..")
 
         dl = 0
@@ -384,13 +391,21 @@ def makeModpack(self, mcVer):
 
         self.updateIStatus.emit("Extracted.\nExtracting modpack jar and merging jars..")
 
-        shutil.unpack_archive(config.MC_DIR + "/tmp/" + self.modpackName + "/.minecraft/bin/minecraft.jar", config.MC_DIR + "/tmp/" + self.modpackName + "/.minecraft/bin/minecraft", "zip")
+        try:
+            shutil.unpack_archive(config.MC_DIR + "/tmp/" + self.modpackName + "/.minecraft/bin/minecraft.jar", config.MC_DIR + "/tmp/" + self.modpackName + "/.minecraft/bin/minecraft", "zip")
+        except:
+            traceback.print_exc()
+            print("No modpack jar found. Making a vanilla instance with contents of modpack zip.")
 
         self.updateIStatus.emit("Extracted.\nArchiving..")
 
         shutil.make_archive(config.MC_DIR + "/tmp/" + self.modpackName + "/.minecraft/bin/minecraft", "zip", config.MC_DIR + "/tmp/" + self.modpackName + "/.minecraft/bin/minecraft")
 
-        os.remove(config.MC_DIR + "/tmp/" + self.modpackName + "/.minecraft/bin/minecraft.jar")
+        try:
+            os.remove(config.MC_DIR + "/tmp/" + self.modpackName + "/.minecraft/bin/minecraft.jar")
+        except:
+            traceback.print_exc()
+
         os.rename(config.MC_DIR + "/tmp/" + self.modpackName + "/.minecraft/bin/minecraft.zip", config.MC_DIR + "/tmp/" + self.modpackName + "/.minecraft/bin/minecraft.jar")
 
         self.updateIStatus.emit("Archived.\nDownloading LWJGL for " + config.OS + "..")
@@ -438,11 +453,11 @@ def rmInstance(instanceName, self):
     except:
         pass
 
-# TODO Remove this if new solution works.
-"""class minecraftProxy(threading.Thread):
+
+class minecraftProxy(QThread):
 
     def __init__(self, doSkinFix, doSoundFix, doCapeFix, loop):
-        super(minecraftProxy, self).__init__()
+        super().__init__()
         self.doSkinFix = doSkinFix
         self.doCapeFix = doCapeFix
         self.doSoundFix = doSoundFix
@@ -470,57 +485,16 @@ def request(self, flow):
                             flow.request.host = "resourceproxy.pymcl.net"
                             flow.request.path = "/capeapi.php?user=" + flow.request.path.split("/")[2].split(".")[0]
 
-        return AddHeader(self)
-
-    def run(self):
-        asyncio.set_event_loop(self.loop)
-        myaddon = self.getHeader()
-        opts = options.Options(listen_host="0.0.0.0", listen_port=25560)
-        pconf = proxy.config.ProxyConfig(opts)
-        self.m = DumpMaster(opts)
-        self.m.server = proxy.server.ProxyServer(pconf)
-        self.m.addons.add(myaddon)
-
-        self.m.run()
-
-    def stop(self):
-        self.m.shutdown()
-
-    def join(self):
-        threading.Thread.join(self)
-"""
-
-
-class minecraftProxy(QThread):
-
-    def __init__(self, doSkinFix, doSoundFix, doCapeFix, loop):
-        super().__init__()
-        self.doSkinFix = doSkinFix
-        self.doCapeFix = doCapeFix
-        self.doSoundFix = doSoundFix
-        self.loop = loop
-
-    def getHeader(self):
-        class AddHeader:
-            def __init__(self, parent):
-                self.parent = parent
-
-            def request(self, flow):
-                if flow.request.pretty_host == "s3.amazonaws.com":
-
-                    if self.parent.doSoundFix:
-                        if flow.request.path.__contains__("MinecraftResources"):
-                            flow.request.host = "resourceproxy.pymcl.net"
-
+                if flow.request.pretty_host.__contains__("minecraft.net"):
                     if self.parent.doSkinFix:
-                        if flow.request.path.__contains__("MinecraftSkins"):
+                        if flow.request.path.__contains__("skin"):
                             flow.request.host = "resourceproxy.pymcl.net"
                             flow.request.path = "/skinapi.php?user=" + flow.request.path.split("/")[2].split(".")[0]
 
                     if self.parent.doCapeFix:
-                        if flow.request.path.__contains__("MinecraftCloaks"):
+                        if flow.request.path.__contains__("cloak"):
                             flow.request.host = "resourceproxy.pymcl.net"
-                            flow.request.path = "/capeapi.php?user=" + flow.request.path.split("/")[2].split(".")[0]
+                            flow.request.path = "/capeapi.php?user=" + flow.request.path.split("=")[1]
 
         return AddHeader(self)