diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-05-24 21:36:38 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-05-24 21:36:38 -0400 |
| commit | e40d099112f6bfd355dc0546b0df8229985deb24 (patch) | |
| tree | 99bb60ef7728438f63f1d6ee86b1880793b426f7 /src/SMAPI/Program.cs | |
| parent | 16ad205ded9b0defe939213b57948216f43f948f (diff) | |
| parent | bd04d46dd1d66b30d4f21575bbbd2e541eabcef3 (diff) | |
| download | SMAPI-e40d099112f6bfd355dc0546b0df8229985deb24.tar.gz SMAPI-e40d099112f6bfd355dc0546b0df8229985deb24.tar.bz2 SMAPI-e40d099112f6bfd355dc0546b0df8229985deb24.zip | |
Merge branch 'content-core-rewrite' into develop
# Conflicts:
# docs/release-notes.md
Diffstat (limited to 'src/SMAPI/Program.cs')
| -rw-r--r-- | src/SMAPI/Program.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs index f4768389..aeb9b9fb 100644 --- a/src/SMAPI/Program.cs +++ b/src/SMAPI/Program.cs @@ -753,8 +753,7 @@ namespace StardewModdingAPI // load mod as content pack IManifest manifest = metadata.Manifest; IMonitor monitor = this.GetSecondaryMonitor(metadata.DisplayName); - SContentManager contentManager = this.ContentCore.CreateContentManager($"Mods.{metadata.Manifest.UniqueID}", isModFolder: true, rootDirectory: metadata.DirectoryPath); - IContentHelper contentHelper = new ContentHelper(this.ContentCore, contentManager, metadata.DirectoryPath, manifest.UniqueID, metadata.DisplayName, monitor); + IContentHelper contentHelper = new ContentHelper(this.ContentCore, metadata.DirectoryPath, manifest.UniqueID, metadata.DisplayName, monitor); IContentPack contentPack = new ContentPack(metadata.DirectoryPath, manifest, contentHelper, jsonHelper); metadata.SetMod(contentPack, monitor); this.ModRegistry.Add(metadata); @@ -842,8 +841,7 @@ namespace StardewModdingAPI IModHelper modHelper; { ICommandHelper commandHelper = new CommandHelper(manifest.UniqueID, metadata.DisplayName, this.CommandManager); - SContentManager contentManager = this.ContentCore.CreateContentManager($"Mods.{metadata.Manifest.UniqueID}", isModFolder: true, rootDirectory: metadata.DirectoryPath); - IContentHelper contentHelper = new ContentHelper(contentCore, contentManager, metadata.DirectoryPath, manifest.UniqueID, metadata.DisplayName, monitor); + IContentHelper contentHelper = new ContentHelper(contentCore, metadata.DirectoryPath, manifest.UniqueID, metadata.DisplayName, monitor); IReflectionHelper reflectionHelper = new ReflectionHelper(manifest.UniqueID, metadata.DisplayName, this.Reflection, this.DeprecationManager); IModRegistry modRegistryHelper = new ModRegistryHelper(manifest.UniqueID, this.ModRegistry, proxyFactory, monitor); IMultiplayerHelper multiplayerHelper = new MultiplayerHelper(manifest.UniqueID, this.GameInstance.Multiplayer); @@ -852,8 +850,7 @@ namespace StardewModdingAPI IContentPack CreateTransitionalContentPack(string packDirPath, IManifest packManifest) { IMonitor packMonitor = this.GetSecondaryMonitor(packManifest.Name); - SContentManager packContentManager = this.ContentCore.CreateContentManager($"Mods.{packManifest.UniqueID}", isModFolder: true, rootDirectory: packDirPath); - IContentHelper packContentHelper = new ContentHelper(contentCore, packContentManager, packDirPath, packManifest.UniqueID, packManifest.Name, packMonitor); + IContentHelper packContentHelper = new ContentHelper(contentCore, packDirPath, packManifest.UniqueID, packManifest.Name, packMonitor); return new ContentPack(packDirPath, packManifest, packContentHelper, this.JsonHelper); } |