formatting, removed unused stuff

ow-mods · May 11, 2020 · 1536b96 · 1536b96
1 parent 3db0636
commit 1536b96
Show file tree

Hide file tree

Showing 26 changed files with 64 additions and 148 deletions.
diff --git a/OWML.Common/IModInteraction.cs b/OWML.Common/IModInteraction.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 
 namespace OWML.Common
 {

diff --git a/OWML.Launcher/OWML.Manifest.json b/OWML.Launcher/OWML.Manifest.json
@@ -2,6 +2,6 @@
   "author": "Alek",
   "name": "OWML",
   "uniqueName": "Alek.OWML",
-  "version": "0.3.47",
+  "version": "0.3.48",
   "description": "The mod loader and mod framework for Outer Wilds"
 }
diff --git a/OWML.ModHelper.Interaction/ModInteraction.cs b/OWML.ModHelper.Interaction/ModInteraction.cs
@@ -1,7 +1,6 @@
 using OWML.Common;
 using System.Collections.Generic;
 using System.Linq;
-using UnityEngine;
 
 namespace OWML.ModHelper.Interaction
 {
@@ -14,11 +13,10 @@ public class ModInteraction : IModInteraction
         public ModInteraction(IList<IModBehaviour> list)
         {
             _modList = list;
-
-            RegenDicts();
+            RegenerateDictionaries();
         }
 
-        private void RegenDicts()
+        private void RegenerateDictionaries()
         {
             _dependantDict = new Dictionary<string, List<IModBehaviour>>();
             _dependencyDict = new Dictionary<string, List<IModBehaviour>>();
@@ -47,7 +45,7 @@ public IList<IModBehaviour> GetDependants(string dependencyUniqueName)
         {
             if (_dependantDict.Count != _modList.Count)
             {
-                RegenDicts();
+                RegenerateDictionaries();
             }
             return _dependantDict[dependencyUniqueName];
         }
@@ -56,7 +54,7 @@ public IList<IModBehaviour> GetDependencies(string uniqueName)
         {
             if (_dependantDict.Count != _modList.Count)
             {
-                RegenDicts();
+                RegenerateDictionaries();
             }
             return _dependencyDict[uniqueName];
         }

diff --git a/OWML.ModHelper.Interaction/Properties/AssemblyInfo.cs b/OWML.ModHelper.Interaction/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

diff --git a/OWML.ModHelper.Menus/ModConfigMenu.cs b/OWML.ModHelper.Menus/ModConfigMenu.cs
@@ -13,7 +13,6 @@ public class ModConfigMenu : ModPopupMenu, IModConfigMenu
         public IModData ModData { get; }
         public IModBehaviour Mod { get; }
 
-        private readonly IModLogger _logger;
         private readonly IModConsole _console;
         private readonly IModStorage _storage;
 
@@ -22,9 +21,8 @@ public class ModConfigMenu : ModPopupMenu, IModConfigMenu
         private IModTextInput _textInputTemplate;
         private IModNumberInput _numberInputTemplate;
 
-        public ModConfigMenu(IModLogger logger, IModConsole console, IModData modData, IModBehaviour mod) : base(logger, console)
+        public ModConfigMenu(IModConsole console, IModData modData, IModBehaviour mod) : base(console)
         {
-            _logger = logger;
             _console = console;
             ModData = modData;
             Mod = mod;

diff --git a/OWML.ModHelper.Menus/ModInputField.cs b/OWML.ModHelper.Menus/ModInputField.cs
@@ -11,7 +11,7 @@ public abstract class ModInputField<T> : ModInput<T>
         protected readonly IModInputMenu InputMenu;
         protected readonly TwoButtonToggleElement ToggleElement;
 
-        public ModInputField(TwoButtonToggleElement toggle, IModMenu menu, IModInputMenu inputMenu) : base(toggle, menu)
+        protected ModInputField(TwoButtonToggleElement toggle, IModMenu menu, IModInputMenu inputMenu) : base(toggle, menu)
         {
             ToggleElement = toggle;
             InputMenu = inputMenu;
@@ -22,11 +22,12 @@ public ModInputField(TwoButtonToggleElement toggle, IModMenu menu, IModInputMenu
             var noButton = ToggleElement.GetValue<Button>("_buttonFalse");
             noButton.transform.parent.gameObject.SetActive(false);
 
-            var layoutGroup = Button.Button.transform.parent.parent.GetComponent<HorizontalLayoutGroup>();
+            var buttonParent = Button.Button.transform.parent;
+            var layoutGroup = buttonParent.parent.GetComponent<HorizontalLayoutGroup>();
             layoutGroup.childControlWidth = true;
             layoutGroup.childForceExpandWidth = true;
 
-            Button.Button.transform.parent.GetComponent<LayoutElement>().preferredWidth = 100;
+            buttonParent.GetComponent<LayoutElement>().preferredWidth = 100;
         }
 
         protected abstract void Open();

diff --git a/OWML.ModHelper.Menus/ModInputMenu.cs b/OWML.ModHelper.Menus/ModInputMenu.cs
@@ -14,13 +14,8 @@ public class ModInputMenu : ModMenu, IModInputMenu
 
         private PopupInputMenu _inputMenu;
 
-        private IModLogger _logger;
-        private IModConsole _console;
-
-        public ModInputMenu(IModLogger logger, IModConsole console) : base(logger, console)
+        public ModInputMenu(IModConsole console) : base(console)
         {
-            _logger = logger;
-            _console = console;
         }
 
         public void Initialize(PopupInputMenu menu)
@@ -54,7 +49,7 @@ public void Open(InputType inputType, string value)
             var okPrompt = new ScreenPrompt(InputLibrary.confirm2, "OK");
             var cancelCommand = OWInput.UsingGamepad() ? InputLibrary.cancel : InputLibrary.escape;
             var cancelPrompt = new ScreenPrompt(cancelCommand, "Cancel");
-            _inputMenu.SetUpPopup(message, InputLibrary.confirm2, cancelCommand, okPrompt, cancelPrompt, true, true);
+            _inputMenu.SetUpPopup(message, InputLibrary.confirm2, cancelCommand, okPrompt, cancelPrompt);
             _inputMenu.SetInputFieldPlaceholderText("");
             _inputMenu.GetInputField().text = value;
             _inputMenu.GetValue<Text>("_labelText").text = message;

diff --git a/OWML.ModHelper.Menus/ModMainMenu.cs b/OWML.ModHelper.Menus/ModMainMenu.cs
@@ -19,14 +19,9 @@ public class ModMainMenu : ModMenu, IModMainMenu
 
         private TitleAnimationController _anim;
 
-        private readonly IModLogger _logger;
-        private readonly IModConsole _console;
-
-        public ModMainMenu(IModLogger logger, IModConsole console) : base(logger, console)
+        public ModMainMenu(IModConsole console) : base(console)
         {
-            _logger = logger;
-            _console = console;
-            OptionsMenu = new ModOptionsMenu(logger, console);
+            OptionsMenu = new ModOptionsMenu(console);
         }
 
         public void Initialize(TitleScreenManager titleScreenManager)

diff --git a/OWML.ModHelper.Menus/ModMenu.cs b/OWML.ModHelper.Menus/ModMenu.cs
@@ -21,13 +21,11 @@ public class ModMenu : IModMenu
         public List<IModTextInput> TextInputs { get; private set; }
         public List<IModNumberInput> NumberInputs { get; private set; }
 
-        private readonly IModLogger _logger;
         private readonly IModConsole _console;
         private LayoutGroup _layoutGroup;
 
-        public ModMenu(IModLogger logger, IModConsole console)
+        public ModMenu(IModConsole console)
         {
-            _logger = logger;
             _console = console;
         }
 

diff --git a/OWML.ModHelper.Menus/ModMenus.cs b/OWML.ModHelper.Menus/ModMenus.cs
@@ -12,18 +12,12 @@ public class ModMenus : IModMenus
         public IModsMenu ModsMenu { get; }
         public IModInputMenu InputMenu { get; }
 
-        private readonly IModLogger _logger;
-        private readonly IModConsole _console;
-
-        public ModMenus(IModLogger logger, IModConsole console, IModEvents events)
+        public ModMenus(IModConsole console, IModEvents events)
         {
-            _logger = logger;
-            _console = console;
-
-            MainMenu = new ModMainMenu(logger, console);
-            PauseMenu = new ModPauseMenu(logger, console);
-            ModsMenu = new ModsMenu(logger, console, this);
-            InputMenu = new ModInputMenu(logger, console);
+            MainMenu = new ModMainMenu(console);
+            PauseMenu = new ModPauseMenu(console);
+            ModsMenu = new ModsMenu(console, this);
+            InputMenu = new ModInputMenu(console);
 
             events.Subscribe<SettingsManager>(Common.Events.AfterStart);
             events.Subscribe<TitleScreenManager>(Common.Events.AfterStart);

diff --git a/OWML.ModHelper.Menus/ModOptionsMenu.cs b/OWML.ModHelper.Menus/ModOptionsMenu.cs
@@ -14,16 +14,14 @@ public class ModOptionsMenu : ModPopupMenu, IModTabbedMenu
         public IModTabMenu InputTab { get; private set; }
         public IModTabMenu GraphicsTab { get; private set; }
 
-        private readonly IModLogger _logger;
         private readonly IModConsole _console;
 
         public new TabbedMenu Menu { get; private set; }
 
         private List<IModTabMenu> _tabMenus;
 
-        public ModOptionsMenu(IModLogger logger, IModConsole console) : base(logger, console)
+        public ModOptionsMenu(IModConsole console) : base(console)
         {
-            _logger = logger;
             _console = console;
         }
 
@@ -36,7 +34,7 @@ public void Initialize(TabbedMenu menu)
             _tabMenus = new List<IModTabMenu>();
             foreach (var tabButton in tabButtons)
             {
-                var tabMenu = new ModTabMenu(_logger, _console, this);
+                var tabMenu = new ModTabMenu(_console, this);
                 tabMenu.Initialize(tabButton);
                 _tabMenus.Add(tabMenu);
             }

diff --git a/OWML.ModHelper.Menus/ModPauseMenu.cs b/OWML.ModHelper.Menus/ModPauseMenu.cs
@@ -13,14 +13,9 @@ public class ModPauseMenu : ModPopupMenu, IModPauseMenu
         public IModButton OptionsButton { get; private set; }
         public IModButton QuitButton { get; private set; }
 
-        private readonly IModLogger _logger;
-        private readonly IModConsole _console;
-
-        public ModPauseMenu(IModLogger logger, IModConsole console) : base(logger, console)
+        public ModPauseMenu(IModConsole console) : base(console)
         {
-            _logger = logger;
-            _console = console;
-            OptionsMenu = new ModOptionsMenu(logger, console);
+            OptionsMenu = new ModOptionsMenu(console);
         }
 
         public void Initialize(SettingsManager settingsManager)

diff --git a/OWML.ModHelper.Menus/ModPopupMenu.cs b/OWML.ModHelper.Menus/ModPopupMenu.cs
@@ -21,12 +21,10 @@ public string Title
             set => _title.text = value;
         }
 
-        private readonly IModLogger _logger;
         private readonly IModConsole _console;
 
-        public ModPopupMenu(IModLogger logger, IModConsole console) : base(logger, console)
+        public ModPopupMenu(IModConsole console) : base(console)
         {
-            _logger = logger;
             _console = console;
         }
 
@@ -97,7 +95,7 @@ public IModPopupMenu Copy()
                 return null;
             }
             var menu = GameObject.Instantiate(Menu, Menu.transform.parent);
-            var modMenu = new ModPopupMenu(_logger, _console);
+            var modMenu = new ModPopupMenu(_console);
             modMenu.Initialize(menu);
             return modMenu;
         }

diff --git a/OWML.ModHelper.Menus/ModSliderInput.cs b/OWML.ModHelper.Menus/ModSliderInput.cs
@@ -1,6 +1,5 @@
 using OWML.Common.Menus;
 using UnityEngine;
-using UnityEngine.UI;
 
 namespace OWML.ModHelper.Menus
 {

diff --git a/OWML.ModHelper.Menus/ModTabMenu.cs b/OWML.ModHelper.Menus/ModTabMenu.cs
@@ -8,7 +8,6 @@ namespace OWML.ModHelper.Menus
 {
     public class ModTabMenu : ModPopupMenu, IModTabMenu
     {
-        private readonly IModLogger _logger;
         private readonly IModConsole _console;
         private readonly IModTabbedMenu _optionsMenu;
 
@@ -21,9 +20,8 @@ public class ModTabMenu : ModPopupMenu, IModTabMenu
             set => _text.text = value;
         }
 
-        public ModTabMenu(IModLogger logger, IModConsole console, IModTabbedMenu optionsMenu) : base(logger, console)
+        public ModTabMenu(IModConsole console, IModTabbedMenu optionsMenu) : base(console)
         {
-            _logger = logger;
             _console = console;
             _optionsMenu = optionsMenu;
         }
@@ -53,7 +51,7 @@ public override void Open()
             _text = tabButton.GetComponentInChildren<Text>();
             var menu = GameObject.Instantiate(Menu, Menu.transform.parent);
             tabButton.SetValue("_tabbedMenu", menu);
-            var modMenu = new ModTabMenu(_logger, _console, _optionsMenu);
+            var modMenu = new ModTabMenu(_console, _optionsMenu);
             modMenu.Initialize(tabButton);
             return modMenu;
         }

diff --git a/OWML.ModHelper.Menus/ModsMenu.cs b/OWML.ModHelper.Menus/ModsMenu.cs
@@ -10,25 +10,23 @@ namespace OWML.ModHelper.Menus
 {
     public class ModsMenu : ModPopupMenu, IModsMenu
     {
-        private readonly IModLogger _logger;
         private readonly IModConsole _console;
         private readonly IModMenus _menus;
         private readonly List<IModConfigMenu> _modConfigMenus;
 
         private Transform _modMenuTemplate;
         private IModButton _modButtonTemplate;
 
-        public ModsMenu(IModLogger logger, IModConsole console, IModMenus menus) : base(logger, console)
+        public ModsMenu(IModConsole console, IModMenus menus) : base(console)
         {
-            _logger = logger;
             _console = console;
             _menus = menus;
             _modConfigMenus = new List<IModConfigMenu>();
         }
 
         public void AddMod(IModData modData, IModBehaviour mod)
         {
-            _modConfigMenus.Add(new ModConfigMenu(_logger, _console, modData, mod));
+            _modConfigMenus.Add(new ModConfigMenu(_console, modData, mod));
         }
 
         public IModConfigMenu GetModMenu(IModBehaviour modBehaviour)

diff --git a/OWML.ModHelper/ControllerButton.cs b/OWML.ModHelper/ControllerButton.cs
@@ -1,34 +1,20 @@
 using OWML.ModHelper.Events;
 using UnityEngine;
-using UnityEngine.UI;
 
 namespace OWML.ModHelper
 {
     public class ControllerButton : MonoBehaviour
     {
-        private Button _button;
-        private SingleAxisCommand _inputCommand;
-
         public void Init(SingleAxisCommand inputCommand)
         {
-            _button = GetComponent<Button>();
-            _inputCommand = inputCommand;
             var imageElement = GetComponent<ButtonWithHotkeyImageElement>();
-            if (imageElement != null)
+            if (imageElement == null)
             {
-                var textId = GetComponentInChildren<LocalizedText>().GetValue<UITextType>("_textID");
-                var title = UITextLibrary.GetString(textId);
-                imageElement.SetPrompt(new ScreenPrompt(inputCommand, title), InputMode.Menu);
+                return;
             }
+            var textId = GetComponentInChildren<LocalizedText>().GetValue<UITextType>("_textID");
+            var title = UITextLibrary.GetString(textId);
+            imageElement.SetPrompt(new ScreenPrompt(inputCommand, title));
         }
-
-        private void Update()
-        {
-            if (_inputCommand != null && _button != null && OWInput.IsPressed(_inputCommand, InputMode.Menu))
-            {
-                _button.onClick.Invoke();
-            }
-        }
-
     }
 }
diff --git a/OWML.ModHelper/ModBehaviour.cs b/OWML.ModHelper/ModBehaviour.cs
@@ -1,5 +1,4 @@
 using OWML.Common;
-using OWML.ModHelper.Events;
 using System.Collections.Generic;
 using UnityEngine;
 

diff --git a/OWML.ModLoader/ModDependency.cs b/OWML.ModLoader/ModDependency.cs
diff --git a/OWML.ModLoader/ModLoader.cs b/OWML.ModLoader/ModLoader.cs
@@ -32,7 +32,7 @@ public static void LoadMods()
             var modFinder = new ModFinder(owmlConfig, console);
             var harmonyHelper = new HarmonyHelper(logger, console);
             var events = new ModEvents(logger, console, harmonyHelper);
-            var menus = new ModMenus(logger, console, events);
+            var menus = new ModMenus(console, events);
             var owo = new Owo(modFinder, logger, console, owmlConfig, menus, harmonyHelper, modSorter);
             owo.LoadMods();
         }