diff --git a/.vscode/settings.json b/.vscode/settings.json index dc400bf..3a66143 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,14 +1,17 @@ { "cSpell.words": [ "allmaps", + "anavoi", "Behaviour", "currentmap", "Dont", + "Gaboule", "gamemode", "GBSU", "gmenu", "hlapi", "netstandard", + "playercount", "protontricks", "rotationconfig", "serverip", diff --git a/Addons/GBSUGui.cs b/Addons/GBSUGui.cs index d1447a3..e11e3c6 100644 --- a/Addons/GBSUGui.cs +++ b/Addons/GBSUGui.cs @@ -1,3 +1,5 @@ +using System; +using System.IO; using BepInEx; using CoreNet.Config; using GB.Config; @@ -13,14 +15,16 @@ 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 = 0; + int serverport = 5999; string currentmap; - int vsync_switch; bool hosting = false; private void Start() { @@ -32,8 +36,6 @@ public class GBSUGui : MonoBehaviour { int.TryParse(CommandLineParser.Instance.GetValueForKey("-port", true), out serverport); } - - vsync_switch = QualitySettings.vSyncCount; } private void Update() { @@ -65,7 +67,7 @@ public class GBSUGui : MonoBehaviour GUI.skin.label.alignment = TextAnchor.UpperLeft; GUILayout.Label($@"==Guide== -Set CLI arguments: -ip, -port, -servername, -serverpassword +Set CLI arguments: -ip, -port [Hosting] 1. Create a config in Gang Beasts_Data/Config/Rotation/config.json @@ -78,29 +80,49 @@ Set CLI arguments: -ip, -port, -servername, -serverpassword { Application.Quit(0); } - if (serverip != null && serverport != default) + if (serverip != null) { if (GUI.Button(new Rect(20f, 260f, 170f, 30f), "Host")) { if (LobbyManager.Instance.LobbyStates.SelfState == LobbyState.Game.Menu) { - hosting = true; - - AudioListener.volume = 0; // mute game audio + if (File.Exists(Helper.RotationFolderPath + "config.json")) + { + hosting = true; - Plugin.AddServerComp(); // add custom GBSU server component + AudioListener.volume = 0; // mute game audio - 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.Instance.UNetManager.LaunchServer(serverConfig); // launch the server with the server config - MonoSingleton.Instance.UNetManager.GetComponent().ChangeRotationConfig(gameConfig, 0); // set server's rotationconfig + Plugin.AddServerComp(); // add custom GBSU server component + + try + { + 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.Instance.UNetManager.LaunchServer(serverConfig); // launch the server with the server config + MonoSingleton.Instance.UNetManager.GetComponent().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 && serverip != null && serverport != 0) + if (!hosting) { LobbyManager.Instance.LobbyStates.IP = serverip; LobbyManager.Instance.LobbyStates.Port = serverport; @@ -108,10 +130,22 @@ Set CLI arguments: -ip, -port, -servername, -serverpassword LobbyManager.Instance.LocalBeasts.SetupNetMemberContext(true); MonoSingleton.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; @@ -122,18 +156,16 @@ Set CLI arguments: -ip, -port, -servername, -serverpassword } if (GUI.Button(new Rect(20f, 330f, 170f, 30f), "Toggle VSync")) { - if (vsync_switch == 0) + if (QualitySettings.vSyncCount == 0) { - vsync_switch = 1; + QualitySettings.vSyncCount = 1; } else { - vsync_switch = 0; + QualitySettings.vSyncCount = 0; } - - QualitySettings.vSyncCount = vsync_switch; } - + GUI.Label(new Rect(20f, 365f, 365f, 400f), $@" Current map: {currentmap} @@ -151,6 +183,19 @@ 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) @@ -165,11 +210,25 @@ 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, $"{Plugin.PluginName} [{Plugin.PluginVersion}]"); + gmenu = GUILayout.Window(121, gmenu, ShowOurWindow, $"{MyPluginInfo.PLUGIN_NAME} [{MyPluginInfo.PLUGIN_VERSION}]"); + } + + if (error_shown) + { + error_dialog = GUILayout.Window(122, error_dialog, ShowError, "An error occurred!"); } } } \ No newline at end of file diff --git a/Addons/GBSUServer.cs b/Addons/GBSUServer.cs index 0fa0a60..b2c57b8 100644 --- a/Addons/GBSUServer.cs +++ b/Addons/GBSUServer.cs @@ -26,7 +26,7 @@ public class GBSUServer : MonoBehaviour } void SetLocalGangToOff() { - localSingleGang.SetValue(false); + localSingleGang?.SetValue(false); } /* diff --git a/Addons/Helper.cs b/Addons/Helper.cs index d53cef5..c910d8b 100644 --- a/Addons/Helper.cs +++ b/Addons/Helper.cs @@ -1,9 +1,13 @@ 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 @@ -17,4 +21,40 @@ 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}"; + } + } } \ No newline at end of file diff --git a/GBSU.csproj b/GBSU.csproj index 2a42d53..10a02a9 100644 --- a/GBSU.csproj +++ b/GBSU.csproj @@ -4,7 +4,7 @@ netstandard2.0 GBSU Gang Beasts Server Utility - 1.0.2 + 1.0.3 true latest diff --git a/Plugin.cs b/Plugin.cs index b98969d..4345841 100644 --- a/Plugin.cs +++ b/Plugin.cs @@ -1,71 +1,84 @@ -using System.Collections.Generic; -using System.Reflection; -using BepInEx; -using BepInEx.Logging; -using GBSU.Addons; -using HarmonyLib; -using HarmonyLib.Tools; -using UnityEngine; - -#pragma warning disable IDE0051 // Private member is unused - -namespace GBSU; - -[BepInPlugin(PluginGUID, PluginName, PluginVersion)] -[BepInProcess("Gang Beasts.exe")] -public class Plugin : BaseUnityPlugin -{ - public static Dictionary GameScore = []; - private static GameObject _gbsuCompContainer; - internal static ManualLogSource Log; - - public static GameObject GBSUCompContainer - { - get - { - if (_gbsuCompContainer == null) - { - _gbsuCompContainer = new GameObject("GBSUSingletons"); - } - - return _gbsuCompContainer; - } - set - { - Destroy(_gbsuCompContainer); - _gbsuCompContainer = value; - } - } - private void Awake() - { - // Plugin startup logic - Log = base.Logger; - Log.LogInfo($"\n------\nPlugin {PluginName} [{PluginVersion}] is loaded!\n------\n"); - - HarmonyFileLog.Enabled = true; - var harmony = new Harmony(PluginGUID); - harmony.PatchAll(Assembly.GetExecutingAssembly()); - - GBSUCompInit(); - - Helper.DisableAnalytics(); // thank me later - } - - private static void GBSUCompInit() - { - // Create a container that wont lose our objects - GBSUCompContainer = new GameObject("GBSUSingletons"); - DontDestroyOnLoad(GBSUCompContainer); - GBSUCompContainer.hideFlags = HideFlags.DontUnloadUnusedAsset; - GBSUCompContainer.AddComponent(); - } - - public static void AddServerComp() - { - GBSUCompContainer.AddComponent(); - } - - public const string PluginGUID = "com.gaboule.plugins.gbsu"; - public const string PluginName = "Gang Beasts Server Utility"; - public const string PluginVersion = "1.0.2"; -} +using System.Collections.Generic; +using System.Reflection; +using BepInEx; +using BepInEx.Logging; +using GBSU.Addons; +using HarmonyLib; +using HarmonyLib.Tools; +using UnityEngine; + +#pragma warning disable IDE0051 // Private member is unused + +namespace GBSU; + +[BepInPlugin(MyPluginInfo.PLUGIN_GUID, MyPluginInfo.PLUGIN_NAME, MyPluginInfo.PLUGIN_VERSION)] +[BepInProcess("Gang Beasts.exe")] +public class Plugin : BaseUnityPlugin +{ + public static Dictionary GameScore = []; + private static GameObject _gbsuCompContainer; + internal static ManualLogSource Log; + + public static GameObject GBSUCompContainer + { + get + { + if (_gbsuCompContainer == null) + { + _gbsuCompContainer = new GameObject("GBSUSingletons"); + } + + return _gbsuCompContainer; + } + set + { + Destroy(_gbsuCompContainer); + _gbsuCompContainer = value; + } + } + private void Awake() + { + // Plugin startup logic + Log = base.Logger; + Log.LogInfo($"\n------\nPlugin {MyPluginInfo.PLUGIN_NAME} [{MyPluginInfo.PLUGIN_VERSION}] is loaded!\n------\n"); + + HarmonyFileLog.Enabled = true; + var harmony = new Harmony(MyPluginInfo.PLUGIN_GUID); + harmony.PatchAll(Assembly.GetExecutingAssembly()); + + GBSUCompInit(); + + Helper.DisableAnalytics(); // thank me later + + // create server config path + Helper.CreateRotationFolder(); + + Log.LogDebug("Server game config should be found at " + Helper.GameConfigPath); + } + + private static void GBSUCompInit() + { + // Create a container that wont lose our objects + GBSUCompContainer = new GameObject("GBSUSingletons"); + DontDestroyOnLoad(GBSUCompContainer); + GBSUCompContainer.hideFlags = HideFlags.DontUnloadUnusedAsset; + GBSUCompContainer.AddComponent(); + } + + public static void AddServerComp() + { + Component[] comps = GBSUCompContainer.GetComponents(typeof(Component)); + 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(); + } +}