Merge pull request #327 from amazingalek/dev

* fixed nuspec
* console overload for QSB

src/OWML.Common/Interfaces/IModConsole.cs

@@ -10,5 +10,7 @@ public interface IModConsole
 		void WriteLine(string line);
 
 		void WriteLine(string line, MessageType type);
+
+		void WriteLine(string line, MessageType type, string senderType);
 	}
 }

src/OWML.Launcher/OWML.Manifest.json

@@ -2,7 +2,7 @@
 	"author": "Alek",
 	"name": "OWML",
 	"uniqueName": "Alek.OWML",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"description": "The mod loader and mod framework for Outer Wilds",
 	"minGameVersion": "1.0.7.0",
 	"maxGameVersion": "1.0.7.481"

src/OWML.Logging/ModConsole.cs

@@ -18,6 +18,8 @@ public abstract class ModConsole : IModConsole
 
 		public abstract void WriteLine(string line, MessageType type);
 
+		public abstract void WriteLine(string line, MessageType type, string senderType);
+
 		protected ModConsole(IOwmlConfig config, IModLogger logger, IModManifest manifest)
 		{
 			Logger = logger;

src/OWML.Logging/ModSocketOutput.cs

@@ -21,16 +21,16 @@ public ModSocketOutput(IOwmlConfig config, IModManifest manifest, IModLogger log
 		public override void WriteLine(params object[] objects)
 		{
 			var line = string.Join(" ", objects.Select(o => o.ToString()).ToArray());
-			WriteLine(MessageType.Message, line, GetCallingType(new StackTrace()));
+			WriteLine(line, MessageType.Message, GetCallingType(new StackTrace()));
 		}
 
 		public override void WriteLine(string line) => 
-			WriteLine(MessageType.Message, line, GetCallingType(new StackTrace()));
+			WriteLine(line, MessageType.Message, GetCallingType(new StackTrace()));
 
 		public override void WriteLine(string line, MessageType type) => 
-			WriteLine(type, line, GetCallingType(new StackTrace()));
+			WriteLine(line, type, GetCallingType(new StackTrace()));
 
-		private void WriteLine(MessageType type, string line, string senderType)
+		public override void WriteLine(string line, MessageType type, string senderType)
 		{
 			Logger?.Log($"{type}: {line}");
 
@@ -48,7 +48,9 @@ private void WriteLine(MessageType type, string line, string senderType)
 				KillProcess();
 			}
 		}
-
+		private void WriteLine(MessageType type, string line, string senderType) =>
+			WriteLine(line, type, senderType);
+
 		private void KillProcess()
 		{
 			_socket.Close();

src/OWML.Logging/OutputWriter.cs

@@ -15,5 +15,8 @@ public void WriteLine(string line) =>
 
 		public void WriteLine(string line, MessageType type) => 
 			ConsoleUtils.WriteByType(type, line);
+
+		public void WriteLine(string line, MessageType type, string senderType) => 
+			ConsoleUtils.WriteByType(type, $"{senderType}: {line}");
 	}
 }

src/OWML.ModHelper.Menus/ModConfigMenu.cs

@@ -11,8 +11,8 @@ public class ModConfigMenu : ModConfigMenuBase, IModConfigMenu
 		public IModData ModData { get; }
 		public IModBehaviour Mod { get; }
 
-		public ModConfigMenu(IModData modData, IModBehaviour mod, IModStorage storage)
-			: base(modData.Manifest, storage)
+		public ModConfigMenu(IModData modData, IModBehaviour mod, IModStorage storage, IModConsole console)
+			: base(modData.Manifest, storage, console)
 		{
 			ModData = modData;
 			Mod = mod;

src/OWML.ModHelper.Menus/ModConfigMenuBase.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using OWML.Common;
 using OWML.Common.Menus;
-using OWML.Logging;
 
 namespace OWML.ModHelper.Menus
 {
@@ -23,7 +22,8 @@ public abstract class ModConfigMenuBase : ModMenuWithSelectables, IModConfigMenu
 
 		protected abstract void UpdateUIValues();
 
-		protected ModConfigMenuBase(IModManifest manifest, IModStorage storage)
+		protected ModConfigMenuBase(IModManifest manifest, IModStorage storage, IModConsole console)
+			: base(console)
 		{
 			Manifest = manifest;
 			Storage = storage;
@@ -90,12 +90,12 @@ protected void AddConfigInput(string key, object value, int index)
 						AddComboInput(key, index);
 						return;
 					default:
-						ModConsole.OwmlConsole.WriteLine("Error - Unrecognized complex setting: " + value, MessageType.Error);
+						Console.WriteLine("Error - Unrecognized complex setting: " + value, MessageType.Error);
 						return;
 				}
 			}
 
-			ModConsole.OwmlConsole.WriteLine("Error - Unrecognized setting type: " + value.GetType(), MessageType.Error);
+			Console.WriteLine("Error - Unrecognized setting type: " + value.GetType(), MessageType.Error);
 		}
 
 		private void AddToggleInput(string key, int index)
