v0.8 (added support for old versions)

Author: SpacePython12

APLauncher.pyw

@@ -4,6 +4,7 @@ from tkinter.scrolledtext import ScrolledText
 from tkinter import messagebox, filedialog 
 from PIL import ImageTk, Image
 from urllib.request import urlretrieve
+from urllib.error import *
 from zipfile import ZipFile
 import os
 import json
@@ -20,7 +21,7 @@ import atexit
 import webbrowser
 import configparser
 
-VERSION = "0.7"
+VERSION = "0.8"
 
 class AboutPage(Frame):
 
@@ -79,8 +80,13 @@ class App:
             os.mkdir("assets")
         if not os.path.isdir("temp"):
             os.mkdir("temp")
-        urlretrieve(url="https://raw.github.com/SpacePython12/AP-Launcher/main/assets/background.png", filename="assets/background.png")
-        urlretrieve(url="https://raw.github.com/SpacePython12/AP-Launcher/main/assets/icon.ico", filename="assets/icon.ico")
+        try:
+            urlretrieve(url="https://raw.github.com/SpacePython12/AP-Launcher/main/assets/background.png", filename="assets/background.png")
+            urlretrieve(url="https://raw.github.com/SpacePython12/AP-Launcher/main/assets/icon.ico", filename="assets/icon.ico")
+        except HTTPError:
+            pass
+        except URLError:
+            pass
         self.background = ImageTk.PhotoImage(Image.open("assets/background.png"))
         self.icon = ImageTk.PhotoImage(file="assets/icon.ico")
         self.win.iconphoto(True, self.icon)
@@ -341,7 +347,7 @@ class App:
         stdin=subprocess.DEVNULL
         )
         while sb.poll() is None:
-            line = sb.stdout.readline().decode("unicode-escape").rstrip()
+            line = sb.stdout.readline().decode("ISO-8859-1").rstrip()
             if not line == "":
                 self.update_procscreen(line)
         self.playbutton.config(state="normal", text="\nPlay\n")
@@ -391,9 +397,11 @@ class App:
         with ZipFile(open(filepath, "rb")) as zf:
             folders = list(set([os.path.dirname(x).split("/")[0] for x in zf.namelist()]))
             folders.remove("indexes")
+            folders.remove("natives")
+            folders.remove("")
+            infofile = zf.open("manifest.json")
+            info = json.load(infofile)
             for folder in folders:
-                infofile = zf.open(f"{folder}/manifest.json")
-                info = json.load(infofile)
                 if os.path.isdir(os.path.join(self.minecraftdir, "versions", folder)):
                     if not messagebox.askyesno("Confirm", "There is already a version by this name. Would you like to overwrite it?"):
                         zf.close()
@@ -402,13 +410,16 @@ class App:
                         shutil.rmtree(os.path.join(self.minecraftdir, "versions", folder))
                         os.mkdir(os.path.join(self.minecraftdir, "versions", folder))
                 for file_ in zf.namelist():
-                    if file_.startswith(folder) and not file_.endswith("manifest.json"):
+                    if file_.startswith(folder):
                         zf.extract(file_, os.path.join(self.minecraftdir, "versions"))
                 info["profile"][list(info["profile"].keys())[0]]["created"] = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
                 self.accounts["profiles"][list(info["profile"].keys())[0]] = info["profile"][list(info["profile"].keys())[0]]
             for file_ in zf.namelist():
                 if file_.startswith("indexes"):
                     zf.extract(file_, os.path.join(self.minecraftdir, "assets"))
+            for file_ in zf.namelist():
+                if file_.startswith("natives"):
+                    zf.extract(file_, os.path.join(self.minecraftdir, "bin"))
             messagebox.showinfo("Success", "The version was successfully imported. Restart AP Launcher to see changes.")
             zf.close()
             return
@@ -432,6 +443,10 @@ class App:
             if not os.path.isdir("update"):
                 os.mkdir("update")
             urlretrieve(url=durl, filename="update/update.zip")
