Move the AssetBrowserFileEndingsFilter to IGlobalModData

to avoid mods having to duplicate the whole chrome layout.
This commit is contained in:
Matthias Mailänder
2020-01-01 12:22:09 +01:00
committed by abcdefg30
parent adb3c8e39c
commit 0e93d85273
8 changed files with 33 additions and 6 deletions

View File

@@ -0,0 +1,19 @@
#region Copyright & License Information
/*
* Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you 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. For more
* information, see COPYING.
*/
#endregion
namespace OpenRA
{
public class AssetBrowser : IGlobalModData
{
[FieldLoader.Require]
public readonly string[] SupportedExtensions = new string[0];
}
}

View File

@@ -214,10 +214,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
prevButton.IsVisible = () => !isVideoLoaded;
}
if (logicArgs.ContainsKey("SupportedFormats"))
allowedExtensions = FieldLoader.GetValue<string[]>("SupportedFormats", logicArgs["SupportedFormats"].Value);
else
allowedExtensions = new string[0];
var assetBrowserModData = modData.Manifest.Get<AssetBrowser>();
allowedExtensions = assetBrowserModData.SupportedExtensions;
acceptablePackages = modData.ModFiles.MountedPackages.Where(p =>
p.Contents.Any(c => allowedExtensions.Contains(Path.GetExtension(c).ToLowerInvariant())));

View File

@@ -1,6 +1,5 @@
Container@ASSETBROWSER_PANEL:
Logic: AssetBrowserLogic
SupportedFormats: .shp, .tem, .des, .sno, .jun, .vqa
X: (WINDOW_RIGHT - WIDTH) / 2
Y: (WINDOW_BOTTOM - HEIGHT) / 2
Width: 695

View File

@@ -222,6 +222,9 @@ SpriteSequenceFormat: TilesetSpecificSpriteSequence
ModelSequenceFormat: PlaceholderModelSequence
AssetBrowser:
SupportedExtensions: .shp, .tem, .des, .sno, .jun, .vqa
GameSpeeds:
slowest:
Name: Slowest

View File

@@ -1,6 +1,5 @@
Background@ASSETBROWSER_PANEL:
Logic: AssetBrowserLogic
SupportedFormats: .shp, .r8, .tmp, .tem, .des, .sno, .int, .vqa
X: (WINDOW_RIGHT - WIDTH) / 2
Y: (WINDOW_BOTTOM - HEIGHT) / 2
Width: 700

View File

@@ -198,6 +198,9 @@ SpriteSequenceFormat: DefaultSpriteSequence
ModelSequenceFormat: PlaceholderModelSequence
AssetBrowser:
SupportedExtensions: .shp, .r8, .vqa
GameSpeeds:
slowest:
Name: Slowest

View File

@@ -223,6 +223,9 @@ SpriteSequenceFormat: TilesetSpecificSpriteSequence
ModelSequenceFormat: PlaceholderModelSequence
AssetBrowser:
SupportedExtensions: .shp, .tmp, .tem, .des, .sno, .int, .vqa
GameSpeeds:
slowest:
Name: Slowest

View File

@@ -259,6 +259,9 @@ SpriteSequenceFormat: TilesetSpecificSpriteSequence
ModelSequenceFormat: VoxelModelSequence
AssetBrowser:
SupportedExtensions: .shp, .tem, .sno, .vqa
GameSpeeds:
slowest:
Name: Slowest