Merge branch 'main' of https://github.com/OpenGOAL-Unofficial-Mods/OpenGoal-ModLauncher-dev

Author: dallmeyer

openGOALModLauncher.py

@@ -212,7 +212,7 @@ class ColumnEnum(IntEnum):
     0,  # website
     0,  # videos
     0,  # photos
-]    
+]
 
 FILTER_STR = ""
 FILTER_GAME = "jak1"
@@ -324,7 +324,7 @@ def getRefreshedTableData(sort_col_idx):
                         release_date = datetime.strptime(mod["release_date"], '%Y-%m-%d')
                         if datetime.now() - release_date < timedelta(days = 10):
                             release_date_str = release_date_str + " ✨NEW✨"
-                        
+
                         mod_table_data.append(
                             [
                                 mod_id,
@@ -368,7 +368,7 @@ def getRefreshedTableData(sort_col_idx):
       # add asc/desc arrows if not in our wakeup sort special case
       sorted_table_headings[remapped_col_idx] += " ↑" if LATEST_TABLE_SORT[1] else " ↓"
 
-    if remapped_col_idx == ColumnEnum.SPECIAL: 
+    if remapped_col_idx == ColumnEnum.SPECIAL:
         # special sort for wakeup, do coalesce(access date,release date)
         mod_table_data.sort(
             key=lambda x: x[ColumnEnum.RELEASE_DATE]
@@ -869,9 +869,19 @@ def loading_screen_with_thread(thread):
         tmpModURL = window["-SELECTEDMODNAME-"].metadata["url"]
         tmpGame = window["-SELECTEDMODNAME-"].metadata["game"]
 
-        launch_thread = threading.Thread(target=launch_mod, args=(tmpModURL,))
 
-        loading_screen_with_thread(launch_thread)
+        selected_mod_tags = window["-SELECTEDMODTAGS-"].get()
+        if "external" in selected_mod_tags:
+            ans = sg.popup_ok_cancel(tmpModName + " is an external mod that can be found at " + tmpModURL + " would you like to go there now?", icon=iconfile, image=iconfile)
+            if ans == "OK":
+                webbrowser.open(tmpModURL)
+                reset()
+        else:
+            launch_thread = threading.Thread(target=launch_mod, args=(tmpModURL,))
+
+            loading_screen_with_thread(launch_thread)
+
+
     elif event == "-VIEWFOLDER-":
         tmpModSelected = window["-SELECTEDMODNAME-"].metadata["id"]
         subfolders = [f.name for f in os.scandir(ModFolderPATH) if f.is_dir()]

resources/jak1_mods.json

@@ -71,7 +71,7 @@
     "URL": "https://github.com/OpenGOAL-Mods/OG-RCO/releases",
     "website_url": "https://github.com/OpenGOAL-Mods/OG-RCO/blob/main/README.md",
     "videos_url": "https://www.youtube.com/watch?v=u8MgkLtHT4I",
-    "game": "jak1"    
+    "game": "jak1"
   },
   "speedrun_practice": {
     "name": "Speedrun Practice (Jak 1)",
@@ -121,7 +121,7 @@
     "URL": "https://github.com/himham-jak/Jak1-but-Microtransactions/releases",
     "website_url": "https://github.com/himham-jak/Jak1-but-Microtransactions/blob/microtransactions/README.md",
     "videos_url": "https://www.youtube.com/watch?v=q5TZ9U399J8",
-    "game": "jak1"  
+    "game": "jak1"
   },
   "jak_go_fast": {
     "name": "Jak1 but every power cell he gets faster",
@@ -853,5 +853,18 @@
     "image_override_url": "https://raw.githubusercontent.com/dallmeyer/modimages/main/cuttlefish-river-to-water.png",
     "website_url": "https://github.com/Cuttlefishthesage/OG-Mod-Base/tree/v0.0.1-afoniddwr.3",
     "game": "jak1"
+  },
+  "jak1_teamruns": {
+    "name": "Team Runs",
+    "desc": "TeamRuns is a online Jak 1 Experience Created by Dexz you can find it at https://teamruns.web.app/",
+    "contributors": ["DexZ"],
+    "tags": [
+      "external"
+    ],
+    "release_date": "2024-06-05",
+    "URL": "https://teamruns.web.app/",
+    "website_url": "https://teamruns.web.app/",
+    "image_override_url":"https://teamruns.web.app/assets/teamrun-logo.png",
+    "game": "jak1"
   }
 }