@@ -158,6 +158,5 @@ private void AddNumberInput(string key, int index)
 			numberInput.Element.name = key;
 			numberInput.Show();
 		}
-
 	}
 }

src/OWML.ModHelper.Menus/ModInputCombinationElement.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using OWML.Common;
 using OWML.Common.Menus;
-using OWML.Logging;
 using OWML.ModHelper.Input;
 using UnityEngine;
 using UnityEngine.UI;
@@ -25,18 +24,26 @@ public override string Title
 
 		private string _combination;
 		private readonly IModInputHandler _inputHandler;
+		private readonly IModPopupManager _popupManager;
+		private readonly IModConsole _console;
+
 		private readonly List<SingleAxisCommand> _openCommands = new()
 		{
 			InputLibrary.menuConfirm
 		};
 
-		private static IModPopupManager _popupManager;
 
-		public ModInputCombinationElement(TwoButtonToggleElement toggle, IModMenu menu,
-			IModPopupManager popupManager, IModInputHandler inputHandler, string combination = "") :
-			base(toggle, menu)
+		public ModInputCombinationElement(
+			TwoButtonToggleElement toggle, 
+			IModMenu menu,
+			IModPopupManager popupManager,
+			IModInputHandler inputHandler,
+			IModConsole console,
+			string combination = "") 
+				: base(toggle, menu)
 		{
 			_inputHandler = inputHandler;
+			_console = console;
 			_combination = combination;
 			Initialize(menu);
 			SetupButtons();
@@ -46,7 +53,7 @@ public ModInputCombinationElement(TwoButtonToggleElement toggle, IModMenu menu,
 									 .GetComponentInChildren<HorizontalLayoutGroup>(true).gameObject;
 			if (layoutObject == null)
 			{
-				ModConsole.OwmlConsole.WriteLine("Error - Failed to setup an element for combination editor.", MessageType.Error);
+				_console.WriteLine("Error - Failed to setup an element for combination editor.", MessageType.Error);
 				return;
 			}
 			var layoutGroup = layoutObject.GetComponent<HorizontalLayoutGroup>();
@@ -179,7 +186,7 @@ private void OnDeleteClick()
 		{
 			var copy = GameObject.Instantiate(Toggle);
 			GameObject.Destroy(copy.GetComponentInChildren<LocalizedText>(true));
-			return new ModInputCombinationElement(copy, Menu, _popupManager, _inputHandler, combination);
+			return new ModInputCombinationElement(copy, Menu, _popupManager, _inputHandler, _console, combination);
 		}
 	}
 }

src/OWML.ModHelper.Menus/ModInputCombinationElementMenu.cs

@@ -5,7 +5,6 @@
 using System.Linq;
 using OWML.Common;
 using OWML.Common.Menus;
-using OWML.Logging;
 using OWML.Utils;
 
 namespace OWML.ModHelper.Menus
@@ -23,10 +22,9 @@ public class ModInputCombinationElementMenu : ModTemporaryPopup, IModInputCombin
 		private SingleAxisCommand _cancelCommand;
 		private string _comboName;
 
