Version 1.0.3

.gitignore

@@ -1,2 +1,6 @@
 *.pyc
-*.pyo
+*.pyo
+*__pycache__
+*.DS_STORE
+releases
+.vscode

INSTALL_MULTIMC.md

@@ -0,0 +1,3 @@
+_This is a work in progress._
+
+# See [MultiMC](https://multimc.org/)'s [getting started](https://github.com/MultiMC/MultiMC5/wiki/Getting-Started)

current_version.json

@@ -1,12 +1,12 @@
 {
-    "tag_name": "0.8",
+    "tag_name": "0.8.3",
     "assets": [
         {
-            "browser_download_url": "https://github.com/FriendsOfGalaxy/galaxy-integration-minecraft/releases/download/0.8/macos.zip",
+            "browser_download_url": "https://github.com/FriendsOfGalaxy/galaxy-integration-minecraft/releases/download/0.8.3/macos.zip",
             "name": "macos.zip"
         },
         {
-            "browser_download_url": "https://github.com/FriendsOfGalaxy/galaxy-integration-minecraft/releases/download/0.8/windows.zip",
+            "browser_download_url": "https://github.com/FriendsOfGalaxy/galaxy-integration-minecraft/releases/download/0.8.3/windows.zip",
             "name": "windows.zip"
         }
     ]

requirements/app.txt

@@ -0,0 +1,14 @@
+aiohttp==3.6.2            # via galaxy.plugin.api
+async-timeout==3.0.1      # via aiohttp
+attrs==19.3.0             # via aiohttp
+certifi==2020.6.20        # via galaxy.plugin.api, requests
+chardet==3.0.4            # via aiohttp, requests
+galaxy.plugin.api==0.66.0  # via -r requirements.txt
+galaxyutils==0.1.5        # via -r requirements.txt
+idna==2.10                # via requests, yarl
+multidict==4.7.6          # via aiohttp, yarl
+requests==2.24.0          # via -r requirements.txt
+send2trash==1.5.0         # via -r requirements.txt
+typing-extensions==3.7.4.2  # via yarl
+urllib3==1.25.10          # via requests
+yarl==1.5.1               # via aiohttp

requirements/dev.txt

@@ -0,0 +1,4 @@
+-r app.txt
+invoke==1.4.1
+pip-tools==5.3.1
+colorama==0.4.3

src/consts.py

@@ -1,10 +1,45 @@
-import sys
-if sys.platform == 'win32':
+import platform, os
+
+IS_WINDOWS = platform.system().lower() == "windows"
+
+if IS_WINDOWS:
     import winreg
 
-REGISTRY_START_PATHS = [winreg.HKEY_CURRENT_USER, winreg.HKEY_LOCAL_MACHINE]
-MINECRAFT_REGISTRY_PATHS = ["SOFTWARE\\Mojang\\InstalledProducts\\Minecraft Launcher", "SOFTWARE\\WOW6432Node\\Mojang\\InstalledProducts\\Minecraft Launcher"]
-MINECRAFT_REGISTRY_PATH_INSTALL_LOCATION_KEY = "InstallLocation"
-WINDOWS_UNINSTALL_LOCATION = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall"
+    REGISTRY_START_PATHS = [winreg.HKEY_CURRENT_USER, winreg.HKEY_LOCAL_MACHINE]
+else:
+    REGISTRY_START_PATHS = []
+
+
+class GameID:
+    Minecraft = "mc"
+    MinecraftDungeons = "mcd"
+    MinecraftEducationEdition = "mcedu"
+
+
+GAMES = [GameID.Minecraft, GameID.MinecraftDungeons]
+
+
+INSTALLED_FOLDER_PATH = os.path.abspath(
+    os.path.expandvars("%localappdata%\\GOG.com\\Galaxy\\plugins\\installed")
+    if IS_WINDOWS
+    else os.path.expanduser("~/Library/Application Support/GOG.com/Galaxy/plugins/installed")
+)
+
+DIRNAME = os.path.abspath(os.path.join(__file__, ".."))
+
+SOFTWARE_PATHS = ["SOFTWARE\\", "SOFTWARE\\WOW6432Node\\"]
+mojang_registry_relative_location = "Mojang\\InstalledProducts\\"
+GAME_REGISTY_RELATIVE_LOCATIONS = {
+    GameID.Minecraft: mojang_registry_relative_location + "Minecraft Launcher",
+    GameID.MinecraftDungeons: mojang_registry_relative_location + "Minecraft Dungeons Launcher",
+}
+REGISTRY_EXE_KEYS = {GameID.Minecraft: "InstallExe", GameID.MinecraftDungeons: "InstallFile"}
+WIN_UNINSTALL_RELATIVE_LOCATION = "Microsoft\\Windows\\CurrentVersion\\Uninstall"
+MINECRAFT_WIN_INSTALL_URL = "https://launcher.mojang.com/download/MinecraftInstaller.msi"
+MINECRAFT_MAC_INSTALL_URL = "https://launcher.mojang.com/download/Minecraft.dmg"
+MINECRAFT_DUNGEONS_INSTALL_URL = (
+    "https://launcher.mojang.com/download/MinecraftDungeonsInstaller.msi"
+)
 
 
+GAME_NAMES = {GameID.Minecraft: "Minecraft", GameID.MinecraftDungeons: "Minecraft Dungeons"}

src/local.py

@@ -1,84 +1,107 @@
+import os, logging
 
-import sys
-if sys.platform == 'win32':
+from consts import (
+    GameID,
+    REGISTRY_START_PATHS,
+    SOFTWARE_PATHS,
+    GAME_REGISTY_RELATIVE_LOCATIONS,
+    REGISTRY_EXE_KEYS,
+    WIN_UNINSTALL_RELATIVE_LOCATION,
+    IS_WINDOWS,
+)
+from utils import misc
+
+
+if IS_WINDOWS:
     import winreg
 
-from consts import MINECRAFT_REGISTRY_PATHS, REGISTRY_START_PATHS, MINECRAFT_REGISTRY_PATH_INSTALL_LOCATION_KEY, WINDOWS_UNINSTALL_LOCATION
+log = logging.getLogger(__name__)
 
-import logging as log
-import os
-import psutil
-import asyncio
 
-class LocalClient():
+class LocalClient:
     def __init__(self):
-        self.running_process = None
-
-    async def get_size_at_path(self, start_path):
-        total_size = 0
-        for dirpath, dirnames, filenames in os.walk(start_path):
-            for f in filenames:
-                await asyncio.sleep(0)
-                fp = os.path.join(dirpath, f)
-                if not os.path.islink(fp):
-                    total_size += os.path.getsize(fp)
-
-        return total_size
-
-    def get_minecraft_launcher_path(self):
-        if sys.platform == 'win32':
-            install_path = self.get_minecraft_folder_path()
-            potential_path = os.path.join(install_path, 'MinecraftLauncher.exe')
-            if os.path.exists(potential_path):
-                return potential_path
-        else:
-            return self.get_minecraft_folder_path()
-
-    def get_minecraft_folder_path(self):
-        if sys.platform == 'win32':
-            for start_path in REGISTRY_START_PATHS:
-                for minecraft_reg_path in MINECRAFT_REGISTRY_PATHS:
-                    try:
-                        reg = winreg.ConnectRegistry(None, start_path)
-                        with winreg.OpenKey(reg, minecraft_reg_path) as key:
-                            install_path = winreg.QueryValueEx(key, MINECRAFT_REGISTRY_PATH_INSTALL_LOCATION_KEY)[0]
-                    except OSError:
-                        continue
-                    if os.path.exists(install_path):
-                        return install_path
-        else:
-            potential_path = "/Applications/Minecraft.app"
-            if os.path.exists(potential_path):
-                return potential_path
+        self.running_games = {
+            GameID.Minecraft: None,
+            GameID.MinecraftDungeons: None,
+        }
+
+    def find_launcher_path(self, game_id, *, folder=False, folder_path=None, exe=None) -> str:
+        if exe is None and folder_path is not None:
+            folder_path = None
+        if exe is not None and folder_path is None:
+            folder_path = exe
+        if exe is not None and folder_path is not None:
+            folder_path = os.path.abspath(folder_path)
+            exe = os.path.abspath(exe)
+        log.debug(f"folder path for {game_id}: {folder_path}")
+        log.debug(f"path for {game_id}: {exe}")
+        return exe if not folder else folder_path
+
+    def is_game_still_running(self, game_id) -> bool:
+        return self.running_games[game_id] and self.running_games[game_id].poll() is None
 
-    def find_minecraft_uninstall_command(self):
-        if sys.platform == 'win32':
-            reg = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
-            with winreg.OpenKey(reg, WINDOWS_UNINSTALL_LOCATION) as key:
+    def launch(self, game_id):
+        log.info(f"Launching {game_id}")
+        self.running_games[game_id] = misc.open_path(self.find_launcher_path(game_id))
+
+    def uninstall(game_id):
+        pass
+
+
+class WindowsLocalClient(LocalClient):
+    def find_launcher_path(self, game_id, folder=False):
+        for start_path in REGISTRY_START_PATHS:
+            for software_path in SOFTWARE_PATHS:
+                reg = winreg.ConnectRegistry(None, start_path)
+                try:
+                    with winreg.OpenKey(
+                        reg, software_path + GAME_REGISTY_RELATIVE_LOCATIONS[game_id]
+                    ) as key:
+                        directory = winreg.QueryValueEx(key, "InstallLocation")[0]
+                        return super().find_launcher_path(
+                            game_id,
+                            folder=folder,
+                            folder_path=directory,
+                            exe=os.path.join(
+                                directory, winreg.QueryValueEx(key, REGISTRY_EXE_KEYS[game_id])[0]
+                            ),
+                        )
+                except OSError:
+                    pass
+        return super().find_launcher_path(game_id, folder=folder)
+
+    def uninstall(self, game_id):
+        targetDisplayName = None
+        if game_id == GameID.Minecraft:
+            targetDisplayName = "Minecraft Launcher"
+        elif game_id == GameID.MinecraftDungeons:
+            targetDisplayName = "Minecraft Dungeons Launcher"
+        for start_path in REGISTRY_START_PATHS:
+            for software_path in SOFTWARE_PATHS:
+                reg = winreg.ConnectRegistry(None, start_path)
+                try:
+                    key = winreg.OpenKey(reg, software_path + WIN_UNINSTALL_RELATIVE_LOCATION)
+                except OSError:
+                    continue
                 for i in range(0, winreg.QueryInfoKey(key)[0]):
                     try:
                         subkey_name = winreg.EnumKey(key, i)
                         with winreg.OpenKey(key, subkey_name) as subkey:
-                            if winreg.QueryValueEx(subkey,'DisplayName')[0] == 'Minecraft Launcher':
-                                return winreg.QueryValueEx(subkey, 'UninstallString')[0]
+                            if winreg.QueryValueEx(subkey, "DisplayName")[0] == targetDisplayName:
+                                misc.run(winreg.QueryValueEx(subkey, "UninstallString")[0])
+                                return
                     except OSError:
-                        continue
-        else:
-            pass
-
-    def is_minecraft_still_running(self):
-        if self.running_process and self.running_process.is_running():
-            return True
-        elif self.running_process and not self.running_process.is_running():
-            self.running_process = None
-            return False
-
-    async def was_minecraft_launched(self, process_iter_interval=0.15):
-        for process in psutil.process_iter(attrs=['name', 'exe'], ad_value=''):
-            await asyncio.sleep(process_iter_interval)
-            if process.info['name'].lower() == "minecraftlauncher.exe" or process.info['exe'] == "/Applications/Minecraft.app/Contents/MacOS/launcher":
-                log.info(f"Found a running game!")
-                self.running_process = process
-                return True
-        self.running_process = None
-        return False
+                        pass
+                winreg.CloseKey(key)
+
+
+class MacLocalClient(LocalClient):
+    def find_launcher_path(self, game_id, *, folder=False):
+        if game_id == GameID.Minecraft:
+            potential_path = "/Applications/Minecraft.app"
+            if os.path.exists(potential_path):
+                return super().find_launcher_path(game_id, folder=folder, exe=potential_path)
+        return super().find_launcher_path(game_id, folder=folder)
+
+    def uninstall(self, game_id):
+        misc.send2trash(self.find_launcher_path(game_id, folder=True))

src/manifest.json

@@ -1,12 +1,12 @@
 {
-    "name": "Galaxy Minecraft plugin",
-    "platform": "minecraft",
-    "guid": "cb57391f-1675-35b1-05c0-896d43bdf8f4",
-    "version": "0.8.3",
-    "description": "Galaxy Minecraft plugin",
-    "author": "TouwaStar",
-    "email": "yowosek@gmail.com.com",
-    "url": "https://github.com/TouwaStar/Galaxy_Plugin_Minecraft",
-    "script": "plugin.py",
-    "update_url": "https://raw.githubusercontent.com/FriendsOfGalaxy/galaxy-integration-minecraft/master/current_version.json"
-}
+  "name": "Galaxy Minecraft plugin",
+  "platform": "minecraft",
+  "guid": "cb57391f-1675-35b1-05c0-896d43bdf8f4",
+  "version": "1.0.3",
+  "description": "Galaxy Minecraft plugin",
+  "author": "TouwaStar",
+  "email": "yowosek@gmail.com.com",
+  "url": "https://github.com/TouwaStar/Galaxy_Plugin_Minecraft",
+  "script": "plugin.py",
+  "update_url": "https://raw.githubusercontent.com/FriendsOfGalaxy/galaxy-integration-minecraft/master/current_version.json"
+}