+            if os.path.isfile("update/APLauncher.exe"):
+                os.remove("update/APLauncher.exe")
+            if os.path.isfile("update/launcher_process.exe"):
+                os.remove("update/launcher_process.exe")
             with ZipFile(open("update/update.zip", "rb")) as zf:
                 zf.extractall("update")
                 zf.close()
@@ -447,6 +462,10 @@ class App:
             return False
 
     def run_updater(self):
+        if os.path.isfile("APLauncher.exe"):
+            os.remove("APLauncher.exe")
+        if os.path.isfile("launcher_process.exe"):
+            os.remove("launcher_process.exe")
         shutil.move("update/APLauncher.exe", "APLauncher.exe")
         shutil.move("update/launcher_process.exe", "launcher_process.exe")
 

README.md

@@ -14,5 +14,6 @@ You may need to install some libraries, including...
 * Modded clients (including Optifine) are NOT supported.
 
 # Changelog:
-* Made some cosmetic changes.
-* Added an updater.
+* Restructured the library loading system a bit.
+* Now supports older versions.
+* Tweaked the version installers, versions that didn't work before work now.

launcher_process.py

@@ -106,20 +106,18 @@ def get_classpath(lib, mcDir):
 def move_libraries(mcdir, dest, libjson, cp, version):
     """Moves libraries to natives path"""
     index = 0
+    if not os.path.isdir(dest):
+        os.mkdir(dest)
     shutil.copyfile(f"{mcDir}/versions/{version}/{version}.jar", os.path.join(dest, f"{version}.jar"))
     for c in cp.split(";"):
         name = c.split("\\")[-1]
-        print(f"Looking for {name}...")
         if not os.path.isfile(os.path.join(dest, name)) and os.path.isfile(c):
-            print(f"{name} is already cached, moving to natives folder")
             shutil.copyfile(os.path.join(mcDir, "libraries", c.replace("\\", "/")), os.path.join(dest, name))
         elif not os.path.isfile(c):
-            print(f"{name} is not cached, trying to download")
             os.makedirs(os.path.join(mcDir, "libraries", *c.replace(f"{mcDir}\\libraries\\", "").split("\\")[:-1]), exist_ok=True)
             url = "https://libraries.minecraft.net/" + c.replace(f"{mcDir}\\libraries\\", "").replace("\\", "/")
             urlretrieve(url, os.path.join(mcDir, "libraries", c.replace("\\", "/")))
             shutil.copyfile(os.path.join(mcDir, "libraries", c.replace("\\", "/")), os.path.join(dest, name))
-        print(f"{name} successfully moved to natives folder.")
         index += 1
 
 def download_asset(hash_, failedlist):
@@ -143,6 +141,13 @@ def download_assets(assetsdir, assetindex):
             thread = threading.Thread(None, lambda: download_asset(hash_, failedlist))
             thread.start()
 
+def move_natives(mcdir, nativesdir):
+    src = os.path.join(mcdir, "bin", "natives")
+    files = [f for f in os.listdir(src) if os.path.isfile(os.path.join(src, f))]
+    for file_ in files:
+        if not os.path.isfile(os.path.join(nativesdir, file_)):
+            shutil.copyfile(os.path.join(mcdir, "bin", "natives", file_), os.path.join(nativesdir, file_))
+
 try:
     username = sys.argv[sys.argv.index("-username")+1]
     version = sys.argv[sys.argv.index("-version")+1]
@@ -188,6 +193,7 @@ def download_assets(assetsdir, assetindex):
     os.mkdir(os.path.join(mcDir, 'versions', version, 'natives'))
     nativesDir = os.path.join(mcDir, 'versions', version, 'natives')
 move_libraries(classPath, nativesDir, clientJson["libraries"], classPath, version)
+move_natives(mcDir, nativesDir)
 if inheritor is None:
     mainClass = clientJson['mainClass']
     assetIndex = clientJson['assetIndex']['id']
@@ -245,6 +251,6 @@ def download_assets(assetsdir, assetindex):
 )
 isfirstpass = True
 while sb.poll() is None:
-    line = sb.stdout.readline().decode("unicode-escape").rstrip()
+    line = sb.stdout.readline().decode("ISO-8859-1").rstrip()
     if not line == "":
         print(line)