refactor: Clean up unused code

Assets/Rivet/Dockerfile

@@ -1,5 +1,5 @@
 # MARK: Runner
-FROM ubuntu:22.04
+FROM debian:12
 WORKDIR /app
 
 # Install necessary libraries for Unity
@@ -10,15 +10,13 @@ RUN apt-get update && apt-get install -y \
     && useradd -ms /bin/bash rivet
 
 # Copy the precompiled Unity server files
-COPY ./Builds/Game /app/Game
-# COPY ./Builds/Game_BurstDebugInformation_DoNotShip /app/Game_BurstDebugInformation_DoNotShip
-# COPY ./Builds/Game_Data /app/Game_Data
-# COPY ./Builds/UnityPlayer.so /app/UnityPlayer.so
+COPY builds/LinuxServer/ /app
+RUN ls /app && chmod +x /app/LinuxServer.x86_64
 
 # Change to user rivet
 USER rivet
 
 ENV UNITY_SERVER=1
 
 # Run the server
-ENTRYPOINT ["./Game", "-batchmode", "-nographics"]
+ENTRYPOINT ["/app/LinuxServer.x86_64", "-batchmode", "-nographics"]

Assets/Rivet/Editor/RivetCLI.cs

@@ -1,13 +1,5 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data.Common;
-using System.Diagnostics;
 using System.IO;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
-using UnityEngine;
 
 public static class RivetCLI
 {
@@ -38,10 +30,7 @@ public static bool CLIInstalled()
                     return false;
                 }
                 return true;
-            case ErrorResult<JObject> _:
-                return false;
             default:
-                UnityEngine.Debug.Log("Got different result type");
                 return false;
         }
     }
@@ -53,33 +42,28 @@ public static Result<JObject> RunCommand(params string[] args)
 
     public static string GetBinDir()
     {
-        string homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        string homePath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.UserProfile);
         return Path.Combine(homePath, ".rivet", REQUIRED_RIVET_CLI_VERSION, "bin");
     }
 
     public static string GetRivetCLIPath()
     {
-        // // Assuming _RivetEditorSettings is a static class with a method GetSetting
-        // string cliPath = _RivetEditorSettings.GetSetting(RIVET_CLI_PATH_SETTING);
-        // if (!string.IsNullOrEmpty(cliPath))
-        // {
-        //     return cliPath;
-        // }
-
         return Path.Combine(GetBinDir(), "rivet");
     }
 
     public static Result<JObject> RunRivetCLI(params string[] args)
     {
-        UnityEngine.Debug.Log($"Running Rivet CLI: {GetRivetCLIPath()} {string.Join(" ", args)}");
+        // TODO: Turn this on if debug is enabled
+        // UnityEngine.Debug.Log($"Running Rivet CLI: {GetRivetCLIPath()} {string.Join(" ", args)}");
 
         if (!File.Exists(GetRivetCLIPath()))
         {
-            UnityEngine.Debug.LogError("File does not exist: " + GetRivetCLIPath());
+            // TODO: Turn this on if debug is enabled
+            // UnityEngine.Debug.LogError("File does not exist: " + GetRivetCLIPath());
             return new ErrorResult<JObject>("File does not exist: " + GetRivetCLIPath());
         }
 
-        var startInfo = new ProcessStartInfo
+        var startInfo = new System.Diagnostics.ProcessStartInfo
         {
             FileName = GetRivetCLIPath(),
             Arguments = string.Join(" ", args),
@@ -90,21 +74,19 @@ public static Result<JObject> RunRivetCLI(params string[] args)
 
         try
         {
-            using (var process = Process.Start(startInfo))
-            {
-                var output = process.StandardOutput.ReadToEnd();
-                process.WaitForExit();
+            using var process = System.Diagnostics.Process.Start(startInfo);
+            var output = process.StandardOutput.ReadToEnd();
+            process.WaitForExit();
 
-                return new SuccessResult<JObject>(JObject.Parse(output));
-            }
+            return new SuccessResult<JObject>(JObject.Parse(output));
         }
-        catch (Exception ex)
+        catch (System.Exception ex)
         {
             return new ErrorResult<JObject>("Failed to start process: " + ex.Message);
         }
     }
 
-    public static Result<string> _install()
+    public static Result<string> Install()
     {
         string bin_dir = GetBinDir();
 

Assets/Rivet/Editor/RivetPlugin.cs

@@ -1,10 +1,5 @@
-#define IN_EDITOR
-
 using UnityEngine;
 using UnityEditor;
-using System.Diagnostics;
-using System.IO;
-using Newtonsoft.Json.Linq;
 
 public static class ExtensionData
 {
@@ -59,6 +54,15 @@ public void TransitionToState(IState newState)
 
         void OnGUI()
         {
+            // Draw the global Rivet buttons
+
+            // Links
+            GUILayout.BeginHorizontal();
+            if (GUILayout.Button("Hub")) Application.OpenURL("https://hub.rivet.gg/");
+            if (GUILayout.Button("Docs")) Application.OpenURL("https://rivet.gg/docs");
+            if (GUILayout.Button("Discord")) Application.OpenURL("https://rivet.gg/discord");
+            GUILayout.EndHorizontal();
+
             // Call the OnGUI method of the current state
             currentState.OnGUI();
         }

Assets/Rivet/Editor/Windows/Installer.cs

@@ -1,10 +1,5 @@
 using UnityEngine;
 using UnityEditor;
-using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
-using System.Collections;
-using Newtonsoft.Json.Linq;
 
 namespace Rivet
 {
@@ -20,36 +15,8 @@ public Installer()
 
         public void OnEnter(RivetPluginWindow pluginWindow)
         {
-            new System.Threading.Thread(() =>
-        {
-
-            // var api_address = apiEndpointLineEdit.Text; // replace with your actual control
-            var api_address = "https://api.rivet.gg";
-
-            var getLinkResult = RivetCLI.RunCommand(
-                "--api-endpoint",
-                api_address,
-                "sidekick",
-                "get-namespace-development-token",
-                "--namespace",
-                "staging"
-            );
-
-            switch (getLinkResult)
-            {
-                case SuccessResult<JObject> successResult:
-                    var token = successResult.Data["Ok"]["token"].ToString();
-                    break;
-                case ErrorResult<JObject> errorResult:
-                    UnityEngine.Debug.LogError(errorResult.Message);
-                    break;
-            }
-
-        }).Start();
-
             this.window = pluginWindow;
 
-
             // Prepare the installer
             installLabelText = ReplacePlaceholders("%%version%% %%bin_dir%%");
             installButtonEnabled = false;
@@ -79,9 +46,7 @@ public void OnGUI()
                 // Handle the Install button click
                 new System.Threading.Thread(() =>
                 {
-                    // window.TransitionToState(new LoginState(window));
-                    // return;
-                    var result = RivetCLI._install();
+                    var result = RivetCLI.Install();
 
                     switch (result)
                     {

Assets/Rivet/Editor/Windows/Login.cs

@@ -1,6 +1,5 @@
 using UnityEngine;
 using UnityEditor;
-using System.Collections;
 using Newtonsoft.Json.Linq;
 
 namespace Rivet