.vscode/settings.json

@@ -1,17 +1,14 @@
 {
     "cSpell.words": [
         "allmaps",
-        "anavoi",
         "Behaviour",
         "currentmap",
         "Dont",
-        "Gaboule",
         "gamemode",
         "GBSU",
         "gmenu",
         "hlapi",
         "netstandard",
-        "playercount",
         "protontricks",
         "rotationconfig",
         "serverip",

Addons/GBSUGui.cs

@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using BepInEx;
 using CoreNet.Config;
 using GB.Config;
@@ -15,16 +13,14 @@ namespace GBSU.Addons;
 public class GBSUGui : MonoBehaviour
 {
     private bool menu_shown;
-    private bool error_shown;
     //private string _currentMap;
     public Rect gmenu = new(Screen.width / 2, 0, 385f, 690f);
-    public Rect error_dialog = new(Screen.width / 2, 0, 520f, 175f);
-    private string error_msg = "Unknown error!";
 
     readonly IInputSystem inputSystem = UnityInput.Current;
     string serverip = null;
-    int serverport = 5999;
+    int serverport = 0;
     string currentmap;
+    int vsync_switch;
     bool hosting = false;
     private void Start()
     {
@@ -36,6 +32,8 @@ public class GBSUGui : MonoBehaviour
         {
             int.TryParse(CommandLineParser.Instance.GetValueForKey("-port", true), out serverport);
         }
+
+        vsync_switch = QualitySettings.vSyncCount;
     }
     private void Update()
     {
@@ -67,7 +65,7 @@ public class GBSUGui : MonoBehaviour
         GUI.skin.label.alignment = TextAnchor.UpperLeft;
 
         GUILayout.Label($@"==Guide==
-Set CLI arguments: -ip, -port
+Set CLI arguments: -ip, -port, -servername, -serverpassword
 
 [Hosting]
 1. Create a config in Gang Beasts_Data/Config/Rotation/config.json
@@ -80,49 +78,29 @@ Set CLI arguments: -ip, -port
         {
             Application.Quit(0);
         }
-        if (serverip != null)
+        if (serverip != null && serverport != default)
         {
             if (GUI.Button(new Rect(20f, 260f, 170f, 30f), "Host"))
             {
                 if (LobbyManager.Instance.LobbyStates.SelfState == LobbyState.Game.Menu)
                 {
-                    if (File.Exists(Helper.RotationFolderPath + "config.json"))
+                    hosting = true;
-                    {
+                    
-                        hosting = true;
+                    AudioListener.volume = 0; // mute game audio
 
-                        AudioListener.volume = 0; // mute game audio
+                    Plugin.AddServerComp(); // add custom GBSU server component
 
-                        Plugin.AddServerComp(); // add custom GBSU server component
+                    RotationConfig gameConfig = GBConfigLoader.LoadRotationConfig("config.json", true); // load rotation config from Config/Rotation/config.json
-                        
+                    ServerConfig serverConfig = NetConfigLoader.LoadServerConfig(); // load default server config, because it can be overridden by args like -ip and -port
-                        try
+                    MonoSingleton<Global>.Instance.UNetManager.LaunchServer(serverConfig); // launch the server with the server config
-                        {
+                    MonoSingleton<Global>.Instance.UNetManager.GetComponent<GameManagerNew>().ChangeRotationConfig(gameConfig, 0); // set server's rotationconfig
-                            RotationConfig gameConfig = GBConfigLoader.LoadRotationConfig("config.json", true); // load rotation config from Config/Rotation/config.json
-                            ServerConfig serverConfig = NetConfigLoader.LoadServerConfig(); // load default server config, because it can be overridden by args like -ip and -port
-                            MonoSingleton<Global>.Instance.UNetManager.LaunchServer(serverConfig); // launch the server with the server config
-                            MonoSingleton<Global>.Instance.UNetManager.GetComponent<GameManagerNew>().ChangeRotationConfig(gameConfig, 0); // set server's rotationconfig
-                        }
-                        catch (Exception e)
-                        {
-                            PushError("Looks like you've caught a bug! Please send your log file to us :)\n" + e);
-                        }
-                    }
-                    else
-                    {
-                        PushError(@$"No config.json could be found in {Helper.RotationFolderPath}
-Make sure to download a file from the examples given and rename it to config.json.
-{Helper.FilesInRotationDir()}");
-                    }
-                }
-                else
-                {
-                    PushError("Please stay on the main menu to begin hosting. Tip: You might need to exit your lobby.");
                 }
             }
             if (GUI.Button(new Rect(195f, 260f, 170f, 30f), "Join"))
             {
                 if (LobbyManager.Instance.LobbyStates.SelfState == LobbyState.Game.Online)
                 {
-                    if (!hosting)
+                    if (!hosting && serverip != null && serverport != 0)
                     {
                         LobbyManager.Instance.LobbyStates.IP = serverip;
                         LobbyManager.Instance.LobbyStates.Port = serverport;
@@ -130,22 +108,10 @@ Make sure to download a file from the examples given and rename it to config.jso
                         LobbyManager.Instance.LocalBeasts.SetupNetMemberContext(true);
                         MonoSingleton<Global>.Instance.UNetManager.LaunchClient(serverip, serverport);
                     }
-                    else
+
-                    {
-                        PushError("You are currently hosting a match! Please restart the game before attempting to join.");
-                    }
-                }
-                else
-                {
-                    PushError("Failed to join lobby! Please select the Online option in-game before joining.");
                 }
             }
         }
-        else
-        {
-            PushError("Couldn't find the -ip CLI argument. Please refer to the documentation.");
-        }
-
         if (GUI.Button(new Rect(20f, 295f, 170f, 30f), "Cap FPS to 60"))
         {
             Application.targetFrameRate = 60;
@@ -156,16 +122,18 @@ Make sure to download a file from the examples given and rename it to config.jso
         }
         if (GUI.Button(new Rect(20f, 330f, 170f, 30f), "Toggle VSync"))
         {
-            if (QualitySettings.vSyncCount == 0)
+            if (vsync_switch == 0)
             {
-                QualitySettings.vSyncCount = 1;
+                vsync_switch = 1;
             }
             else
             {
-                QualitySettings.vSyncCount = 0;
+                vsync_switch = 0;
             }
-        }
 
+            QualitySettings.vSyncCount = vsync_switch;
+        }
+        
         GUI.Label(new Rect(20f, 365f, 365f, 400f), $@"
 
 Current map: {currentmap}
@@ -183,19 +151,6 @@ Please refer to the documentation for more information.");
         GUI.DragWindow(new Rect(0, 0, 10000, 10000));
     }
 
-    private void ShowError(int window)
-    {
-        GUI.skin.label.alignment = TextAnchor.MiddleCenter;
-
-        GUILayout.Label(error_msg);
-
-        if (GUI.Button(new Rect(420f, 135f, 85f, 30f), "Close"))
-        {
-            error_shown = false;
-        }
-
-        GUI.DragWindow(new Rect(0, 0, 10000, 10000));
-    }
     private string UpdateScoreDisplay()
     {
         if (hosting)
@@ -210,25 +165,11 @@ Please refer to the documentation for more information.");
         return null;
     }
 
-    private void PushError(string message)
-    {
-        Plugin.Log.LogError(message);
-
-        // Push this error to the UI
-        error_msg = message;
-        error_shown = true;
-    }
-
     public void OnGUI()
     {
         if (menu_shown)
         {
-            gmenu = GUILayout.Window(121, gmenu, ShowOurWindow, $"{MyPluginInfo.PLUGIN_NAME} [{MyPluginInfo.PLUGIN_VERSION}]");
+            gmenu = GUILayout.Window(121, gmenu, ShowOurWindow, $"{Plugin.PluginName} [{Plugin.PluginVersion}]");
-        }
-
-        if (error_shown)
-        {
-            error_dialog = GUILayout.Window(122, error_dialog, ShowError, "An error occurred!");
         }
     }
 }

Addons/GBSUServer.cs

@@ -26,7 +26,7 @@ public class GBSUServer : MonoBehaviour
     }
     void SetLocalGangToOff()
     {
-        localSingleGang?.SetValue(false);
+        localSingleGang.SetValue(false);
     }
 
     /*

Addons/Helper.cs

@@ -1,13 +1,9 @@
 using System;
-using System.IO;
-using UnityEngine;
 using UnityEngine.Analytics;
 
 namespace GBSU.Addons;
 public class Helper
 {
-    public static string RotationFolderPath = Application.dataPath + "/Config/Rotation/";
-    public static string GameConfigPath = RotationFolderPath + "config.json";
     public static void DisableAnalytics()
     {
         // Try disabling analytics https://docs.unity3d.com/ScriptReference/Analytics.Analytics-deviceStatsEnabled.html
@@ -21,40 +17,4 @@ public class Helper
             Plugin.Log.LogWarning("Failed to disable analytics: " + e.Message);
         }
     }
-    public static void CreateRotationFolder()
-    {
-        try
-        {
-            Plugin.Log.LogInfo("Creating rotation folder at " + RotationFolderPath);
-            Directory.CreateDirectory(RotationFolderPath);
-        }
-        catch (Exception e)
-        {
-            Plugin.Log.LogError("Could not create rotation folder path: " + e.Message);
-        }
-    }
-    public static string FilesInRotationDir()
-    {
-        // https://stackoverflow.com/a/14877330
-        DirectoryInfo d = new(RotationFolderPath);
-        FileInfo[] files = d.GetFiles();
-        int number = files.Length;
-
-        // no files?
-        if (number == 0)
-        {
-            return @"No files were found in the directory.";
-        }
-        else
-        {
-            string names = "";
-
-            foreach(FileInfo file in files)
-            {
-                names = file.Name + " " + names;
-            }
-
-            return $"There are {number} files: {names}";
-        }
-    }
 }

GBSU.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>GBSU</AssemblyName>
     <Product>Gang Beasts Server Utility</Product>
-    <Version>1.0.3</Version>
+    <Version>1.0.2</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <RestoreAdditionalProjectSources>

Plugin.cs

@@ -1,84 +1,71 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using BepInEx;
+using BepInEx;
-using BepInEx.Logging;
+using BepInEx.Logging;
-using GBSU.Addons;
+using GBSU.Addons;
-using HarmonyLib;
+using HarmonyLib;
-using HarmonyLib.Tools;
+using HarmonyLib.Tools;
-using UnityEngine;
+using UnityEngine;
-
+
-#pragma warning disable IDE0051 // Private member is unused
+#pragma warning disable IDE0051 // Private member is unused
-
+
-namespace GBSU;
+namespace GBSU;
-
+
-[BepInPlugin(MyPluginInfo.PLUGIN_GUID, MyPluginInfo.PLUGIN_NAME, MyPluginInfo.PLUGIN_VERSION)]
+[BepInPlugin(PluginGUID, PluginName, PluginVersion)]
-[BepInProcess("Gang Beasts.exe")]
+[BepInProcess("Gang Beasts.exe")]
-public class Plugin : BaseUnityPlugin
+public class Plugin : BaseUnityPlugin
-{
+{
-    public static Dictionary<string, int> GameScore = [];
+    public static Dictionary<string, int> GameScore = [];
-    private static GameObject _gbsuCompContainer;
+    private static GameObject _gbsuCompContainer;
-    internal static ManualLogSource Log;
+    internal static ManualLogSource Log;
-    
+    
-    public static GameObject GBSUCompContainer
+    public static GameObject GBSUCompContainer
-    {
+    {
-        get
+        get
-        {
+        {
-            if (_gbsuCompContainer == null)
+            if (_gbsuCompContainer == null)
-            {
+            {
-                _gbsuCompContainer = new GameObject("GBSUSingletons");
+                _gbsuCompContainer = new GameObject("GBSUSingletons");
-            }
+            }
-
+
-            return _gbsuCompContainer;
+            return _gbsuCompContainer;
-        }
+        }
-        set
+        set
-        {
+        {
-            Destroy(_gbsuCompContainer);
+            Destroy(_gbsuCompContainer);
-            _gbsuCompContainer = value;
+            _gbsuCompContainer = value;
-        }
+        }
-    }
+    }
-    private void Awake()
+    private void Awake()
-    {
+    {
-        // Plugin startup logic
+        // Plugin startup logic
-        Log = base.Logger;
+        Log = base.Logger;
-        Log.LogInfo($"\n------\nPlugin {MyPluginInfo.PLUGIN_NAME} [{MyPluginInfo.PLUGIN_VERSION}] is loaded!\n------\n");
+        Log.LogInfo($"\n------\nPlugin {PluginName} [{PluginVersion}] is loaded!\n------\n");
-
+
-        HarmonyFileLog.Enabled = true;
+        HarmonyFileLog.Enabled = true;
-        var harmony = new Harmony(MyPluginInfo.PLUGIN_GUID);
+        var harmony = new Harmony(PluginGUID);
-        harmony.PatchAll(Assembly.GetExecutingAssembly());
+        harmony.PatchAll(Assembly.GetExecutingAssembly());
-
+
-        GBSUCompInit();
+        GBSUCompInit();
-
+
-        Helper.DisableAnalytics(); // thank me later
+        Helper.DisableAnalytics(); // thank me later
-
+    }
-        // create server config path
+
-        Helper.CreateRotationFolder();
+    private static void GBSUCompInit()
-
+    {
-        Log.LogDebug("Server game config should be found at " + Helper.GameConfigPath);
+        // Create a container that wont lose our objects
-    }
+        GBSUCompContainer = new GameObject("GBSUSingletons");
-
+        DontDestroyOnLoad(GBSUCompContainer);
-    private static void GBSUCompInit()
+        GBSUCompContainer.hideFlags = HideFlags.DontUnloadUnusedAsset;
-    {
+        GBSUCompContainer.AddComponent<GBSUGui>();
-        // Create a container that wont lose our objects
+    }
-        GBSUCompContainer = new GameObject("GBSUSingletons");
+
-        DontDestroyOnLoad(GBSUCompContainer);
+    public static void AddServerComp()
-        GBSUCompContainer.hideFlags = HideFlags.DontUnloadUnusedAsset;
+    {
-        GBSUCompContainer.AddComponent<GBSUGui>();
+        GBSUCompContainer.AddComponent<GBSUServer>();
-    }
+    }
-
+
-    public static void AddServerComp()
+    public const string PluginGUID = "com.gaboule.plugins.gbsu";
-    {
+    public const string PluginName = "Gang Beasts Server Utility";
-        Component[] comps = GBSUCompContainer.GetComponents(typeof(Component));
+    public const string PluginVersion = "1.0.2";
-        foreach (var comp in comps)
+}
-        {
-            Log.LogDebug("iterating thru singleton comps");
-            if(comp is GBSUServer)
-            {
-                Log.LogDebug("GBSUServer component was found! Destroying it");
-                Destroy(comp);
-            }
-        }
-
-        Log.LogDebug("Adding GBSUServer component");
-        GBSUCompContainer.AddComponent<GBSUServer>();
-    }
-}