merged dev

Author: BuildTools

Config.cs

@@ -17,13 +17,15 @@ internal struct SplotchConfigStruct
             public bool splotchEnabled;
             public bool consoleEnabled;
             public bool verboseLoggingEnabled;
+            public bool nightly; // I touched it (;
         }
 
         internal static SplotchConfigStruct LoadedSplotchConfig = new SplotchConfigStruct
         {
             splotchEnabled = true,
             consoleEnabled = true,
             verboseLoggingEnabled = true,
+            nightly = false,
         };
 
         internal struct SplotchConfigCont

Event.cs

@@ -14,6 +14,10 @@ namespace Splotch.Event
     public static class EventManager
     {
         public static Dictionary<Type, List<MethodInfo>> registeredEventHandlers = new Dictionary<Type, List<MethodInfo>>();
+        /// <summary>
+        /// Registers a static event listener class containing functions tagged with <c>[EventHandler]</c>
+        /// </summary>
+        /// <param name="eventListener">The class</param>
         public static void RegisterEventListener(Type eventListener)
         {
             foreach (MethodInfo eventHandler in eventListener.GetMethods())

GuiModifications.cs

@@ -40,7 +40,7 @@ internal static void RunMainMenuModifications()
             // set the text to the version info
             AssemblyName name = Assembly.GetExecutingAssembly().GetName();
 
-            textComponent.text = $"{ModManager.GetLoadedModsInfoText()}\n{name.Name} version {name.Version}";
+            textComponent.text = $"{ModManager.GetLoadedModsInfoText()}\n{name.Name} version {VersionChecker.currentVersionString}";
 
             // change settings
             textComponent.font = LocalizedText.localizationTable.GetFont(Settings.Get().Language, false);

Loader.cs

@@ -31,9 +31,7 @@ public static void OnEnterScene(Scene scene, LoadSceneMode loadSceneMode)
         {
             Logger.InitLogger();
 
-            AssemblyName name = Assembly.GetExecutingAssembly().GetName();
-            Logger.Log($"Entering main menu on version {name.Version}");
-
+            Logger.Log($"Entering main menu on version {VersionChecker.currentVersionString}");
 
             enteredScene = true;
             Patcher.DoPatching();

Logger.cs

@@ -1,6 +1,10 @@
-using System;
+using Splotch.Loader;
+using System;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
 using UnityEngine;
 
 
@@ -38,30 +42,47 @@ private static string GetCallingClass()
     /// </summary>
     internal static void InitLogger()
     {
+        VersionChecker.RunVersionChecker();
+
         // Create a new process
         Process process = new Process();
         process.StartInfo.FileName = "cmd.exe";
         process.StartInfo.RedirectStandardInput = true;
         process.StartInfo.RedirectStandardOutput = true;
         process.StartInfo.UseShellExecute = false;
-        process.StartInfo.CreateNoWindow = !Splotch.Config.LoadedSplotchConfig.consoleEnabled;  // Set this to true if you want to hide the window (Might be how we disable the window)
+        process.StartInfo.CreateNoWindow = !Splotch.Config.LoadedSplotchConfig.consoleEnabled && !VersionChecker.updateNeeded;  // Set this to true if you want to hide the window (Might be how we disable the window)
 
         // Start the process
         process.Start();
-        // It breaks if this isn't here.
-        System.Threading.Thread.Sleep(1000);
+
+        // It breaks if this isn't here
+        Thread.Sleep(1000);
 
         // Connects the console window to bopl
         AttachConsole((uint) process.Id);
 
         // Sets the output to the console window thing
-        StreamWriter sw = new StreamWriter(Console.OpenStandardOutput());
-        sw.AutoFlush = true;
+        StreamWriter sw = new StreamWriter(Console.OpenStandardOutput()) { AutoFlush = true };
         Console.SetOut(sw);
 
+        // Set the title of the window
+        Console.Title = $"Splotch Log version {VersionChecker.currentVersionString}";
 
         Application.logMessageReceived += HandleUnityLogs;
 
+        if (VersionChecker.updateNeeded)
+        {
+            Console.WriteLine($"Update {VersionChecker.targetVersionString} needed! The current installed version is {VersionChecker.currentVersionString} Press [P] to open the download page or any other key to continue");
+
+            ConsoleKeyInfo key = Console.ReadKey();
+            if (key.KeyChar == 'p')
+            {
+                Process.Start("https://github.com/commandblox/Splotch/releases");
+            }
+
+            if (!Splotch.Config.LoadedSplotchConfig.consoleEnabled)
+                process.Close();
+        }
 
         Logger.Log("Log test");
         Logger.Warning("Warn test");
@@ -215,6 +236,6 @@ public static void Debug(string message, bool doublestack = false)
     }
 
     // AttachConsole lets me "hook" the logger into the thing
-    [System.Runtime.InteropServices.DllImport("kernel32.dll")]
+    [DllImport("kernel32.dll")]
     private static extern bool AttachConsole(uint dwProcessId);
 }

Properties/AssemblyInfo.cs

@@ -1,11 +1,10 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
-using UnityEngine;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyDescription("Splotch mod loader for bopl battle")]
+[assembly: AssemblyDescription("Splotch mod loader for Bopl Battle")]
 [assembly: AssemblyCopyright("Copyright ©  2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -37,4 +36,4 @@
 // X: major versions
 // Y: feature addition/ removal
 // Z: small patch/ bugfix
-[assembly: AssemblyVersion("0.2.0")]
+[assembly: AssemblyVersion("0.2.1")]

Splotch.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -50,6 +50,7 @@
     <Compile Include="ModManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SplotchMod.cs" />
+    <Compile Include="VersionChecker.cs" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />
@@ -58,6 +59,7 @@
     <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="README.md" />
+    <None Include="version" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="0Harmony, Version=2.10.2.0, Culture=neutral, processorArchitecture=MSIL">
@@ -467,4 +469,4 @@
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

VersionChecker.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Net;
+using System.Reflection;
+
+namespace Splotch.Loader
+{
+    internal static class VersionChecker
+    {
+        public static void RunVersionChecker()
+        {
+            Version currentVersion = Assembly.GetCallingAssembly().GetName().Version;
+            currentVersionString = currentVersion.ToString();
+            currentVersionString = currentVersionString.Remove(currentVersionString.Length - 2);
+
+            try
+            {
+            RetrieveVersionInfo();
+            Version targetVersion = new Version((Config.LoadedSplotchConfig.nightly ? nightly : version) + ".0");
+            updateNeeded = targetVersion > currentVersion;
+
+            targetVersionString = targetVersion.ToString();
+            targetVersionString = targetVersionString.Remove(targetVersionString.Length - 2);
+            } catch (Exception) { }
+        }
+
+        private static string version;
+        private static string nightly;
+
+        public static string currentVersionString;
+        public static string targetVersionString;
+        public static bool updateNeeded = false;
+
+        public static void RetrieveVersionInfo()
+        {
+            string result;
+            using (WebClient client = new WebClient())
+                result = client.DownloadString("https://raw.githubusercontent.com/commandblox/Splotch/master/version");
+
+            string[] lines = result.Replace("\n\r", "\n").Replace("\r\n", "\n").Split('\n');
+            version = lines[0].Split('=')[1];
+            nightly = lines[1].Split('=')[1];
+        }
+    }
+}

version

@@ -1,2 +1,2 @@
-latest=0.2.0
-latestNightly=0.2.0
+latest=0.2.1
+latestNightly=0.2.1