chore: tweak deploy ui (#46)

OpenGameBackend · Aug 26, 2024 · 9feab8a · 9feab8a
1 parent b3f4a81
commit 9feab8a
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 24 deletions.
diff --git a/Assets/Examples/LobbiesServers/Scripts/UI.cs b/Assets/Examples/LobbiesServers/Scripts/UI.cs
@@ -33,9 +33,11 @@ private BackendClient TEMPBackendClient()
         return new BackendClient(config.BackendEndpoint);
     }
 
-    private string TEMPGameVersion() {
-        var config = new Configuration();
-        return config.GameVersion;
+    private string TEMPGameVersion()
+    {
+        // var config = new Configuration();
+        // return config.GameVersion;
+        return "default";
     }
 
     private void Start()

diff --git a/Assets/Rivet/Editor/Native/librivet_toolchain_ffi.dylib.meta b/Assets/Rivet/Editor/Native/librivet_toolchain_ffi.dylib.meta
diff --git a/Assets/Rivet/Editor/PluginSettings.cs b/Assets/Rivet/Editor/PluginSettings.cs
@@ -141,7 +141,7 @@ public static void UpdateFromPlugin()
                 BackendEndpoint = plugin.MainController.EnvironmentType switch
                 {
                     Rivet.UI.Screens.EnvironmentType.Local => $"http://localhost:{plugin.LocalBackendPort}",
-                    Rivet.UI.Screens.EnvironmentType.Remote => plugin.MainController.RemoteEnvironment?.Endpoint ?? "http://localhost:6420",
+                    Rivet.UI.Screens.EnvironmentType.Remote => plugin.MainController.RemoteEnvironmentBackend?.Endpoint ?? "http://localhost:6420",
                     _ => throw new System.NotImplementedException(),
                 };
 

diff --git a/Assets/Rivet/Editor/UI/Screens/MainController.cs b/Assets/Rivet/Editor/UI/Screens/MainController.cs
@@ -84,7 +84,7 @@ public int? RemoteEnvironmentIndex
             {
                 if (BootstrapData is { } data)
                 {
-                    var idx = data.Environments.FindIndex(x => x.EnvironmentId == RemoteEnvironmentId);
+                    var idx = data.Environments.FindIndex(x => x.Id == RemoteEnvironmentId);
                     return idx >= 0 ? idx : 0;
                 }
                 else
@@ -96,11 +96,20 @@ public int? RemoteEnvironmentIndex
             {
                 if (value != null && value >= 0 && value < BootstrapData?.Environments.Count)
                 {
-                    RemoteEnvironmentId = BootstrapData?.Environments[value.Value].EnvironmentId;
+                    RemoteEnvironmentId = BootstrapData?.Environments[value.Value].Id;
                 }
             }
         }
 
+        public EnvironmentBackend? RemoteEnvironmentBackend
+        {
+            get
+            {
+                var remoteEnv = RemoteEnvironment;
+                return remoteEnv != null ? BootstrapData?.Backends[remoteEnv.Value.Id] : null;
+            }
+        }
+
         public MainController(RivetPlugin window, VisualElement root)
         {
             _pluginWindow = window;
@@ -170,27 +179,10 @@ public async Task GetBootstrapData()
             var data = result.Data.ToObject<BootstrapData>(); ;
             BootstrapData = data;
 
-<<<<<<< HEAD
-            try
-            {
-                var data = result.Data.ToObject<BootstrapData>();
-                BootstrapData = data;
-                ExtensionData.ApiEndpoint = data.ApiEndpoint;
-
-                _developController.OnBootstrap(data);
-                _deployController.OnBootstrap(data);
-            }
-            catch (Exception ex)
-            {
-                RivetLogger.Error($"Exception in GetBootstrapData: {ex.Message}");
-                RivetLogger.Error($"Stack trace: {ex.StackTrace}");
-            }
-=======
             _developController.OnBootstrap(data);
             _deployController.OnBootstrap(data);
 
             SharedSettings.UpdateFromPlugin();
->>>>>>> 3ace6b6 (chore: re-impl deploys)
         }
 
         /// <summary>

diff --git a/Assets/Rivet/Editor/UI/Tabs/DeployController.cs b/Assets/Rivet/Editor/UI/Tabs/DeployController.cs
@@ -49,7 +49,6 @@ void InitUI()
 
             _environmentDropdown.RegisterValueChangedCallback(ev =>
             {
-                _mainController.EnvironmentType = EnvironmentType.Remote;
                 _mainController.RemoteEnvironmentIndex = _environmentDropdown.index;
                 _mainController.OnSelectedEnvironmentChange();
             });