Extra Small Files (#74)

Author: apple1417

Mods/ModMenu/ModObjects.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
-import unrealsdk
 import copy
 import enum
+import sys
 from abc import ABCMeta
+from os import path
 from typing import Any, Dict, List, Optional, Sequence, Tuple
 
 from . import KeybindManager
@@ -71,7 +72,13 @@ class Game(enum.Flag):
     @staticmethod
     def GetCurrent() -> Game:
         """ Gets the current game. """
-        return Game.BL2 if unrealsdk.GetEngine().GetEngineVersion() == 8639 else Game.TPS
+        exe = path.basename(sys.executable)
+        exe_lower = exe.lower()
+        if exe_lower == "borderlands2.exe":
+            return Game.BL2
+        elif exe_lower == "borderlandspresequel.exe":
+            return Game.TPS
+        raise RuntimeError(f"Unknown executable name '{exe}'!")
 
 
 class _ModMeta(ABCMeta):

Mods/ModMenu/SettingsManager.py

@@ -96,7 +96,7 @@ def LoadModSettings(mod: ModObjects.SDKMod) -> None:
     try:
         with open(GetSettingsFilePath(mod)) as file:
             settings = json.load(file)
-    except FileNotFoundError:
+    except (FileNotFoundError, json.JSONDecodeError):
         return
 
     def load_options_dict(options: Sequence[Options.Base], settings: Dict[str, Any]) -> None:
@@ -129,7 +129,7 @@ def load_options_dict(options: Sequence[Options.Base], settings: Dict[str, Any])
             elif isinstance(option, Options.Nested):
                 load_options_dict(option.Children, value)
 
-    load_options_dict(mod.Options, settings.get(_KEYBINDS_CATEGORY_NAME, {}))
+    load_options_dict(mod.Options, settings.get(_OPTIONS_CATEGORY_NAME, {}))
 
     saved_keybinds = settings.get(_KEYBINDS_CATEGORY_NAME, {})
     for input in mod.Keybinds:

Mods/ModMenu/__init__.py

@@ -4,7 +4,7 @@
 
 # Need to define these up here so that they're accessable when importing the other files
 VERSION_MAJOR = 2
-VERSION_MINOR = 0
+VERSION_MINOR = 1
 
 unrealsdk.Log(f"[ModMenu] Version: {VERSION_MAJOR}.{VERSION_MINOR}")