-		public ModInputCombinationElementMenu(IModInputHandler inputHandler)
-		{
+		public ModInputCombinationElementMenu(IModInputHandler inputHandler, IModConsole console)
+			: base(console) =>
 			_inputHandler = inputHandler;
-		}
 
 		private GameObject CreateResetButton(Transform buttonsTransform)
 		{
@@ -45,7 +43,7 @@ private ModLayoutManager CreateLayoutManager(GameObject layoutObject, Transform
 		{
 			if (scaleReference == null)
 			{
-				ModConsole.OwmlConsole.WriteLine("Error - scale reference is null", MessageType.Error);
+				Console.WriteLine("Error - scale reference is null", MessageType.Error);
 			}
 			var layoutGroupNew = layoutObject.GetAddComponent<HorizontalLayoutGroup>();
 			layoutGroupNew.childForceExpandWidth = false;
@@ -102,7 +100,7 @@ public void Initialize(PopupInputMenu menu)
 
 			if (layout == null)
 			{
-				ModConsole.OwmlConsole.WriteLine("Error - Failed to create combination visualizer in combination editor.", MessageType.Error);
+				Console.WriteLine("Error - Failed to create combination visualizer in combination editor.", MessageType.Error);
 				return;
 			}
 
@@ -161,7 +159,7 @@ public override void DestroySelf()
 		public IModInputCombinationElementMenu Copy()
 		{
 			var newPopupObject = CopyMenu();
-			var newPopup = new ModInputCombinationElementMenu(_inputHandler);
+			var newPopup = new ModInputCombinationElementMenu(_inputHandler, Console);
 			newPopup.Initialize(newPopupObject.GetComponent<ModInputCombinationPopup>());
 			newPopup.Init(_popupManager);
 			return newPopup;

src/OWML.ModHelper.Menus/ModInputCombinationMenu.cs

@@ -16,6 +16,11 @@ public class ModInputCombinationMenu : ModMenuWithSelectables, IModInputCombinat
 
 		private IModInputCombinationElement _combinationElementTemplate;
 
+		public ModInputCombinationMenu(IModConsole console)
+			: base(console)
+		{
+		}
+
 		public string GenerateCombination()
 		{
 			var toDestroy = CombinationElements.Where(x => x.Title == "").ToList();

src/OWML.ModHelper.Menus/ModInputMenu.cs

@@ -13,6 +13,11 @@ public class ModInputMenu : ModTemporaryPopup, IModInputMenu
 
 		private PopupInputMenu _inputMenu;
 
+		public ModInputMenu(IModConsole console) 
+			: base(console)
+		{
+		}
+
 		public void Initialize(PopupInputMenu menu)
 		{
 			if (Menu != null)
@@ -52,7 +57,7 @@ public void Open(InputType inputType, string value)
 		public IModInputMenu Copy()
 		{
 			var newPopupObject = CopyMenu();
-			var newPopup = new ModInputMenu();
+			var newPopup = new ModInputMenu(Console);
 			newPopup.Initialize(newPopupObject.GetComponent<PopupInputMenu>());
 			return newPopup;
 		}

src/OWML.ModHelper.Menus/ModMainMenu.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using OWML.Common;
 using OWML.Common.Menus;
 using OWML.Utils;
 using UnityEngine;
@@ -25,7 +26,8 @@ public class ModMainMenu : ModMenu, IModMainMenu
 		private TitleAnimationController _anim;
 		private TitleScreenManager _titleManager;
 
-		public ModMainMenu(IModTabbedMenu optionsMenu) => 
+		public ModMainMenu(IModTabbedMenu optionsMenu, IModConsole console) 
+			: base(console) => 
 			OptionsMenu = optionsMenu;
 
 		public void Initialize(TitleScreenManager titleScreenManager)

src/OWML.ModHelper.Menus/ModMenu.cs

@@ -4,7 +4,6 @@
 using Newtonsoft.Json.Linq;
 using OWML.Common;
 using OWML.Common.Menus;
-using OWML.Logging;
 using OWML.Utils;
 using UnityEngine;
 using UnityEngine.UI;
@@ -40,6 +39,12 @@ public class ModMenu : IModMenu
 		public List<IModSeparator> Separators { get; private set; }
 
 		protected LayoutGroup Layout;
+		protected IModConsole Console;
+
+		public ModMenu(IModConsole console)
+		{
+			Console = console;
+		}
 
 		public virtual void Initialize(Menu menu)
 		{
@@ -57,7 +62,7 @@ public virtual void Initialize(Menu menu, LayoutGroup layoutGroup)
 
 			var promptButtons = Menu.GetComponentsInChildren<ButtonWithHotkeyImageElement>(true)
 				.Select(x => x.GetComponent<Button>()).ToList();
-			BaseButtons = promptButtons.Select(x => new ModPromptButton(x, this)).Cast<IModButtonBase>().ToList();
+			BaseButtons = promptButtons.Select(x => new ModPromptButton(x, this, Console)).Cast<IModButtonBase>().ToList();
 
 			var ordinaryButtons = Menu.GetComponentsInChildren<Button>(true).Except(promptButtons);
 			BaseButtons.AddRange(ordinaryButtons.Select(x => new ModTitleButton(x, this)).Cast<IModButtonBase>().ToList());
@@ -96,7 +101,7 @@ private T GetTitleButton<T>(string title, List<T> buttons) where T : IModButton
 			var button = buttons.FirstOrDefault(x => x.Title == title || x.Button.name == title);
 			if (button == null)
 			{
-				ModConsole.OwmlConsole.WriteLine("Warning - No button found with title or name: " + title, MessageType.Warning);
+				Console.WriteLine("Warning - No button found with title or name: " + title, MessageType.Warning);
 			}
 			return button;
 		}
@@ -296,7 +301,7 @@ public object GetInputValue(string key)
 			{
 				return numberInput.Value;
 			}
-			ModConsole.OwmlConsole.WriteLine($"Error - No input found with name {key}", MessageType.Error);
+			Console.WriteLine($"Error - No input found with name {key}", MessageType.Error);
 			return null;
 		}
 
@@ -344,7 +349,7 @@ public void SetInputValue(string key, object value)
 				numberInput.Value = Convert.ToSingle(val);
 				return;
 			}
-			ModConsole.OwmlConsole.WriteLine("Error - No input found with name " + key, MessageType.Error);
+			Console.WriteLine("Error - No input found with name " + key, MessageType.Error);
 		}
 
 		protected void InvokeOnInit()

src/OWML.ModHelper.Menus/ModMenuWithSelectables.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OWML.Common;
 using OWML.Common.Menus;
 using OWML.ModHelper.Input;
 using OWML.Utils;
@@ -16,6 +17,11 @@ public class ModMenuWithSelectables : ModPopupMenu, IModMenuWithSelectables
 		protected List<Selectable> Selectables;
 		protected ModCommandListener CommandListener;
 
+		public ModMenuWithSelectables(IModConsole console)
+			: base(console)
+		{
+		}
+
 		private void SetupCommands()
 		{
 			var listenerObject = new GameObject("ConfigurationMenu_Listener");

src/OWML.ModHelper.Menus/ModMessagePopup.cs

@@ -1,7 +1,6 @@
 using System;
 using OWML.Common;
 using OWML.Common.Menus;
-using OWML.Logging;
 using OWML.Utils;
 using UnityEngine.UI;
 
@@ -13,6 +12,11 @@ public class ModMessagePopup : ModTemporaryPopup, IModMessagePopup
 
 		private PopupMenu _twoButtonPopup;
 
+		public ModMessagePopup(IModConsole console)
+			: base(console)
+		{
+		}
+
 		public void Initialize(PopupMenu popup)
 		{
 			if (Menu != null)
@@ -38,7 +42,7 @@ public override void DestroySelf()
 		public IModMessagePopup Copy()
 		{
 			var newPopupObject = CopyMenu();
-			var newPopup = new ModMessagePopup();
+			var newPopup = new ModMessagePopup(Console);
 			newPopup.Initialize(newPopupObject.GetComponent<PopupMenu>());
 			return newPopup;
 		}
@@ -47,8 +51,8 @@ public void ShowMessage(string message, bool addCancel = false, string okMessage
 		{
 			if (_twoButtonPopup == null)
 			{
-				ModConsole.OwmlConsole.WriteLine("Failed to create popup for a following message:", MessageType.Warning);
-				ModConsole.OwmlConsole.WriteLine(message, MessageType.Info);
+				Console.WriteLine("Failed to create popup for a following message:", MessageType.Warning);
+				Console.WriteLine(message, MessageType.Info);
 			}
 			RegisterEvents();
 			_twoButtonPopup.EnableMenu(true);