imp - brk|doc - Moved mod loading code (pt. 1)

--- We've moved mod loading code to a separate addon. This is not done, so the build fails. --- Type: imp Breaking: True Doc Required: True Backport Required: False Part: 1/2
Aptivi · Jan 3, 2025 · 4785ff1 · 4785ff1
1 parent 2dc51f0
commit 4785ff1
Show file tree

Hide file tree

Showing 80 changed files with 51 additions and 293 deletions.
diff --git a/private/Nitrocid.Tests/InitTest.cs b/private/Nitrocid.Tests/InitTest.cs
@@ -26,7 +26,6 @@
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Kernel.Debugging;
 using Nitrocid.Kernel.Configuration;
-using Nitrocid.Modifications;
 using Terminaux.Base.Checks;
 using System.Reflection;
 

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Amusements/AmusementsInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Amusements/AmusementsInit.cs
@@ -30,7 +30,6 @@
 using Nitrocid.Misc.Screensaver;
 using Nitrocid.Shell.ShellBase.Shells;
 using Nitrocid.Misc.Splash;
-using Nitrocid.Modifications;
 using System.Linq;
 using Nitrocid.Shell.Homepage;
 using Nitrocid.Extras.Amusements.Amusements.Games;

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.ArchiveShell/ArchiveShellInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.ArchiveShell/ArchiveShellInit.cs
@@ -26,7 +26,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 
 namespace Nitrocid.Extras.ArchiveShell

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.BassBoom/BassBoomInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.BassBoom/BassBoomInit.cs
@@ -49,7 +49,6 @@
 using Nitrocid.Shell.ShellBase.Shells;
 using Nitrocid.Misc.Screensaver;
 using Nitrocid.Files.Paths;
-using Nitrocid.Modifications;
 using System.Linq;
 using Terminaux.Colors;
 using Terminaux.Colors.Data;

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.BeepSynth/BeepSynthInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.BeepSynth/BeepSynthInit.cs
@@ -22,7 +22,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 using Nitrocid.Extras.BeepSynth.Commands;
 

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Caffeine/CaffeineInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Caffeine/CaffeineInit.cs
@@ -24,7 +24,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 
 namespace Nitrocid.Extras.Caffeine

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Calculators/CalculatorsInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Calculators/CalculatorsInit.cs
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 
 namespace Nitrocid.Extras.Calculators

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Calendar/CalendarInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Calendar/CalendarInit.cs
@@ -29,7 +29,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 using Nitrocid.Extras.Calendar.Calendar;
 using Nitrocid.Shell.Homepage;

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Chemistry/ChemistryInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Chemistry/ChemistryInit.cs
@@ -21,7 +21,6 @@
 using Nitrocid.Extras.Chemistry.Screensavers;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Misc.Screensaver;
-using Nitrocid.Modifications;
 using Nitrocid.Shell.ShellBase.Arguments;
 using Nitrocid.Shell.ShellBase.Commands;
 using Nitrocid.Shell.ShellBase.Shells;

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.ColorConvert/ColorConvertInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.ColorConvert/ColorConvertInit.cs
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 
 namespace Nitrocid.Extras.ColorConvert

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Contacts/ContactsInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Contacts/ContactsInit.cs
@@ -26,7 +26,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 using Nitrocid.Shell.ShellBase.Switches;
 using Nitrocid.Shell.Homepage;

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Crc32/Crc32Init.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Crc32/Crc32Init.cs
@@ -20,7 +20,6 @@
 using Nitrocid.Drivers;
 using Nitrocid.Drivers.Encryption;
 using Nitrocid.Kernel.Extensions;
