diff --git a/OpenRA.Game/Exts.cs b/OpenRA.Game/Exts.cs index 4aa6bd27e9..527bb0e88f 100644 --- a/OpenRA.Game/Exts.cs +++ b/OpenRA.Game/Exts.cs @@ -30,11 +30,6 @@ namespace OpenRA return string.Format(fmt, args); } - public static string TrimOrEmpty(this string input) - { - return input != null ? input.Trim() : string.Empty; - } - public static T WithDefault(T def, Func f) { try { return f(); } diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index dc1ceb49bc..54c1ac8c59 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -443,8 +443,8 @@ namespace OpenRA if (!string.IsNullOrEmpty(window)) { var installData = modData.Manifest.ContentInstaller; - if (installData.ContainsKey("InstallerBackgroundWidget")) - Ui.LoadWidget(installData["InstallerBackgroundWidget"], Ui.Root, new WidgetArgs()); + if (installData.InstallerMenuWidget != null) + Ui.LoadWidget(installData.InstallerMenuWidget, Ui.Root, new WidgetArgs()); Widgets.Ui.OpenWindow(window, new WidgetArgs()); } @@ -463,16 +463,17 @@ namespace OpenRA { Ui.ResetAll(); var installData = modData.Manifest.ContentInstaller; - if (!installData["TestFiles"].Split(',').All(f => GlobalFileSystem.Exists(f.Trim()))) + if (!installData.TestFiles.All(f => GlobalFileSystem.Exists(f))) { var args = new WidgetArgs() { { "continueLoading", () => InitializeMod(Game.Settings.Game.Mod, null) }, - { "installData", installData } }; - if (installData.ContainsKey("InstallerBackgroundWidget")) - Ui.LoadWidget(installData["InstallerBackgroundWidget"], Ui.Root, args); - Ui.OpenWindow(installData["InstallerMenuWidget"], args); + + if (installData.InstallerBackgroundWidget != null) + Ui.LoadWidget(installData.InstallerBackgroundWidget, Ui.Root, args); + + Ui.OpenWindow(installData.InstallerMenuWidget, args); } else LoadShellMap(); diff --git a/OpenRA.Game/InstallUtils.cs b/OpenRA.Game/InstallUtils.cs index e8fd29229f..0bfbb641c8 100644 --- a/OpenRA.Game/InstallUtils.cs +++ b/OpenRA.Game/InstallUtils.cs @@ -18,6 +18,22 @@ using OpenRA.FileSystem; namespace OpenRA { + public class InstallData + { + public readonly string InstallerMenuWidget = null; + public readonly string InstallerBackgroundWidget = null; + public readonly string[] TestFiles = {}; + public readonly string[] DiskTestFiles = {}; + public readonly string PackageToExtractFromCD = null; + public readonly string[] ExtractFilesFromCD = {}; + public readonly string[] CopyFilesFromCD = {}; + + public readonly string PackageMirrorList = null; + + public readonly string MusicPackageMirrorList = null; + public readonly int ShippedSoundtracks = 0; + } + public static class InstallUtils { static IEnumerable GetEntries(this ZipInputStream z) diff --git a/OpenRA.Game/Manifest.cs b/OpenRA.Game/Manifest.cs index 9a578c2df7..3ae9e78ff6 100644 --- a/OpenRA.Game/Manifest.cs +++ b/OpenRA.Game/Manifest.cs @@ -32,7 +32,7 @@ namespace OpenRA public readonly IReadOnlyDictionary MapFolders; public readonly MiniYaml LoadScreen; public readonly MiniYaml LobbyDefaults; - public readonly IReadOnlyDictionary ContentInstaller; + public readonly InstallData ContentInstaller; public readonly Dictionary> Fonts; public readonly Size TileSize = new Size(24, 24); public readonly string NewsUrl; @@ -72,7 +72,10 @@ namespace OpenRA LoadScreen = yaml["LoadScreen"]; LobbyDefaults = yaml["LobbyDefaults"]; - ContentInstaller = YamlDictionary(yaml, "ContentInstaller"); + + if (yaml.ContainsKey("ContentInstaller")) + ContentInstaller = FieldLoader.Load(yaml["ContentInstaller"]); + Fonts = yaml["Fonts"].ToDictionary(my => { var nd = my.ToDictionary(); diff --git a/OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs index 8a06760ffc..cb98c121e2 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs @@ -21,17 +21,17 @@ namespace OpenRA.Mods.RA.Widgets.Logic { public class DownloadPackagesLogic { - Widget panel; - IReadOnlyDictionary installData; - ProgressBarWidget progressBar; - LabelWidget statusLabel; - Action afterInstall; + readonly Widget panel; + readonly InstallData installData; + readonly ProgressBarWidget progressBar; + readonly LabelWidget statusLabel; + readonly Action afterInstall; string mirror; [ObjectCreator.UseCtor] - public DownloadPackagesLogic(Widget widget, IReadOnlyDictionary installData, Action afterInstall) + public DownloadPackagesLogic(Widget widget, Action afterInstall) { - this.installData = installData; + installData = Game.modData.Manifest.ContentInstaller; this.afterInstall = afterInstall; panel = widget.Get("INSTALL_DOWNLOAD_PANEL"); @@ -130,7 +130,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic }; // Get the list of mirrors - var updateMirrors = new Download(installData["PackageMirrorList"], mirrorsFile, onDownloadProgress, onFetchMirrorsComplete); + var updateMirrors = new Download(installData.PackageMirrorList, mirrorsFile, onDownloadProgress, onFetchMirrorsComplete); cancelButton.OnClick = () => { updateMirrors.Cancel(); Ui.CloseWindow(); }; retryButton.OnClick = () => { updateMirrors.Cancel(); ShowDownloadDialog(); }; } diff --git a/OpenRA.Mods.RA/Widgets/Logic/InstallFromCDLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/InstallFromCDLogic.cs index e14dd571d9..7a7fe7f647 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/InstallFromCDLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/InstallFromCDLogic.cs @@ -46,8 +46,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic bool IsValidDisk(string diskRoot) { - var files = Game.modData.Manifest.ContentInstaller["DiskTestFiles"].Split(',').Select(x => x.Trim()).ToArray(); - return files.All(f => File.Exists(Path.Combine(diskRoot, f))); + return Game.modData.Manifest.ContentInstaller.DiskTestFiles.All(f => File.Exists(Path.Combine(diskRoot, f))); } void CheckForDisk() @@ -71,10 +70,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic installingContainer.IsVisible = () => true; var dest = new string[] { Platform.SupportDir, "Content", Game.modData.Manifest.Mod.Id }.Aggregate(Path.Combine); - var copyFiles = Game.modData.Manifest.ContentInstaller["CopyFilesFromCD"].Split(',').Select(x => x.TrimOrEmpty()).ToArray(); + var copyFiles = Game.modData.Manifest.ContentInstaller.CopyFilesFromCD; - var extractPackage = Game.modData.Manifest.ContentInstaller["PackageToExtractFromCD"].TrimOrEmpty(); - var extractFiles = Game.modData.Manifest.ContentInstaller["ExtractFilesFromCD"].Split(',').Select(x => x.TrimOrEmpty()).ToArray(); + var extractPackage = Game.modData.Manifest.ContentInstaller.PackageToExtractFromCD; + var extractFiles = Game.modData.Manifest.ContentInstaller.ExtractFilesFromCD; var installCounter = 0; var installTotal = copyFiles.Count() + extractFiles.Count(); diff --git a/OpenRA.Mods.RA/Widgets/Logic/InstallLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/InstallLogic.cs index 4ffbaf0a48..a1162755c1 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/InstallLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/InstallLogic.cs @@ -17,13 +17,12 @@ namespace OpenRA.Mods.RA.Widgets.Logic public class InstallLogic : Widget { [ObjectCreator.UseCtor] - public InstallLogic(Widget widget, IReadOnlyDictionary installData, Action continueLoading) + public InstallLogic(Widget widget, Action continueLoading) { var panel = widget.Get("INSTALL_PANEL"); var widgetArgs = new WidgetArgs() { { "afterInstall", () => { Ui.CloseWindow(); continueLoading(); } }, - { "installData", installData }, { "continueLoading", continueLoading } }; diff --git a/OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs index f38697f925..48a4a2d2ff 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs @@ -45,15 +45,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic if (downloadButton != null) { var installData = Game.modData.Manifest.ContentInstaller; - downloadButton.IsVisible = () => !string.IsNullOrEmpty(installData["MusicPackageMirrorList"]); - var musicInstallData = new Dictionary { }; - musicInstallData["PackageMirrorList"] = installData["MusicPackageMirrorList"]; - + downloadButton.IsVisible = () => !string.IsNullOrEmpty(installData.MusicPackageMirrorList); downloadButton.OnClick = () => { Ui.OpenWindow("INSTALL_DOWNLOAD_PANEL", new WidgetArgs() { { "afterInstall", () => Game.InitializeMod(Game.Settings.Game.Mod, null) }, - { "installData", new ReadOnlyDictionary(musicInstallData) }, }); }; } diff --git a/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs index 2a81dd23a6..4896d83bed 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs @@ -90,9 +90,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic Game.modData.LoadScreen.Display(); // HACK: prevent a flicker when transitioning to the installation dialog Game.InitializeMod(Game.Settings.Game.Mod, new Arguments(args)); }; + var installData = Game.modData.Manifest.ContentInstaller; - installButton.IsVisible = () => - modRules.InstalledMusic.ToArray().Length <= Exts.ParseIntegerInvariant(installData["ShippedSoundtracks"]); + installButton.IsVisible = () => modRules.InstalledMusic.ToArray().Length <= installData.ShippedSoundtracks; } panel.Get("BACK_BUTTON").OnClick = () => { Game.Settings.Save(); Ui.CloseWindow(); onExit(); }; diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 56a119ab9a..e1ef44bebd 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -124,7 +124,6 @@ ContentInstaller: ExtractFilesFromCD: SOUND.RS, DATA.R8, MOUSE.R8, BLOXBASE.R8, BLOXBAT.R8, BLOXBGBS.R8, BLOXICE.R8, BLOXTREE.R8, BLOXWAST.R8, A_ECONF1.AUD, A_ECONF2.AUD, A_ECONF3.AUD, A_ESEL1.AUD, A_ESEL2.AUD, A_ESEL3.AUD, A_FCONF1.AUD, A_FCONF2.AUD, A_FCONF3.AUD,A_FCONF4.AUD, A_FSEL1.AUD, A_FSEL2.AUD, A_FSEL3.AUD, A_FSEL4.AUD, AI_1MIN.AUD, AI_2MIN.AUD, AI_3MIN.AUD, AI_4MIN.AUD, AI_5MIN.AUD, AI_ABORT.AUD, AI_ATACK.AUD, AI_BDRDY.AUD, AI_BLOST.AUD, AI_BUILD.AUD, AI_CANCL.AUD, AI_CAPT.AUD, A_ICONF1.AUD, A_ICONF2.AUD, A_ICONF3.AUD, AI_DHRDY.AUD, AI_DPLOY.AUD, AI_ENEMY.AUD, AI_GANEW.AUD, AI_GLOAD.AUD, AI_GSAVE.AUD, AI_GUARD.AUD, AI_HATTK.AUD, AI_HOLD.AUD, AI_LAUNC.AUD, AI_MAP1A.AUD, AI_MAP1B.AUD, AI_MAP1C.AUD, AI_MAP2A.AUD, AI_MAP2B.AUD, AI_MAP2C.AUD, AI_MAP3A.AUD, AI_MAP4A.AUD, AI_MAP5A.AUD, AI_MAP6A.AUD, AI_MAP7A.AUD, AI_MAP8A.AUD, AI_MAP9A.AUD, AI_MEND.AUD, AI_MFAIL.AUD, AI_MONEY.AUD, AI_MWIN.AUD, AI_NEWOP.AUD, AI_NROOM.AUD, AI_ORDER.AUD, AI_PLACE.AUD, AI_POWER.AUD, AI_PREP.AUD, AI_PRMRY.AUD, AI_REINF.AUD, AI_RUN.AUD, A_ISEL1.AUD, A_ISEL2.AUD, A_ISEL3.AUD, AI_SELL.AUD, AI_SILOS.AUD, AI_SPORT.AUD, AI_TRAIN.AUD, AI_ULOST.AUD, AI_UNRDY.AUD, AI_UPGOP.AUD, AI_UPGRD.AUD, AI_WATTK.AUD, AI_WSIGN.AUD, A_VCONF1.AUD, A_VCONF2.AUD, A_VCONF3.AUD, A_VSEL1.AUD, A_VSEL2.AUD, A_VSEL3.AUD, G_SCONF1.AUD, G_SCONF2.AUD, G_SCONF3.AUD, G_SSEL1.AUD, G_SSEL2.AUD, G_SSEL3.AUD, H_ECONF1.AUD, H_ECONF2.AUD, H_ECONF3.AUD, H_ESEL1.AUD, H_ESEL2.AUD, H_ESEL3.AUD, HI_1MIN.AUD, HI_2MIN.AUD, HI_3MIN.AUD, HI_4MIN.AUD, HI_5MIN.AUD, HI_ABORT.AUD, HI_ATACK.AUD, HI_BDRDY.AUD, HI_BLOST.AUD, HI_BUILD.AUD, HI_CANCL.AUD, HI_CAPT.AUD, H_ICONF1.AUD, H_ICONF2.AUD, H_ICONF3.AUD, HI_DHRDY.AUD, HI_DPLOY.AUD, HI_ENEMY.AUD, HI_GANEW.AUD,HI_GLOAD.AUD, HI_GSAVE.AUD, HI_GUARD.AUD, HI_HATTK.AUD, HI_HOLD.AUD, HI_LAUNC.AUD, HI_MAP1A.AUD, HI_MAP1B.AUD, HI_MAP1C.AUD, HI_MAP2A.AUD, HI_MAP2B.AUD, HI_MAP2C.AUD, HI_MAP3A.AUD, HI_MAP3B.AUD, HI_MAP4A.AUD, HI_MAP4B.AUD, HI_MAP5A.AUD, HI_MAP6A.AUD, HI_MAP6B.AUD, HI_MAP7A.AUD, HI_MAP9A.AUD, HI_MAP9.AUD, HI_MEND.AUD, HI_MFAIL.AUD, HI_MONEY.AUD, HI_MWIN.AUD, HI_NEWOP.AUD, HI_NROOM.AUD, HI_ORDER.AUD, HI_PLACE.AUD, HI_POWER.AUD, HI_PREP.AUD, HI_PRMRY.AUD, HI_REINF.AUD, HI_RUN.AUD, H_ISEL1.AUD, H_ISEL2.AUD, H_ISEL3.AUD, HI_SELL.AUD, HI_SILOS.AUD,HI_SPORT.AUD, HI_TRAIN.AUD, HI_ULOST.AUD, HI_UNRDY.AUD, HI_UPGOP.AUD, HI_UPGRD.AUD, HI_WATTK.AUD, HI_WSIGN.AUD, H_VCONF1.AUD, H_VCONF2.AUD, H_VCONF3.AUD, H_VSEL1.AUD, H_VSEL2.AUD, H_VSEL3.AUD, O_ECONF1.AUD, O_ECONF2.AUD, O_ECONF3.AUD, O_ESEL1.AUD, O_ESEL2.AUD, O_ESEL3.AUD, OI_1MIN.AUD, OI_2MIN.AUD, OI_3MIN.AUD, OI_4MIN.AUD, OI_5MIN.AUD, OI_ABORT.AUD, OI_ATACK.AUD, OI_BDRDY.AUD, OI_BLOST.AUD, OI_BUILD.AUD, OI_CANCL.AUD, OI_CAPT.AUD, O_ICONF1.AUD, O_ICONF2.AUD, O_ICONF3.AUD, OI_DHRDY.AUD, OI_DPLOY.AUD, OI_ENEMY.AUD, OI_GANEW.AUD, OI_GLOAD.AUD, OI_GSAVE.AUD, OI_GUARD.AUD, OI_HATTK.AUD, OI_HOLD.AUD, OI_LAUNC.AUD, OI_MAP1A.AUD, OI_MAP1B.AUD, OI_MAP1C.AUD, OI_MAP2A.AUD, OI_MAP2B.AUD, OI_MAP2C.AUD, OI_MAP3A.AUD, OI_MAP4A.AUD, OI_MAP5A.AUD, OI_MAP6A.AUD, OI_MAP7A.AUD, OI_MAP8A.AUD, OI_MAP9A.AUD, OI_MEND.AUD, OI_MFAIL.AUD, OI_MONEY.AUD, OI_MWIN.AUD, OI_NEWOP.AUD, OI_NROOM.AUD, OI_ORDER.AUD, OI_PLACE.AUD, OI_POWER.AUD, OI_PREP.AUD, OI_PRMRY.AUD, OI_REINF.AUD, OI_RUN.AUD, O_ISEL1.AUD, O_ISEL2.AUD, O_ISEL3.AUD, OI_SELL.AUD, OI_SILOS.AUD, OI_SPORT.AUD, OI_TRAIN.AUD, OI_ULOST.AUD, OI_UNRDY.AUD, OI_UPGOP.AUD, OI_UPGRD.AUD, OI_WATTK.AUD, OI_WSIGN.AUD, O_SCONF1.AUD, O_SCONF2.AUD, O_SCONF3.AUD, O_SSEL1.AUD, O_SSEL2.AUD, O_SSEL3.AUD, O_VCONF1.AUD, O_VCONF2.AUD, O_VCONF3.AUD, O_VSEL1.AUD, O_VSEL2.AUD, O_VSEL3.AUD CopyFilesFromCD: music/ambush.aud, music/arakatak.aud, music/atregain.aud, music/entordos.aud, music/fightpwr.aud, music/fremen.aud, music/hark_bat.aud, music/landsand.aud, music/options.aud, music/plotting.aud, music/risehark.aud, music/robotix.aud, music/score.aud, music/soldappr.aud, music/spicesct.aud, music/undercon.aud, music/waitgame.aud ShippedSoundtracks: 1 - MusicPackageMirrorList: ServerTraits: LobbyCommands diff --git a/mods/modchooser/mod.yaml b/mods/modchooser/mod.yaml index 533e8519fa..d2db930390 100644 --- a/mods/modchooser/mod.yaml +++ b/mods/modchooser/mod.yaml @@ -49,5 +49,4 @@ Fonts: Font:FreeSansBold.ttf Size:10 -LobbyDefaults: -ContentInstaller: +LobbyDefaults: \ No newline at end of file diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 742fa138a9..e53dffccb6 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -161,11 +161,8 @@ ContentInstaller: TestFiles: cache.mix, conquer.mix, isosnow.mix, isotemp.mix, local.mix, sidec01.mix, sidec02.mix, sno.mix, snow.mix, sounds.mix, speech01.mix, tem.mix, temperat.mix PackageMirrorList: http://www.openra.net/packages/ts-mirrors.txt DiskTestFiles: multi.mix, install/tibsun.mix - PackageToExtractFromCD: - ExtractFilesFromCD: CopyFilesFromCD: install/tibsun.mix, scores.mix, multi.mix ShippedSoundtracks: 2 - MusicPackageMirrorList: ServerTraits: LobbyCommands