plugin: Update deps, fix GetGameRegion (OverlayPlugin#1008)

Author: valarnin

plugin/CactbotEventSource/CactbotEventSource.cs

@@ -220,7 +220,7 @@ public override void Start() {
       overlay_plugin_version_ = versions.GetOverlayPluginVersion();
       ffxiv_plugin_version_ = versions.GetFFXIVPluginVersion();
       act_version_ = versions.GetACTVersion();
-      game_region_ = versions.GetGameRegion();
+      game_region_ = plugin_helper.GetGameRegion();
 
       if (overlay_plugin_version_.CompareTo(new Version("0.19.0.0")) < 0) {
           var str = String.Format("Old OverlayPlugin {0} detected.  To fix this, follow these instructions: https://overlayplugin.github.io/OverlayPlugin/fork_update.html (this url is also pinned in FFXIV ACT Discord #general)", overlay_plugin_version_.ToString());

plugin/CactbotEventSource/FFXIVPlugin.cs

@@ -47,6 +47,32 @@ public string GetLocaleString() {
       }
     }
 
+    internal VersionChecker.GameRegion GetGameRegion() {
+      if (ffxiv_plugin_ == null) {
+        logger_.Log(LogLevel.Error, Strings.NoFFXIVACTPluginFoundErrorMessage);
+        return VersionChecker.GameRegion.International;
+      }
+
+      try {
+        dynamic plugin_derived = ffxiv_plugin_;
+        switch ((byte)plugin_derived.DataRepository.GetGameRegion())
+        {
+          default:
+          case 1:
+            return VersionChecker.GameRegion.International;
+          case 2:
+            return VersionChecker.GameRegion.Chinese;
+          case 3:
+            return VersionChecker.GameRegion.Korean;
+          case 4:
+            return VersionChecker.GameRegion.TraditionalChinese;
+        }
+      } catch (Exception e) {
+        logger_.Log(LogLevel.Error, Strings.DeterminingLanguageErrorMessage, e.ToString());
+        return VersionChecker.GameRegion.International;
+      }
+    }
+
     public int GetLanguageId() {
       if (ffxiv_plugin_ == null) {
         logger_.Log(LogLevel.Error, Strings.NoFFXIVACTPluginFoundErrorMessage);

plugin/CactbotEventSource/VersionChecker.cs

@@ -105,28 +105,6 @@ public enum GameRegion {
       TraditionalChinese,
     }
 
-    public GameRegion GetGameRegion() {
-      try {
-        var mach = Assembly.Load("Machina.FFXIV");
-        var opcode_manager_type = mach.GetType("Machina.FFXIV.Headers.Opcodes.OpcodeManager");
-        var opcode_manager = opcode_manager_type.GetProperty("Instance").GetValue(null);
-        var machina_region = opcode_manager_type.GetProperty("GameRegion").GetValue(opcode_manager).ToString();
-        switch (machina_region) {
-          case "Chinese":
-            return GameRegion.Chinese;
-          case "Korean":
-            return GameRegion.Korean;
-          case "TraditionalChinese":
-            return GameRegion.TraditionalChinese;
-          default:
-            return GameRegion.International;
-        }
-      } catch (Exception e) {
-        logger_.Log(LogLevel.Error, Strings.GetGameRegionException, e.Message);
-        return GameRegion.International;
-      }
-    }
-
     public async void DoUpdateCheck(CactbotEventSourceConfig config) {
       var pluginDirectory = GetCactbotDirectory();
       if (pluginDirectory == "") {

util/DEPS.json5

@@ -3,21 +3,21 @@
 //   I just borrowed the basic concept and naming scheme.
 {
     "ACT": {
-        "url": "https://github.com/EQAditu/AdvancedCombatTracker/releases/download/3.6.2.279/ACTv3.zip",
+        "url": "https://github.com/EQAditu/AdvancedCombatTracker/releases/download/3.8.4.287/ACTv3.zip",
         "dest": "plugin/ThirdParty/ACT",
         "strip": 0,
-        "hash": ["sha256", "8822e08147a44d0b82548068033dc18177c1fac993e8564e1ac32ed94c570e08"],
+        "hash": ["sha256", "c19916dffed435594e37ffeab99681c9cf2005b45e80016fdfb1eb8f60c9c480"],
     },
     "FFXIV_ACT": {
-        "url": "https://github.com/ravahn/FFXIV_ACT_Plugin/raw/master/Releases/FFXIV_ACT_Plugin_SDK_2.2.1.6.zip",
+        "url": "https://github.com/ravahn/FFXIV_ACT_Plugin/raw/master/Releases/FFXIV_ACT_Plugin_SDK_3.0.0.6.zip",
         "dest": "plugin/ThirdParty/FFXIV_ACT",
         "strip": 0,
-        "hash": ["sha256", "9a801d2df30c186b3915cb75dd12d1c75e559de09f71038bf1f68f7d8a3aa34a"],
+        "hash": ["sha256", "6a7927f455a25cc14cdb8a210aebd0797b64e5f216b15fac6edf907d4a1280c5"],
     },
     "OverlayPlugin": {
-        "url": "https://github.com/OverlayPlugin/OverlayPlugin/releases/download/v0.19.21/OverlayPlugin-0.19.21.zip",
+        "url": "https://github.com/OverlayPlugin/OverlayPlugin/releases/download/v0.19.86/OverlayPlugin-0.19.86.zip",
         "dest": "plugin/ThirdParty/OverlayPlugin",
         "strip": 1,
-        "hash": ["sha256", "5abd855169dc02bb8a337bdff511f24e1ed0b783dca197bdce3e9ec160735624"],
+        "hash": ["sha256", "bdc863b939e68a1a4ae7129c6c0ec1cb033ac37f3577c87acfd7290a7c79a033"],
     },
 }

util/fetch_deps.ts

@@ -88,7 +88,7 @@ const extractFile = async (dlname: string, meta: Meta): Promise<void> => {
   if (meta['url'].endsWith('.zip')) {
     const zip = await JSZip.loadAsync(await fs.readFile(dlname));
     for (const [relativePath, entry] of Object.entries(zip.files)) {
-      const distPath = path.join(dest, relativePath.split('/').slice(meta.strip).join('/'));
+      const distPath = path.join(dest, relativePath.split(/[/\\]/).slice(meta.strip).join('/'));
       const dir = path.dirname(distPath);
       if (entry.dir) {
         await fs.mkdir(distPath, { recursive: true });