src/multimc.py

@@ -0,0 +1,57 @@
+import os, logging
+
+from galaxy.api.plugin import GameTime
+
+from consts import IS_WINDOWS, GameID
+from utils import misc
+
+log = logging.getLogger(__name__)
+
+
+class PathNotExectuable(Exception):
+    pass
+
+
+class MultiMCClient:
+    def __init__(self, path: str):
+        self.path = os.path.expanduser(os.path.expandvars(os.path.abspath(path)))
+        if not os.access(path, os.X_OK):
+            raise PathNotExectuable
+        self.folder = os.path.dirname(self.path) if IS_WINDOWS else self.path
+        log.debug(f"MultiMC Path: {self.path}")
+        self.instances_path = (
+            os.path.join(self.folder, "instances")
+            if IS_WINDOWS
+            else os.path.join(self.folder, "Contents", "MacOS", "instances")
+        )
+        log.debug(f"MultiMC instances path: {self.instances_path}")
+        self.process = None
+
+    def get_time(self):
+        time = 0  # in seconds
+        lastPlayed = None
+        for f in os.scandir(self.instances_path):
+            if f.is_dir():
+                cfg_path = os.path.join(f.path, "instance.cfg")
+                if os.path.isfile(cfg_path):
+                    with open(cfg_path, "r") as f:
+                        for line in f.readlines():
+                            split_line = line.strip().split("=")
+                            if split_line[0] == "totalTimePlayed":
+                                time += int(split_line[1])
+                            elif split_line[0] == "lastLaunchTime":
+                                lastPlayed = misc.compare(lastPlayed, int(split_line[1]))
+        log.debug(f"Got total MultiMC Time: {time / 60}")
+        return GameTime(GameID, time / 60, lastPlayed)
+
+    def launch(self):
+        self.process = misc.open_path(self.path)
+
+    def running(self):
+        if self.process is None:
+            return False
+        elif self.process.poll() is None:
+            return True
+        else:
+            self.process = None
+            return False