-using Nitrocid.Modifications;
 
 namespace Nitrocid.Extras.Crc32
 {

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Crc32Castagnoli/Crc32CInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Crc32Castagnoli/Crc32CInit.cs
@@ -20,7 +20,6 @@
 using Nitrocid.Drivers;
 using Nitrocid.Drivers.Encryption;
 using Nitrocid.Kernel.Extensions;
-using Nitrocid.Modifications;
 
 namespace Nitrocid.Extras.Crc32Castagnoli
 {

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Diagnostics/DiagnosticsInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Diagnostics/DiagnosticsInit.cs
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 
 namespace Nitrocid.Extras.Diagnostics

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Dictionary/DictionaryInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Dictionary/DictionaryInit.cs
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 
 namespace Nitrocid.Extras.Dictionary

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Docking/DockingInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Docking/DockingInit.cs
@@ -24,7 +24,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 
 namespace Nitrocid.Extras.Docking

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Forecast/ForecastInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Forecast/ForecastInit.cs
@@ -26,7 +26,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 
 namespace Nitrocid.Extras.Forecast

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.FtpShell/FtpShellInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.FtpShell/FtpShellInit.cs
@@ -20,7 +20,6 @@
 using Nitrocid.Extras.FtpShell.FTP;
 using Nitrocid.Kernel.Configuration;
 using Nitrocid.Kernel.Extensions;
-using Nitrocid.Modifications;
 using Nitrocid.Shell.ShellBase.Arguments;
 using Nitrocid.Shell.ShellBase.Commands;
 using Nitrocid.Shell.ShellBase.Shells;

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.GitShell/GitShellInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.GitShell/GitShellInit.cs
@@ -28,7 +28,6 @@
 using Nitrocid.Files.Paths;
 using Nitrocid.Shell.ShellBase.Shells;
 using Nitrocid.Kernel;
-using Nitrocid.Modifications;
 using System.Linq;
 
 namespace Nitrocid.Extras.GitShell

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.HttpShell/HttpShellInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.HttpShell/HttpShellInit.cs
@@ -21,7 +21,6 @@
 using Nitrocid.Extras.HttpShell.Settings;
 using Nitrocid.Kernel.Configuration;
 using Nitrocid.Kernel.Extensions;
-using Nitrocid.Modifications;
 using Nitrocid.Shell.ShellBase.Arguments;
 using Nitrocid.Shell.ShellBase.Commands;
 using Nitrocid.Shell.ShellBase.Shells;

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Images/ImagesInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Images/ImagesInit.cs
@@ -22,7 +22,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 using Nitrocid.Extras.Images.Commands;
 

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.JsonShell/JsonShellInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.JsonShell/JsonShellInit.cs
@@ -22,7 +22,6 @@
 using Nitrocid.Extras.JsonShell.Settings;
 using Nitrocid.Kernel.Configuration;
 using Nitrocid.Kernel.Extensions;
-using Nitrocid.Modifications;
 using Nitrocid.Shell.ShellBase.Arguments;
 using Nitrocid.Shell.ShellBase.Commands;
 using Nitrocid.Shell.ShellBase.Shells;

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.LanguageStudio/LanguageStudioInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.LanguageStudio/LanguageStudioInit.cs
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 using Nitrocid.Shell.ShellBase.Switches;
 

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.MailShell/MailShellInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.MailShell/MailShellInit.cs
@@ -21,7 +21,6 @@
 using Nitrocid.Extras.MailShell.Settings;
 using Nitrocid.Kernel.Configuration;
 using Nitrocid.Kernel.Extensions;
-using Nitrocid.Modifications;
 using Nitrocid.Shell.ShellBase.Arguments;
 using Nitrocid.Shell.ShellBase.Commands;
 using Nitrocid.Shell.ShellBase.Shells;

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Md5/Md5Init.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Md5/Md5Init.cs
@@ -20,7 +20,6 @@
 using Nitrocid.Drivers;
 using Nitrocid.Drivers.Encryption;
 using Nitrocid.Kernel.Extensions;
-using Nitrocid.Modifications;
 
 namespace Nitrocid.Extras.Md5
 {

diff --git a/...ocid/Shell/Shells/UESH/Commands/ModMan.cs → ...s/Nitrocid.Extras.Mods/Commands/ModMan.cs b/...ocid/Shell/Shells/UESH/Commands/ModMan.cs → ...s/Nitrocid.Extras.Mods/Commands/ModMan.cs
@@ -26,13 +26,13 @@
 using Nitrocid.Languages;
 using Terminaux.Writer.FancyWriters;
 using Nitrocid.Kernel.Exceptions;
-using Nitrocid.Modifications;
 using Nitrocid.Security.Permissions;
 using Nitrocid.Files.Paths;
 using Nitrocid.ConsoleBase.Colors;
 using Terminaux.Writer.ConsoleWriters;
+using Nitrocid.Extras.Mods.Modifications;
 
-namespace Nitrocid.Shell.Shells.UESH.Commands
+namespace Nitrocid.Extras.Mods.Commands
 {
     /// <summary>
     /// Manages your mods

diff --git a/...d/Shell/Shells/UESH/Commands/ModManual.cs → ...itrocid.Extras.Mods/Commands/ModManual.cs b/...d/Shell/Shells/UESH/Commands/ModManual.cs → ...itrocid.Extras.Mods/Commands/ModManual.cs
@@ -21,17 +21,16 @@
 using Nitrocid.ConsoleBase.Writers;
 using Nitrocid.Languages;
 using Nitrocid.Kernel.Exceptions;
-using Nitrocid.Modifications;
 using Terminaux.Inputs.Interactive;
 using Nitrocid.ConsoleBase.Colors;
-using Nitrocid.Misc.Interactives;
 using Nitrocid.Files;
 using Nitrocid.Kernel.Debugging;
 using System.IO;
-using Nitrocid.Modifications.ManPages;
 using System;
+using Nitrocid.Extras.Mods.Modifications;
+using Nitrocid.Extras.Mods.Modifications.ManPages;
 
-namespace Nitrocid.Shell.Shells.UESH.Commands
+namespace Nitrocid.Extras.Mods.Commands
 {
     /// <summary>
     /// Opens the mod manual

diff --git a/...ifications/Communication/InterModTools.cs → ...ifications/Communication/InterModTools.cs b/...ifications/Communication/InterModTools.cs → ...ifications/Communication/InterModTools.cs
@@ -27,7 +27,7 @@
 using System.Linq;
 using System.Reflection;
 
-namespace Nitrocid.Modifications.Communication
+namespace Nitrocid.Extras.Mods.Modifications.Communication
 {
     /// <summary>
     /// Inter-Mod Communication tools

diff --git a/...difications/Dependencies/ModDependency.cs → ...difications/Dependencies/ModDependency.cs b/...difications/Dependencies/ModDependency.cs → ...difications/Dependencies/ModDependency.cs
@@ -19,7 +19,7 @@
 
 using Newtonsoft.Json;
 
-namespace Nitrocid.Modifications.Dependencies
+namespace Nitrocid.Extras.Mods.Modifications.Dependencies
 {
     /// <summary>
     /// Mod dependency information

diff --git a/...ns/Dependencies/ModDependencySatisfier.cs → ...ns/Dependencies/ModDependencySatisfier.cs b/...ns/Dependencies/ModDependencySatisfier.cs → ...ns/Dependencies/ModDependencySatisfier.cs
@@ -29,7 +29,7 @@
 using System.Linq;
 using Textify.Versioning;
 
-namespace Nitrocid.Modifications.Dependencies
+namespace Nitrocid.Extras.Mods.Modifications.Dependencies
 {
     internal static class ModDependencySatisfier
     {

diff --git a/...Nitrocid/Modifications/ManPages/Manual.cs → ...ras.Mods/Modifications/ManPages/Manual.cs b/...Nitrocid/Modifications/ManPages/Manual.cs → ...ras.Mods/Modifications/ManPages/Manual.cs
@@ -21,7 +21,7 @@
 using System.IO;
 using System.Text;
 
-namespace Nitrocid.Modifications.ManPages
+namespace Nitrocid.Extras.Mods.Modifications.ManPages
 {
     /// <summary>
     /// Manual page class instance

diff --git a/...ocid/Misc/Interactives/ManualViewerCli.cs → ...Modifications/ManPages/ManualViewerCli.cs b/...ocid/Misc/Interactives/ManualViewerCli.cs → ...Modifications/ManPages/ManualViewerCli.cs
@@ -20,12 +20,11 @@
 using Terminaux.Inputs.Styles.Infobox;
 using Terminaux.Inputs.Interactive;
 using Nitrocid.Languages;
-using Nitrocid.Modifications.ManPages;
 using System.Collections.Generic;
 using System.Text;
 using Textify.General;
 
-namespace Nitrocid.Misc.Interactives
+namespace Nitrocid.Extras.Mods.Modifications.ManPages
 {
     /// <summary>
     /// Manual viewer class

diff --git a/...cid/Modifications/ManPages/PageManager.cs → ...ods/Modifications/ManPages/PageManager.cs b/...cid/Modifications/ManPages/PageManager.cs → ...ods/Modifications/ManPages/PageManager.cs
@@ -23,7 +23,7 @@
 using Nitrocid.Kernel.Exceptions;
 using Nitrocid.Languages;
 
-namespace Nitrocid.Modifications.ManPages
+namespace Nitrocid.Extras.Mods.Modifications.ManPages
 {
     /// <summary>
     /// Mod manual page management module

diff --git a/...ocid/Modifications/ManPages/PageParser.cs → ...Mods/Modifications/ManPages/PageParser.cs b/...ocid/Modifications/ManPages/PageParser.cs → ...Mods/Modifications/ManPages/PageParser.cs
@@ -27,7 +27,7 @@
 using Nitrocid.Languages;
 using Nitrocid.Misc.Text.Probers.Placeholder;
 
-namespace Nitrocid.Modifications.ManPages
+namespace Nitrocid.Extras.Mods.Modifications.ManPages
 {
     static class PageParser
     {

diff --git a/public/Nitrocid/Modifications/ModInfo.cs → ...ocid.Extras.Mods/Modifications/ModInfo.cs b/public/Nitrocid/Modifications/ModInfo.cs → ...ocid.Extras.Mods/Modifications/ModInfo.cs
@@ -20,9 +20,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Nitrocid.Kernel.Exceptions;
+using Nitrocid.Kernel.Extensions;
 using Nitrocid.Languages;
 
-namespace Nitrocid.Modifications
+namespace Nitrocid.Extras.Mods.Modifications
 {
     /// <summary>
     /// Mod information

diff --git a/public/Nitrocid/Modifications/ModManager.cs → ...d.Extras.Mods/Modifications/ModManager.cs b/public/Nitrocid/Modifications/ModManager.cs → ...d.Extras.Mods/Modifications/ModManager.cs
@@ -35,11 +35,12 @@
 using Nitrocid.Languages;
 using Nitrocid.Kernel.Exceptions;
 using Nitrocid.Files.Paths;
-using Nitrocid.Modifications.ManPages;
 using Nitrocid.ConsoleBase.Colors;
 using Terminaux.Writer.ConsoleWriters;
+using Nitrocid.Kernel.Extensions;
+using Nitrocid.Extras.Mods.Modifications.ManPages;
 
-namespace Nitrocid.Modifications
+namespace Nitrocid.Extras.Mods.Modifications
 {
     /// <summary>
     /// Mod management module

diff --git a/public/Nitrocid/Modifications/ModParser.cs → ...id.Extras.Mods/Modifications/ModParser.cs b/public/Nitrocid/Modifications/ModParser.cs → ...id.Extras.Mods/Modifications/ModParser.cs
@@ -34,11 +34,12 @@
 using Nitrocid.Files.Paths;
 using Nitrocid.Kernel.Events;
 using Nitrocid.Security.Signing;
-using Nitrocid.Modifications.Dependencies;
 using Nitrocid.Languages.Decoy;
 using Nitrocid.Kernel.Configuration;
+using Nitrocid.Kernel.Extensions;
+using Nitrocid.Extras.Mods.Modifications.Dependencies;
 
-namespace Nitrocid.Modifications
+namespace Nitrocid.Extras.Mods.Modifications
 {
     /// <summary>
     /// Mod parsing module

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Mods/ModsInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/ModsInit.cs
@@ -17,8 +17,8 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //
 
+using Nitrocid.Extras.Mods.Modifications;
 using Nitrocid.Kernel.Extensions;
-using Nitrocid.Modifications;
 
 namespace Nitrocid.Extras.Mods
 {
@@ -30,10 +30,15 @@ internal class ModsInit : IAddon
         ModLoadPriority IAddon.AddonType => ModLoadPriority.Important;
 
         void IAddon.FinalizeAddon()
-        { }
+        {
+            if (Config.MainConfig.StartKernelMods)
+                ModManager.StartMods();
+        }
 
         void IAddon.StartAddon()
-        { }
+        {
+
+        }
 
         void IAddon.StopAddon()
         { }

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.NameGen/NameGenInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.NameGen/NameGenInit.cs
@@ -28,7 +28,6 @@
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
 using Nitrocid.Misc.Screensaver;
-using Nitrocid.Modifications;
 using System.Linq;
 
 namespace Nitrocid.Extras.NameGen

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Notes/NotesInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Notes/NotesInit.cs
@@ -24,7 +24,6 @@
 using System.Collections.Generic;
 using Nitrocid.Kernel.Extensions;
 using Nitrocid.Shell.ShellBase.Shells;
-using Nitrocid.Modifications;
 using System.Linq;
 using Nitrocid.Shell.Homepage;
 

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Pastebin/PastebinInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Pastebin/PastebinInit.cs
@@ -19,7 +19,6 @@
 
 using Nitrocid.Extras.Pastebin.Commands;
 using Nitrocid.Kernel.Extensions;
-using Nitrocid.Modifications;
 using Nitrocid.Shell.ShellBase.Arguments;
 using Nitrocid.Shell.ShellBase.Commands;
 using Nitrocid.Shell.ShellBase.Shells;