From 2b079671be3336eff79248b51c69d0ec60730016 Mon Sep 17 00:00:00 2001
From: Nathan Flurry <developer@nathanflurry.com>
Date: Mon, 7 Oct 2024 06:57:01 -0700
Subject: [PATCH] chore: fix dpeloy

---
 Assets/Rivet/Editor/UI/Dock/Tabs/DevelopController.cs | 6 +++---
 Assets/Rivet/Editor/UI/TaskPopup/TaskPopupWindow.cs   | 8 ++++----
 rivet.json                                            | 7 ++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Assets/Rivet/Editor/UI/Dock/Tabs/DevelopController.cs b/Assets/Rivet/Editor/UI/Dock/Tabs/DevelopController.cs
index 3c0a6d0..b41af77 100644
--- a/Assets/Rivet/Editor/UI/Dock/Tabs/DevelopController.cs
+++ b/Assets/Rivet/Editor/UI/Dock/Tabs/DevelopController.cs
@@ -69,7 +69,7 @@ void InitUI()
             _lgsShowLogs = _root.Q("PlayBody").Q("ServerLogsButton");
 
             _buildDeployButton = _root.Q("BuildDeployButton").Q<Button>("Button");
-            _stepsDropdown = _root.Q<DropdownField>("StepsDropdown");
+            _stepsDropdown = _root.Q<DropdownField>("BuildStepsDropdown");
 
             // Callbacks
             _dock.LocalGameServerManager.StateChange += OnLocalGameServerStateChange;
@@ -279,12 +279,12 @@ private void OnBuildAndDeploy()
             }
 
             // Run deploy with CLI using TaskPopupWindow
-            var task = TaskPopupWindow.RunTask("Build & Deploy", "deploy", new JObject
+            TaskPopupWindow.RunTask("Build & Deploy", "deploy", new JObject
             {
                 ["cwd"] = Builder.ProjectRoot(),
                 ["environment_id"] = environmentId,
                 ["game_server"] = deployGameServer,
-                ["modules"] = deployModules,
+                ["backend"] = deployModules,
             });
         }
 
diff --git a/Assets/Rivet/Editor/UI/TaskPopup/TaskPopupWindow.cs b/Assets/Rivet/Editor/UI/TaskPopup/TaskPopupWindow.cs
index de1513f..8ce4827 100644
--- a/Assets/Rivet/Editor/UI/TaskPopup/TaskPopupWindow.cs
+++ b/Assets/Rivet/Editor/UI/TaskPopup/TaskPopupWindow.cs
@@ -45,7 +45,7 @@ public class TaskPopupWindow : EditorWindow
         private RivetTask _task;
 
         // Events
-        public event Action<object> OnTaskOutput;
+        public event Action<object>? OnTaskOutput;
 
         public static TaskPopupWindow RunTask(string title, string taskName, JObject taskInput)
         {
@@ -124,14 +124,14 @@ private async void InitializeAndStartTask()
             catch (Exception ex)
             {
                 AddLogLine($"Task failed with error: {ex.Message}", LogType.STDERR);
-                UpdateUI();
+                EditorApplication.delayCall += () => UpdateUI();
             }
         }
 
         private void UpdateUI()
         {
             bool running = _task != null && _task.IsRunning;
-            _doneButton.text = running ? "Cancel" : "Close";
+            _doneButton.text = running ? "Cancel" : "Done";
         }
 
         private void OnTaskCompleted(Result<JObject> output)
@@ -145,7 +145,7 @@ private void OnTaskCompleted(Result<JObject> output)
                     AddLogLine(err.Message, LogType.STDERR);
                     break;
             }
-            OnTaskOutput.Invoke(output);
+            OnTaskOutput?.Invoke(output);
 
             UpdateUI();
         }
diff --git a/rivet.json b/rivet.json
index dcbc695..02ced1f 100644
--- a/rivet.json
+++ b/rivet.json
@@ -12,9 +12,6 @@
 						"server": {
 							"environment": {
 								"SERVER_HOSTNAME": "0.0.0.0"
-							},
-							"tags": {
-
 							},
 							"ports": {
 								"game": {
@@ -23,8 +20,8 @@
 								}
 							},
 							"resources": {
-								"cpu": 250,
-								"memory": 250
+								"cpu": 500,
+								"memory": 500
 							}
 						}
 					}