diff --git a/private/Nitrocid.Tests/InitTest.cs b/private/Nitrocid.Tests/InitTest.cs index 1f348e73c..b5cdc9839 100644 --- 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 index 3c9cb83d5..33d451eeb 100644 --- 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 index bea17d853..681668f60 100644 --- 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 index 2403e909d..8a2566411 100644 --- 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 index 6c6a9c7fc..ec4f9a241 100644 --- 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 index 353166bfb..3dff8dd9c 100644 --- 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 index 4d7ca9236..866cdac9b 100644 --- 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 index 00cf38fdf..c2a0d79ea 100644 --- 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 index 13d465536..6813cd4b7 100644 --- 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 index 51964503e..10a678643 100644 --- 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 index 1ac1692eb..75a0649be 100644 --- 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 index 04760b769..eb7d2e6c2 100644 --- 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 index 2ffa49abe..ebb22e182 100644 --- 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 index 79c79be32..f3f36a2df 100644 --- 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 index 91fb8da89..1593afbe5 100644 --- 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 index 196033fd0..1af3e6ea8 100644 --- 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 index fa8653e7f..8347ce773 100644 --- 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 index 1e3b319e6..18bf660fb 100644 --- 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 index 0285ad763..7d6684898 100644 --- 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 index 5bdcf204a..7c4120876 100644 --- 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 index 6ce81437c..68cae17e0 100644 --- 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 index df93a7760..90315c919 100644 --- 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 index e61095d6b..2174bfe83 100644 --- 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 index 2d1684e6b..ee6aaedb1 100644 --- 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 index 1e5f84b9f..3bf507f45 100644 --- 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/public/Nitrocid/Shell/Shells/UESH/Commands/ModMan.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Commands/ModMan.cs similarity index 99% rename from public/Nitrocid/Shell/Shells/UESH/Commands/ModMan.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Commands/ModMan.cs index 82bf95408..e590c11b3 100644 --- a/public/Nitrocid/Shell/Shells/UESH/Commands/ModMan.cs +++ b/public/Nitrocid.Addons/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 { /// /// Manages your mods diff --git a/public/Nitrocid/Shell/Shells/UESH/Commands/ModManual.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Commands/ModManual.cs similarity index 94% rename from public/Nitrocid/Shell/Shells/UESH/Commands/ModManual.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Commands/ModManual.cs index 562865d7e..3524e0f76 100644 --- a/public/Nitrocid/Shell/Shells/UESH/Commands/ModManual.cs +++ b/public/Nitrocid.Addons/Nitrocid.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 { /// /// Opens the mod manual diff --git a/public/Nitrocid/Modifications/Communication/InterModTools.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/Communication/InterModTools.cs similarity index 99% rename from public/Nitrocid/Modifications/Communication/InterModTools.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/Communication/InterModTools.cs index 536bbe5a1..cf46d5920 100644 --- a/public/Nitrocid/Modifications/Communication/InterModTools.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/Communication/InterModTools.cs @@ -27,7 +27,7 @@ using System.Linq; using System.Reflection; -namespace Nitrocid.Modifications.Communication +namespace Nitrocid.Extras.Mods.Modifications.Communication { /// /// Inter-Mod Communication tools diff --git a/public/Nitrocid/Modifications/Dependencies/ModDependency.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/Dependencies/ModDependency.cs similarity index 96% rename from public/Nitrocid/Modifications/Dependencies/ModDependency.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/Dependencies/ModDependency.cs index 45fd9e147..09709c311 100644 --- a/public/Nitrocid/Modifications/Dependencies/ModDependency.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/Dependencies/ModDependency.cs @@ -19,7 +19,7 @@ using Newtonsoft.Json; -namespace Nitrocid.Modifications.Dependencies +namespace Nitrocid.Extras.Mods.Modifications.Dependencies { /// /// Mod dependency information diff --git a/public/Nitrocid/Modifications/Dependencies/ModDependencySatisfier.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/Dependencies/ModDependencySatisfier.cs similarity index 99% rename from public/Nitrocid/Modifications/Dependencies/ModDependencySatisfier.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/Dependencies/ModDependencySatisfier.cs index f6516c0a1..5f1b667c9 100644 --- a/public/Nitrocid/Modifications/Dependencies/ModDependencySatisfier.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/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/public/Nitrocid/Modifications/ManPages/Manual.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ManPages/Manual.cs similarity index 98% rename from public/Nitrocid/Modifications/ManPages/Manual.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ManPages/Manual.cs index 6a71ed40a..3d7973b3c 100644 --- a/public/Nitrocid/Modifications/ManPages/Manual.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.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 { /// /// Manual page class instance diff --git a/public/Nitrocid/Misc/Interactives/ManualViewerCli.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ManPages/ManualViewerCli.cs similarity index 98% rename from public/Nitrocid/Misc/Interactives/ManualViewerCli.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ManPages/ManualViewerCli.cs index 722992c58..5461bc62a 100644 --- a/public/Nitrocid/Misc/Interactives/ManualViewerCli.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/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 { /// /// Manual viewer class diff --git a/public/Nitrocid/Modifications/ManPages/PageManager.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ManPages/PageManager.cs similarity index 98% rename from public/Nitrocid/Modifications/ManPages/PageManager.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ManPages/PageManager.cs index a7c24c8ae..d7e12ba80 100644 --- a/public/Nitrocid/Modifications/ManPages/PageManager.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/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 { /// /// Mod manual page management module diff --git a/public/Nitrocid/Modifications/ManPages/PageParser.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ManPages/PageParser.cs similarity index 99% rename from public/Nitrocid/Modifications/ManPages/PageParser.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ManPages/PageParser.cs index 525f1c752..9a8c25f74 100644 --- a/public/Nitrocid/Modifications/ManPages/PageParser.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.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 b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ModInfo.cs similarity index 97% rename from public/Nitrocid/Modifications/ModInfo.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ModInfo.cs index 6a02448a0..881a729f7 100644 --- a/public/Nitrocid/Modifications/ModInfo.cs +++ b/public/Nitrocid.Addons/Nitrocid.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 { /// /// Mod information diff --git a/public/Nitrocid/Modifications/ModManager.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ModManager.cs similarity index 99% rename from public/Nitrocid/Modifications/ModManager.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ModManager.cs index f217233bd..5357956f2 100644 --- a/public/Nitrocid/Modifications/ModManager.cs +++ b/public/Nitrocid.Addons/Nitrocid.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 { /// /// Mod management module diff --git a/public/Nitrocid/Modifications/ModParser.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ModParser.cs similarity index 99% rename from public/Nitrocid/Modifications/ModParser.cs rename to public/Nitrocid.Addons/Nitrocid.Extras.Mods/Modifications/ModParser.cs index 02091aacb..838bfe947 100644 --- a/public/Nitrocid/Modifications/ModParser.cs +++ b/public/Nitrocid.Addons/Nitrocid.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 { /// /// Mod parsing module diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Mods/ModsInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Mods/ModsInit.cs index f54ebcf42..c4a86bf5f 100644 --- 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 . // +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 index 70a76791c..9dd9aae0a 100644 --- 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 index 07ef63355..5325874d6 100644 --- 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 index 072df5e88..ec9188b76 100644 --- 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; diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.RssShell/RssShellInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.RssShell/RssShellInit.cs index db45a8b1a..ebf9ba90a 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.RssShell/RssShellInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.RssShell/RssShellInit.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.RssShell diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.SftpShell/SftpShellInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.SftpShell/SftpShellInit.cs index 0617c837f..ffc9c33f1 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.SftpShell/SftpShellInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.SftpShell/SftpShellInit.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.SftpShell diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Sha1/Sha1Init.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Sha1/Sha1Init.cs index 70431cf6e..2b16adb39 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.Sha1/Sha1Init.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Sha1/Sha1Init.cs @@ -20,7 +20,6 @@ using Nitrocid.Drivers; using Nitrocid.Drivers.Encryption; using Nitrocid.Kernel.Extensions; -using Nitrocid.Modifications; namespace Nitrocid.Extras.Sha1 { diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Sha256Enhanced/Sha256EnhancedInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Sha256Enhanced/Sha256EnhancedInit.cs index c23af383f..96db1a5ae 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.Sha256Enhanced/Sha256EnhancedInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Sha256Enhanced/Sha256EnhancedInit.cs @@ -20,7 +20,6 @@ using Nitrocid.Drivers; using Nitrocid.Drivers.Encryption; using Nitrocid.Kernel.Extensions; -using Nitrocid.Modifications; namespace Nitrocid.Extras.Sha256Enhanced { diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Sha384/Sha384Init.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Sha384/Sha384Init.cs index 3c3dc5182..e09e6acd7 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.Sha384/Sha384Init.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Sha384/Sha384Init.cs @@ -20,7 +20,6 @@ using Nitrocid.Drivers; using Nitrocid.Drivers.Encryption; using Nitrocid.Kernel.Extensions; -using Nitrocid.Modifications; namespace Nitrocid.Extras.Sha384 { diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Sha384Enhanced/Sha384EnhancedInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Sha384Enhanced/Sha384EnhancedInit.cs index 2b05f7ce3..3b53d2010 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.Sha384Enhanced/Sha384EnhancedInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Sha384Enhanced/Sha384EnhancedInit.cs @@ -20,7 +20,6 @@ using Nitrocid.Drivers; using Nitrocid.Drivers.Encryption; using Nitrocid.Kernel.Extensions; -using Nitrocid.Modifications; namespace Nitrocid.Extras.Sha384Enhanced { diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Sha512Enhanced/Sha512EnhancedInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Sha512Enhanced/Sha512EnhancedInit.cs index a112652d3..0d5f1d4cd 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.Sha512Enhanced/Sha512EnhancedInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Sha512Enhanced/Sha512EnhancedInit.cs @@ -20,7 +20,6 @@ using Nitrocid.Drivers; using Nitrocid.Drivers.Encryption; using Nitrocid.Kernel.Extensions; -using Nitrocid.Modifications; namespace Nitrocid.Extras.Sha512Enhanced { diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.SqlShell/SqlShellInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.SqlShell/SqlShellInit.cs index 32e0fda94..9cda555c6 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.SqlShell/SqlShellInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.SqlShell/SqlShellInit.cs @@ -21,7 +21,6 @@ using Nitrocid.Extras.SqlShell.Sql; using Nitrocid.Kernel.Configuration; using Nitrocid.Kernel.Extensions; -using Nitrocid.Modifications; using Nitrocid.Shell.ShellBase.Shells; namespace Nitrocid.Extras.SqlShell diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Ssh/SshInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Ssh/SshInit.cs index 8429c0937..d1f8c195a 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.Ssh/SshInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Ssh/SshInit.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.Extras.Ssh.Settings; using Nitrocid.Extras.Ssh.Commands; diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Stocks/StocksInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Stocks/StocksInit.cs index dfb7fcc62..935a2cb2f 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.Stocks/StocksInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Stocks/StocksInit.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.Stocks.Settings; using Nitrocid.Kernel.Configuration; diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.ThemeStudio/ThemeStudioInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.ThemeStudio/ThemeStudioInit.cs index 2c7855288..7f46f720a 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.ThemeStudio/ThemeStudioInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.ThemeStudio/ThemeStudioInit.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.TimeInfo/TimeInfoInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.TimeInfo/TimeInfoInit.cs index 685615d5d..59a1be3b2 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.TimeInfo/TimeInfoInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.TimeInfo/TimeInfoInit.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.TimeInfo diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Timers/TimersInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Timers/TimersInit.cs index d46e967f1..9de446cfb 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.Timers/TimersInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Timers/TimersInit.cs @@ -25,7 +25,6 @@ using System.Collections.Generic; using Nitrocid.Kernel.Extensions; using Nitrocid.Shell.ShellBase.Shells; -using Nitrocid.Modifications; using System.Linq; using Nitrocid.Shell.Homepage; using Nitrocid.Extras.Timers.Timers; diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Tips/TipsInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Tips/TipsInit.cs index b7d2bb8a0..c38caa5d0 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.Tips/TipsInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.Tips/TipsInit.cs @@ -20,7 +20,6 @@ using Nitrocid.Extras.Tips.Settings; using Nitrocid.Kernel.Configuration; using Nitrocid.Kernel.Extensions; -using Nitrocid.Modifications; using Nitrocid.Kernel.Starting; namespace Nitrocid.Extras.Tips diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.ToDoList/ToDoListInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.ToDoList/ToDoListInit.cs index b82676391..b9c268a63 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.ToDoList/ToDoListInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.ToDoList/ToDoListInit.cs @@ -25,7 +25,6 @@ using System.Collections.Generic; using Nitrocid.Kernel.Extensions; using Nitrocid.Shell.ShellBase.Shells; -using Nitrocid.Modifications; using System.Linq; namespace Nitrocid.Extras.ToDoList diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.UnitConv/UnitConvInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.UnitConv/UnitConvInit.cs index 66123e713..5fc641f9e 100644 --- a/public/Nitrocid.Addons/Nitrocid.Extras.UnitConv/UnitConvInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.Extras.UnitConv/UnitConvInit.cs @@ -26,7 +26,6 @@ using UnitsNet; using Nitrocid.Kernel.Extensions; using Nitrocid.Shell.ShellBase.Shells; -using Nitrocid.Modifications; using Nitrocid.Extras.UnitConv.Tools; using Nitrocid.Shell.Homepage; diff --git a/public/Nitrocid.Addons/Nitrocid.LanguagePacks/LanguagePackInit.cs b/public/Nitrocid.Addons/Nitrocid.LanguagePacks/LanguagePackInit.cs index ea05811e8..0412d16b0 100644 --- a/public/Nitrocid.Addons/Nitrocid.LanguagePacks/LanguagePackInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.LanguagePacks/LanguagePackInit.cs @@ -24,7 +24,6 @@ using Nitrocid.Languages; using Nitrocid.Languages.Decoy; using Nitrocid.Misc.Reflection.Internal; -using Nitrocid.Modifications; using System.Linq; using Textify.General; diff --git a/public/Nitrocid.Addons/Nitrocid.ScreensaverPacks/ScreensaverPackInit.cs b/public/Nitrocid.Addons/Nitrocid.ScreensaverPacks/ScreensaverPackInit.cs index 31ac7392c..c302f7281 100644 --- a/public/Nitrocid.Addons/Nitrocid.ScreensaverPacks/ScreensaverPackInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.ScreensaverPacks/ScreensaverPackInit.cs @@ -20,7 +20,6 @@ using Nitrocid.Kernel.Configuration; using Nitrocid.Kernel.Extensions; using Nitrocid.Misc.Screensaver; -using Nitrocid.Modifications; using Nitrocid.ScreensaverPacks.Screensavers; using Nitrocid.ScreensaverPacks.Settings; using System.Collections.Generic; diff --git a/public/Nitrocid.Addons/Nitrocid.SplashPacks/SplashPackInit.cs b/public/Nitrocid.Addons/Nitrocid.SplashPacks/SplashPackInit.cs index f0ff72a21..e20e871e9 100644 --- a/public/Nitrocid.Addons/Nitrocid.SplashPacks/SplashPackInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.SplashPacks/SplashPackInit.cs @@ -20,7 +20,6 @@ using Nitrocid.Kernel.Configuration; using Nitrocid.Kernel.Extensions; using Nitrocid.Misc.Splash; -using Nitrocid.Modifications; using Nitrocid.SplashPacks.Settings; using Nitrocid.SplashPacks.Splashes; diff --git a/public/Nitrocid.Addons/Nitrocid.ThemePacks/ThemePackInit.cs b/public/Nitrocid.Addons/Nitrocid.ThemePacks/ThemePackInit.cs index 07414b0fa..539419a1e 100644 --- a/public/Nitrocid.Addons/Nitrocid.ThemePacks/ThemePackInit.cs +++ b/public/Nitrocid.Addons/Nitrocid.ThemePacks/ThemePackInit.cs @@ -21,7 +21,6 @@ using Newtonsoft.Json.Linq; using Nitrocid.Kernel.Debugging; using Nitrocid.Kernel.Extensions; -using Nitrocid.Modifications; using Nitrocid.Misc.Reflection.Internal; using Textify.General; using Nitrocid.Kernel.Exceptions; diff --git a/public/Nitrocid/Arguments/CommandLineArguments/Lang.cs b/public/Nitrocid/Arguments/CommandLineArguments/Lang.cs index e9fbcab05..1ad9c96e6 100644 --- a/public/Nitrocid/Arguments/CommandLineArguments/Lang.cs +++ b/public/Nitrocid/Arguments/CommandLineArguments/Lang.cs @@ -21,7 +21,6 @@ using Nitrocid.Files.Paths; using Nitrocid.Kernel.Extensions; using Nitrocid.Languages; -using Nitrocid.Modifications; namespace Nitrocid.Arguments.CommandLineArguments { diff --git a/public/Nitrocid/Kernel/Debugging/Testing/Facades/BlacklistMod.cs b/public/Nitrocid/Kernel/Debugging/Testing/Facades/BlacklistMod.cs deleted file mode 100644 index fa302d023..000000000 --- a/public/Nitrocid/Kernel/Debugging/Testing/Facades/BlacklistMod.cs +++ /dev/null @@ -1,37 +0,0 @@ -// -// Nitrocid KS Copyright (C) 2018-2025 Aptivi -// -// This file is part of Nitrocid KS -// -// Nitrocid KS is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Nitrocid KS is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY, without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -using Nitrocid.Languages; -using Nitrocid.Modifications; - -namespace Nitrocid.Kernel.Debugging.Testing.Facades -{ - internal class BlacklistMod : TestFacade - { - public override string TestName => Translate.DoTranslation("Adds a mod to the blacklist"); - public override TestSection TestSection => TestSection.Modification; - public override bool TestInteractive => false; - public override object TestExpectedValue => true; - public override void Run(params string[] args) - { - ModManager.AddModToBlacklist("MaliciousMod"); - TestActualValue = ModManager.GetBlacklistedMods().Contains("MaliciousMod"); - } - } -} diff --git a/public/Nitrocid/Kernel/Debugging/Testing/Facades/BlacklistModUndo.cs b/public/Nitrocid/Kernel/Debugging/Testing/Facades/BlacklistModUndo.cs deleted file mode 100644 index fbb8fa2a1..000000000 --- a/public/Nitrocid/Kernel/Debugging/Testing/Facades/BlacklistModUndo.cs +++ /dev/null @@ -1,37 +0,0 @@ -// -// Nitrocid KS Copyright (C) 2018-2025 Aptivi -// -// This file is part of Nitrocid KS -// -// Nitrocid KS is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Nitrocid KS is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY, without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -using Nitrocid.Languages; -using Nitrocid.Modifications; - -namespace Nitrocid.Kernel.Debugging.Testing.Facades -{ - internal class BlacklistModUndo : TestFacade - { - public override string TestName => Translate.DoTranslation("Removes a mod from the blacklist"); - public override TestSection TestSection => TestSection.Modification; - public override bool TestInteractive => false; - public override object TestExpectedValue => false; - public override void Run(params string[] args) - { - ModManager.RemoveModFromBlacklist("MaliciousMod"); - TestActualValue = ModManager.GetBlacklistedMods().Contains("MaliciousMod"); - } - } -} diff --git a/public/Nitrocid/Kernel/Debugging/Testing/Facades/LoadMods.cs b/public/Nitrocid/Kernel/Debugging/Testing/Facades/LoadMods.cs deleted file mode 100644 index 3a7a6ca10..000000000 --- a/public/Nitrocid/Kernel/Debugging/Testing/Facades/LoadMods.cs +++ /dev/null @@ -1,34 +0,0 @@ -// -// Nitrocid KS Copyright (C) 2018-2025 Aptivi -// -// This file is part of Nitrocid KS -// -// Nitrocid KS is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Nitrocid KS is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY, without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -using Nitrocid.Languages; -using Nitrocid.Modifications; - -namespace Nitrocid.Kernel.Debugging.Testing.Facades -{ - internal class LoadMods : TestFacade - { - public override string TestName => Translate.DoTranslation("Starts all mods"); - public override TestSection TestSection => TestSection.Modification; - public override void Run(params string[] args) - { - ModManager.StartMods(); - } - } -} diff --git a/public/Nitrocid/Kernel/Debugging/Testing/Facades/ReloadMods.cs b/public/Nitrocid/Kernel/Debugging/Testing/Facades/ReloadMods.cs deleted file mode 100644 index f0bb6f753..000000000 --- a/public/Nitrocid/Kernel/Debugging/Testing/Facades/ReloadMods.cs +++ /dev/null @@ -1,34 +0,0 @@ -// -// Nitrocid KS Copyright (C) 2018-2025 Aptivi -// -// This file is part of Nitrocid KS -// -// Nitrocid KS is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Nitrocid KS is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY, without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -using Nitrocid.Languages; -using Nitrocid.Modifications; - -namespace Nitrocid.Kernel.Debugging.Testing.Facades -{ - internal class ReloadMods : TestFacade - { - public override string TestName => Translate.DoTranslation("Reloads all mods"); - public override TestSection TestSection => TestSection.Modification; - public override void Run(params string[] args) - { - ModManager.ReloadMods(); - } - } -} diff --git a/public/Nitrocid/Kernel/Debugging/Testing/Facades/StopMods.cs b/public/Nitrocid/Kernel/Debugging/Testing/Facades/StopMods.cs deleted file mode 100644 index c49ab0c01..000000000 --- a/public/Nitrocid/Kernel/Debugging/Testing/Facades/StopMods.cs +++ /dev/null @@ -1,34 +0,0 @@ -// -// Nitrocid KS Copyright (C) 2018-2025 Aptivi -// -// This file is part of Nitrocid KS -// -// Nitrocid KS is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Nitrocid KS is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY, without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -using Nitrocid.Languages; -using Nitrocid.Modifications; - -namespace Nitrocid.Kernel.Debugging.Testing.Facades -{ - internal class StopMods : TestFacade - { - public override string TestName => Translate.DoTranslation("Starts all mods"); - public override TestSection TestSection => TestSection.Modification; - public override void Run(params string[] args) - { - ModManager.StopMods(); - } - } -} diff --git a/public/Nitrocid/Kernel/Debugging/Testing/TestInteractive.cs b/public/Nitrocid/Kernel/Debugging/Testing/TestInteractive.cs index 8a1908505..191a6b876 100644 --- a/public/Nitrocid/Kernel/Debugging/Testing/TestInteractive.cs +++ b/public/Nitrocid/Kernel/Debugging/Testing/TestInteractive.cs @@ -70,11 +70,6 @@ internal static class TestInteractive { "ShowTimeUtc", new ShowTimeUtc() }, { "ShowDateUtc", new ShowDateUtc() }, { "ShowTimeDateUtc", new ShowTimeDateUtc() }, - { "LoadMods", new LoadMods() }, - { "StopMods", new StopMods() }, - { "ReloadMods", new ReloadMods() }, - { "BlacklistMod", new BlacklistMod() }, - { "BlacklistModUndo", new BlacklistModUndo() }, { "CheckString", new CheckString() }, { "CheckStrings", new CheckStrings() }, { "CheckLocalizationLines", new CheckLocalizationLines() }, diff --git a/public/Nitrocid/Kernel/Extensions/AddonTools.cs b/public/Nitrocid/Kernel/Extensions/AddonTools.cs index 4507dd8f6..e92f41e16 100644 --- a/public/Nitrocid/Kernel/Extensions/AddonTools.cs +++ b/public/Nitrocid/Kernel/Extensions/AddonTools.cs @@ -25,7 +25,6 @@ using Nitrocid.Languages; using Nitrocid.Misc.Reflection; using Nitrocid.Misc.Splash; -using Nitrocid.Modifications; using Nitrocid.Security.Signing; using System; using System.Collections.Generic; diff --git a/public/Nitrocid/Kernel/Extensions/IAddon.cs b/public/Nitrocid/Kernel/Extensions/IAddon.cs index 25434f360..106ac94ce 100644 --- a/public/Nitrocid/Kernel/Extensions/IAddon.cs +++ b/public/Nitrocid/Kernel/Extensions/IAddon.cs @@ -17,8 +17,6 @@ // along with this program. If not, see . // -using Nitrocid.Modifications; - namespace Nitrocid.Kernel.Extensions { internal interface IAddon diff --git a/public/Nitrocid/Modifications/IMod.cs b/public/Nitrocid/Kernel/Extensions/IMod.cs similarity index 97% rename from public/Nitrocid/Modifications/IMod.cs rename to public/Nitrocid/Kernel/Extensions/IMod.cs index 4769acfb4..c26bb3706 100644 --- a/public/Nitrocid/Modifications/IMod.cs +++ b/public/Nitrocid/Kernel/Extensions/IMod.cs @@ -19,7 +19,7 @@ using System; -namespace Nitrocid.Modifications +namespace Nitrocid.Kernel.Extensions { /// /// Interface for mods diff --git a/public/Nitrocid/Modifications/ModLoadPriority.cs b/public/Nitrocid/Kernel/Extensions/ModLoadPriority.cs similarity index 96% rename from public/Nitrocid/Modifications/ModLoadPriority.cs rename to public/Nitrocid/Kernel/Extensions/ModLoadPriority.cs index 1af78a694..d621d8a54 100644 --- a/public/Nitrocid/Modifications/ModLoadPriority.cs +++ b/public/Nitrocid/Kernel/Extensions/ModLoadPriority.cs @@ -17,7 +17,7 @@ // along with this program. If not, see . // -namespace Nitrocid.Modifications +namespace Nitrocid.Kernel.Extensions { /// /// Kernel modification loading priority type diff --git a/public/Nitrocid/Kernel/Starting/KernelInitializers.cs b/public/Nitrocid/Kernel/Starting/KernelInitializers.cs index 3846a709f..db0570b9e 100644 --- a/public/Nitrocid/Kernel/Starting/KernelInitializers.cs +++ b/public/Nitrocid/Kernel/Starting/KernelInitializers.cs @@ -36,7 +36,6 @@ using Nitrocid.Languages; using Nitrocid.Misc.Notifications; using Nitrocid.Security.Privacy; -using Nitrocid.Modifications; using Terminaux.Inputs.Styles.Infobox; using Nitrocid.Files.Paths; using Nitrocid.Kernel.Time.Alarm; diff --git a/public/Nitrocid/Kernel/Starting/KernelStageActions.cs b/public/Nitrocid/Kernel/Starting/KernelStageActions.cs index 42eea3c36..26cd35a06 100644 --- a/public/Nitrocid/Kernel/Starting/KernelStageActions.cs +++ b/public/Nitrocid/Kernel/Starting/KernelStageActions.cs @@ -25,7 +25,6 @@ using Nitrocid.Languages; using Nitrocid.Misc.Notifications; using Nitrocid.Misc.Splash; -using Nitrocid.Modifications; using Nitrocid.Users; using Nitrocid.Users.Groups; using Nitrocid.Network.Types.RPC; @@ -119,13 +118,7 @@ internal static void Stage05UserInitialization() SplashReport.ReportProgress(Translate.DoTranslation("Users initialized"), 5); } - internal static void Stage06KernelModifications() - { - if (Config.MainConfig.StartKernelMods) - ModManager.StartMods(); - } - - internal static void Stage07SysIntegrity() + internal static void Stage06SysIntegrity() { SplashReport.ReportProgress(Translate.DoTranslation("Verifying system integrity"), 5); @@ -148,7 +141,7 @@ internal static void Stage07SysIntegrity() ThreadWatchdog.EnsureAllCriticalThreadsStarted(); } - internal static void Stage08Bootables() + internal static void Stage07Bootables() { SplashReport.ReportProgress(Translate.DoTranslation("Checking for multiple installed environments"), 5); diff --git a/public/Nitrocid/Kernel/Starting/KernelStageTools.cs b/public/Nitrocid/Kernel/Starting/KernelStageTools.cs index dfb61368d..8750b1828 100644 --- a/public/Nitrocid/Kernel/Starting/KernelStageTools.cs +++ b/public/Nitrocid/Kernel/Starting/KernelStageTools.cs @@ -39,9 +39,8 @@ internal static class KernelStageTools new KernelStage( /* Localizable */ "Hardware detection", KernelStageActions.Stage03HardwareProbe), new KernelStage( /* Localizable */ "Optional components", KernelStageActions.Stage04OptionalComponents, false, false), new KernelStage( /* Localizable */ "User initialization", KernelStageActions.Stage05UserInitialization, true, false), - new KernelStage( /* Localizable */ "Kernel modifications", KernelStageActions.Stage06KernelModifications, false, false), - new KernelStage( /* Localizable */ "System integrity verification", KernelStageActions.Stage07SysIntegrity), - new KernelStage( /* Localizable */ "Multiple environments", KernelStageActions.Stage08Bootables, false, false), + new KernelStage( /* Localizable */ "System integrity verification", KernelStageActions.Stage06SysIntegrity), + new KernelStage( /* Localizable */ "Multiple environments", KernelStageActions.Stage07Bootables, false, false), ]; internal static void RunKernelStage(int stageNum) diff --git a/public/Nitrocid/Languages/Translate.cs b/public/Nitrocid/Languages/Translate.cs index a6cd9028b..310880f1f 100644 --- a/public/Nitrocid/Languages/Translate.cs +++ b/public/Nitrocid/Languages/Translate.cs @@ -18,7 +18,6 @@ // using Nitrocid.Kernel.Debugging; -using Nitrocid.Modifications; using System.Linq; namespace Nitrocid.Languages diff --git a/public/Nitrocid/Shell/ShellBase/Arguments/ArgumentsParser.cs b/public/Nitrocid/Shell/ShellBase/Arguments/ArgumentsParser.cs index b3b509e08..da9502157 100644 --- a/public/Nitrocid/Shell/ShellBase/Arguments/ArgumentsParser.cs +++ b/public/Nitrocid/Shell/ShellBase/Arguments/ArgumentsParser.cs @@ -22,7 +22,6 @@ using Nitrocid.Kernel.Exceptions; using Nitrocid.Languages; using Nitrocid.Misc.Text.Probers.Regexp; -using Nitrocid.Modifications; using Nitrocid.Shell.ShellBase.Aliases; using Nitrocid.Shell.ShellBase.Commands; using Nitrocid.Shell.ShellBase.Shells; @@ -78,11 +77,10 @@ public static (ProvidedArgumentsInfo? satisfied, ProvidedArgumentsInfo[] total) { string Command; CommandInfo[] ShellCommands; - CommandInfo[] ModCommands; // Change the available commands list according to command type + var shellInfo = ShellManager.GetShellInfo(CommandType); ShellCommands = CommandManager.GetCommands(CommandType); - ModCommands = ModManager.ListModCommands(CommandType); // Split the requested command string into words var words = CommandText.SplitEncloseDoubleQuotes(); @@ -95,14 +93,12 @@ public static (ProvidedArgumentsInfo? satisfied, ProvidedArgumentsInfo[] total) // Check to see if the caller has provided a switch that subtracts the number of required arguments var aliases = AliasManager.GetEntireAliasListFromType(CommandType); - var CommandInfo = ModCommands.Any((info) => info.Command == Command) ? ModCommands.Single((info) => info.Command == Command) : - ShellCommands.Any((info) => info.Command == Command) ? ShellCommands.Single((info) => info.Command == Command) : + var CommandInfo = ShellCommands.Any((info) => info.Command == Command) ? ShellCommands.Single((info) => info.Command == Command) : aliases.Any((info) => info.Alias == Command) ? aliases.Single((info) => info.Alias == Command).TargetCommand : cmdInfo; var fallback = new ProvidedArgumentsInfo(Command, arguments, words.Skip(1).ToArray(), argumentsOrig, wordsOrig.Skip(1).ToArray(), [], true, true, true, [], [], [], true, true, true, new()); // Change the command if a command with no slash is entered on slash-enabled shells - var shellInfo = ShellManager.GetShellInfo(CommandType); if (shellInfo.SlashCommand) { if (!CommandText.StartsWith('/')) diff --git a/public/Nitrocid/Shell/ShellBase/Arguments/CommandAutoCompletionList.cs b/public/Nitrocid/Shell/ShellBase/Arguments/CommandAutoCompletionList.cs index d41b104b9..06d186a10 100644 --- a/public/Nitrocid/Shell/ShellBase/Arguments/CommandAutoCompletionList.cs +++ b/public/Nitrocid/Shell/ShellBase/Arguments/CommandAutoCompletionList.cs @@ -20,7 +20,6 @@ using Nitrocid.ConsoleBase.Themes; using Nitrocid.Misc.Screensaver; using Nitrocid.Misc.Splash; -using Nitrocid.Modifications; using Nitrocid.Security.Permissions; using Nitrocid.Shell.ShellBase.Commands; using Nitrocid.Shell.ShellBase.Scripting; diff --git a/public/Nitrocid/Shell/ShellBase/Commands/CommandManager.cs b/public/Nitrocid/Shell/ShellBase/Commands/CommandManager.cs index d1d273582..a32df7e84 100644 --- a/public/Nitrocid/Shell/ShellBase/Commands/CommandManager.cs +++ b/public/Nitrocid/Shell/ShellBase/Commands/CommandManager.cs @@ -24,7 +24,6 @@ using Nitrocid.Languages; using Nitrocid.Misc.Splash; using Nitrocid.Misc.Text.Probers.Regexp; -using Nitrocid.Modifications; using Nitrocid.Shell.ShellBase.Shells; using System; using System.Collections.Generic; @@ -93,8 +92,8 @@ public static CommandInfo[] GetCommands(string ShellType) { // Individual shells var shellInfo = ShellManager.GetShellInfo(ShellType); - var addonCommands = ShellManager.GetShellInfo(ShellType).addonCommands; - var modCommands = ModManager.ListModCommands(ShellType); + var addonCommands = shellInfo.addonCommands; + var modCommands = shellInfo.ModCommands; List FinalCommands = shellInfo.Commands; // Unified commands @@ -236,8 +235,9 @@ public static void RegisterCustomCommand(string ShellType, CommandInfo? commandB // Now, add the command to the mod list DebugWriter.WriteDebug(DebugLevel.I, "Adding command {0} for {1}...", command, ShellType); - if (!ModManager.ListModCommands(ShellType).Contains(commandBase)) - ShellManager.GetShellInfo(ShellType).ModCommands.Add(commandBase); + var shellInfo = ShellManager.GetShellInfo(ShellType); + if (!shellInfo.ModCommands.Contains(commandBase)) + shellInfo.ModCommands.Add(commandBase); DebugWriter.WriteDebug(DebugLevel.I, "Registered {0}, ShellType: {1}", command, ShellType); } diff --git a/public/Nitrocid/Shell/ShellBase/Help/HelpPrintTools.cs b/public/Nitrocid/Shell/ShellBase/Help/HelpPrintTools.cs index 55507cdcf..e7b35cdf9 100644 --- a/public/Nitrocid/Shell/ShellBase/Help/HelpPrintTools.cs +++ b/public/Nitrocid/Shell/ShellBase/Help/HelpPrintTools.cs @@ -26,7 +26,6 @@ using Nitrocid.Kernel; using Nitrocid.Kernel.Configuration; using Nitrocid.Languages; -using Nitrocid.Modifications; using Nitrocid.Shell.ShellBase.Aliases; using Nitrocid.Shell.ShellBase.Arguments; using Nitrocid.Shell.ShellBase.Commands; @@ -42,12 +41,13 @@ internal static class HelpPrintTools internal static void ShowCommandList(string commandType, bool showGeneral = true, bool showMod = false, bool showAlias = false, bool showUnified = false, bool showAddon = false) { // Get general commands + var shellInfo = ShellManager.GetShellInfo(commandType); var commands = CommandManager.GetCommands(commandType); - var commandList = ShellManager.GetShellInfo(commandType).Commands; + var commandList = shellInfo.Commands; // Add every command from each mod, addon, and alias - var ModCommandList = ModManager.ListModCommands(commandType); - var AddonCommandList = ShellManager.GetShellInfo(commandType).addonCommands; + var ModCommandList = shellInfo.ModCommands; + var AddonCommandList = shellInfo.addonCommands; var unifiedCommandList = ShellManager.unifiedCommandDict; var AliasedCommandList = AliasManager.GetEntireAliasListFromType(commandType) .ToDictionary((ai) => ai, (ai) => ai.TargetCommand); @@ -88,8 +88,8 @@ internal static void ShowCommandList(string commandType, bool showGeneral = true // The mod commands if (showMod) { - TextWriters.Write(CharManager.NewLine + Translate.DoTranslation("Mod commands:") + (Config.MainConfig.ShowCommandsCount & Config.MainConfig.ShowModCommandsCount ? " [{0}]" : ""), true, KernelColorType.ListTitle, ModCommandList.Length); - if (ModCommandList.Length == 0) + TextWriters.Write(CharManager.NewLine + Translate.DoTranslation("Mod commands:") + (Config.MainConfig.ShowCommandsCount & Config.MainConfig.ShowModCommandsCount ? " [{0}]" : ""), true, KernelColorType.ListTitle, ModCommandList.Count); + if (ModCommandList.Count == 0) TextWriters.Write(" - " + Translate.DoTranslation("No mod commands."), true, KernelColorType.Warning); foreach (var cmd in ModCommandList) { @@ -158,15 +158,15 @@ internal static void ShowCommandListSimplified(string commandType) internal static void ShowHelpUsage(string command, string commandType) { // Determine command type - var CommandList = ShellManager.GetShellInfo(commandType).Commands; + var shellInfo = ShellManager.GetShellInfo(commandType); + var CommandList = shellInfo.Commands; // Add every command from each mod, addon, and alias - var ModCommandList = ModManager.ListModCommands(commandType); - var AddonCommandList = ShellManager.GetShellInfo(commandType).addonCommands; + var ModCommandList = shellInfo.ModCommands; + var AddonCommandList = shellInfo.addonCommands; var unifiedCommandList = ShellManager.unifiedCommandDict; var AliasedCommandList = AliasManager.GetEntireAliasListFromType(commandType) .ToDictionary((ai) => ai, (ai) => ai.TargetCommand); - var totalCommandList = CommandManager.GetCommands(commandType); // Check to see if command exists if (!string.IsNullOrWhiteSpace(command) &&