diff --git a/IPA.Loader/IPA.Loader.csproj b/IPA.Loader/IPA.Loader.csproj index 49b51c87..c15ab9df 100644 --- a/IPA.Loader/IPA.Loader.csproj +++ b/IPA.Loader/IPA.Loader.csproj @@ -73,10 +73,10 @@ - - - - + + + + @@ -92,8 +92,6 @@ 11.0.2 - - - + \ No newline at end of file diff --git a/IPA.Loader/Loader/PluginManager.cs b/IPA.Loader/Loader/PluginManager.cs index a50cac6c..72e477e1 100644 --- a/IPA.Loader/Loader/PluginManager.cs +++ b/IPA.Loader/Loader/PluginManager.cs @@ -1,7 +1,7 @@ -using IllusionInjector.Updating; -using IPA; +using IPA; using IPA.Logging; using IPA.Old; +using IPA.Updating; using IPA.Utilities; using Mono.Cecil; using System; @@ -209,8 +209,11 @@ namespace IPA.Loader if (@ref.FullName == "IllusionInjector.CompositeIPAPlugin") @ref.Namespace = "IPA.Loader.Composite"; //@ref.Name = ""; if (@ref.FullName == "IllusionInjector.Logging.UnityLogInterceptor") @ref.Namespace = "IPA.Logging"; //@ref.Name = ""; if (@ref.FullName == "IllusionInjector.Logging.StandardLogger") @ref.Namespace = "IPA.Logging"; //@ref.Name = ""; + if (@ref.FullName == "IllusionInjector.Updating.SelfPlugin") @ref.Namespace = "IPA.Updating"; //@ref.Name = ""; + if (@ref.FullName == "IllusionInjector.Updating.Backup.BackupUnit") @ref.Namespace = "IPA.Updating.Backup"; //@ref.Name = ""; if (@ref.Namespace == "IllusionInjector.Utilities") @ref.Namespace = "IPA.Utilities"; //@ref.Name = ""; if (@ref.Namespace == "IllusionInjector.Logging.Printers") @ref.Namespace = "IPA.Logging.Printers"; //@ref.Name = ""; + if (@ref.Namespace == "IllusionInjector.Updating.ModsaberML") @ref.Namespace = "IPA.Updating.ModsaberML"; //@ref.Name = ""; } module.Write(file); } diff --git a/IPA.Loader/IllusionInjector/Updating/ModsaberML/ApiEndpoint.cs b/IPA.Loader/Updating/ModsaberML/ApiEndpoint.cs similarity index 98% rename from IPA.Loader/IllusionInjector/Updating/ModsaberML/ApiEndpoint.cs rename to IPA.Loader/Updating/ModsaberML/ApiEndpoint.cs index cb31acda..38776d50 100644 --- a/IPA.Loader/IllusionInjector/Updating/ModsaberML/ApiEndpoint.cs +++ b/IPA.Loader/Updating/ModsaberML/ApiEndpoint.cs @@ -9,7 +9,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace IllusionInjector.Updating.ModsaberML +namespace IPA.Updating.ModsaberML { class ApiEndpoint { diff --git a/IPA.Loader/IllusionInjector/Updating/ModsaberML/Updater.cs b/IPA.Loader/Updating/ModsaberML/Updater.cs similarity index 99% rename from IPA.Loader/IllusionInjector/Updating/ModsaberML/Updater.cs rename to IPA.Loader/Updating/ModsaberML/Updater.cs index 43ce0f81..823a7ab8 100644 --- a/IPA.Loader/IllusionInjector/Updating/ModsaberML/Updater.cs +++ b/IPA.Loader/Updating/ModsaberML/Updater.cs @@ -18,7 +18,7 @@ using UnityEngine; using UnityEngine.Networking; using Logger = IPA.Logging.Logger; -namespace IllusionInjector.Updating.ModsaberML +namespace IPA.Updating.ModsaberML { class Updater : MonoBehaviour { diff --git a/IPA.Loader/IllusionInjector/Updating/SelfPlugin.cs b/IPA.Loader/Updating/SelfPlugin.cs similarity index 96% rename from IPA.Loader/IllusionInjector/Updating/SelfPlugin.cs rename to IPA.Loader/Updating/SelfPlugin.cs index 1472876c..12c79b51 100644 --- a/IPA.Loader/IllusionInjector/Updating/SelfPlugin.cs +++ b/IPA.Loader/Updating/SelfPlugin.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using UnityEngine.SceneManagement; -namespace IllusionInjector.Updating +namespace IPA.Updating { internal class SelfPlugin : IBeatSaberPlugin { diff --git a/IPA.Tests/IPA.Tests.csproj b/IPA.Tests/IPA.Tests.csproj index fb98f0df..15546da8 100644 --- a/IPA.Tests/IPA.Tests.csproj +++ b/IPA.Tests/IPA.Tests.csproj @@ -67,7 +67,6 @@ - diff --git a/IPA.Tests/updater_test.json b/IPA.Tests/updater_test.json deleted file mode 100644 index 19df2e06..00000000 --- a/IPA.Tests/updater_test.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "bsipa-test-plugin", - "version": "0.0.1", - "approved": true, - "title": "BSIPA Test Plugin", - "description": "", - "type": "mod", - "published": "2018-08-02T03:12:18.805Z", - "gameVersion": "0.11.2", - "gameVersionID": "5b626bb15d243a0008b8886e", - "oldVersions": [], - "dependsOn": [], - "conflictsWith": [], - "files": { - "steam": { - "hash": "a94e7eea2f656b2830a86000ee222b6cb06f8da5", - "files": { - "Plugins/": "da39a3ee5e6b4b0d3255bfef95601890afd80709", - "Plugins/RandomSong.dll": "64ee1ecfeda73c550004bdb5123c7ac47a45e428" - }, - "url": "https://www.modsaber.ml/cdn/randomsong/1.0.0-default.zip" - } - }, - "weight": 7, - "author": "danike", - "authorID": "5b62723f288b110008291cb9" -} \ No newline at end of file diff --git a/IPA/Patcher/BackupUnit.cs b/IPA/Patcher/BackupUnit.cs index 0656db52..5e84e4b1 100644 --- a/IPA/Patcher/BackupUnit.cs +++ b/IPA/Patcher/BackupUnit.cs @@ -19,8 +19,7 @@ namespace IPA.Patcher private List _Files = new List(); private FileInfo _ManifestFile; private static string _ManifestFileName = "$manifest$.txt"; - - + public BackupUnit(PatchContext context) : this(context, DateTime.Now.ToString("yyyy-MM-dd_h-mm-ss")) { }