epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move classic-mod package loaders and support files to Mods.Cnc.

Browse Source
This commit is contained in:
Paul Chote
2017-05-24 21:12:12 +00:00
committed by abcdefg30
parent 28fdb71163
commit ba7290cc2c
16 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -107,11 +107,8 @@
<Compile Include="Activities\CallFunc.cs" /> <Compile Include="Activities\CallFunc.cs" />
<Compile Include="Actor.cs" /> <Compile Include="Actor.cs" />
<Compile Include="CacheStorage.cs" /> <Compile Include="CacheStorage.cs" />
<Compile Include="FileSystem\IdxEntry.cs" />
<Compile Include="FileSystem\IPackage.cs" /> <Compile Include="FileSystem\IPackage.cs" />
<Compile Include="LogProxy.cs" /> <Compile Include="LogProxy.cs" />
<Compile Include="FileFormats\IdxReader.cs" />
<Compile Include="FileSystem\BagFile.cs" />
<Compile Include="Map\MapGrid.cs" /> <Compile Include="Map\MapGrid.cs" />
<Compile Include="Map\MapPlayers.cs" /> <Compile Include="Map\MapPlayers.cs" />
<Compile Include="MPos.cs" /> <Compile Include="MPos.cs" />
@@ -263,10 +260,7 @@
<ItemGroup> <ItemGroup>
<Compile Include="FileSystem\Folder.cs" /> <Compile Include="FileSystem\Folder.cs" />
<Compile Include="FileSystem\InstallShieldPackage.cs" /> <Compile Include="FileSystem\InstallShieldPackage.cs" />
<Compile Include="FileSystem\MixFile.cs" />
<Compile Include="FileSystem\Pak.cs" />
<Compile Include="FileSystem\ZipFile.cs" /> <Compile Include="FileSystem\ZipFile.cs" />
<Compile Include="FileSystem\BigFile.cs" />
<Compile Include="Map\PlayerReference.cs" /> <Compile Include="Map\PlayerReference.cs" />
<Compile Include="Map\TileReference.cs" /> <Compile Include="Map\TileReference.cs" />
<Compile Include="Map\TileSet.cs" /> <Compile Include="Map\TileSet.cs" />
@@ -275,11 +269,6 @@
<Compile Include="Manifest.cs" /> <Compile Include="Manifest.cs" />
<Compile Include="Graphics\Vertex.cs" /> <Compile Include="Graphics\Vertex.cs" />
<Compile Include="FileFormats\Blast.cs" /> <Compile Include="FileFormats\Blast.cs" />
<Compile Include="FileFormats\Blowfish.cs" />
<Compile Include="FileFormats\BlowfishKeyProvider.cs" />
<Compile Include="FileFormats\CRC32.cs" />
<Compile Include="FileFormats\XccGlobalDatabase.cs" />
<Compile Include="FileFormats\XccLocalDatabase.cs" />
<Compile Include="FileFormats\HvaReader.cs" /> <Compile Include="FileFormats\HvaReader.cs" />
<Compile Include="FileFormats\PngLoader.cs" /> <Compile Include="FileFormats\PngLoader.cs" />
<Compile Include="FileFormats\VxlReader.cs" /> <Compile Include="FileFormats\VxlReader.cs" />
@@ -303,7 +292,6 @@
<Compile Include="Map\MapCache.cs" /> <Compile Include="Map\MapCache.cs" />
<Compile Include="Map\MapPreview.cs" /> <Compile Include="Map\MapPreview.cs" />
<Compile Include="Graphics\HSLColor.cs" /> <Compile Include="Graphics\HSLColor.cs" />
<Compile Include="FileSystem\PackageEntry.cs" />
<Compile Include="CPos.cs" /> <Compile Include="CPos.cs" />
<Compile Include="CVec.cs" /> <Compile Include="CVec.cs" />
<Compile Include="WAngle.cs" /> <Compile Include="WAngle.cs" />

2
OpenRA.Game/FileFormats/Blowfish.cs → OpenRA.Mods.Cnc/FileFormats/Blowfish.cs
View File

@@ -9,7 +9,7 @@
*/ */
#endregion #endregion
namespace OpenRA.FileFormats namespace OpenRA.Mods.Cnc.FileFormats
{ {
class Blowfish class Blowfish
{ {

2
OpenRA.Game/FileFormats/BlowfishKeyProvider.cs → OpenRA.Mods.Cnc/FileFormats/BlowfishKeyProvider.cs
View File

@@ -12,7 +12,7 @@
using System; using System;
using System.Linq; using System.Linq;
namespace OpenRA.FileFormats namespace OpenRA.Mods.Cnc.FileFormats
{ {
/* TODO: Convert this direct C port into readable code. */ /* TODO: Convert this direct C port into readable code. */

2
OpenRA.Game/FileFormats/CRC32.cs → OpenRA.Mods.Cnc/FileFormats/CRC32.cs
View File

@@ -9,7 +9,7 @@
*/ */
#endregion #endregion
namespace OpenRA.FileFormats namespace OpenRA.Mods.Cnc.FileFormats
{ {
/// <summary> /// <summary>
/// Static class that uses a lookup table to calculates CRC32 /// Static class that uses a lookup table to calculates CRC32

3
OpenRA.Game/FileSystem/IdxEntry.cs → OpenRA.Mods.Cnc/FileFormats/IdxEntry.cs
View File

@@ -9,10 +9,9 @@
*/ */
#endregion #endregion
using System.Collections.Generic;
using System.IO; using System.IO;
namespace OpenRA.FileSystem namespace OpenRA.Mods.Cnc.FileFormats
{ {
public class IdxEntry public class IdxEntry
{ {

3
OpenRA.Game/FileFormats/IdxReader.cs → OpenRA.Mods.Cnc/FileFormats/IdxReader.cs
View File

@@ -11,9 +11,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using OpenRA.FileSystem;
namespace OpenRA.FileFormats namespace OpenRA.Mods.Cnc.FileFormats
{ {
public class IdxReader public class IdxReader
{ {

2
OpenRA.Game/FileFormats/XccGlobalDatabase.cs → OpenRA.Mods.Cnc/FileFormats/XccGlobalDatabase.cs
View File

@@ -13,7 +13,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace OpenRA.FileFormats namespace OpenRA.Mods.Cnc.FileFormats
{ {
public class XccGlobalDatabase : IDisposable public class XccGlobalDatabase : IDisposable
{ {

2
OpenRA.Game/FileFormats/XccLocalDatabase.cs → OpenRA.Mods.Cnc/FileFormats/XccLocalDatabase.cs
View File

@@ -14,7 +14,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
namespace OpenRA.FileFormats namespace OpenRA.Mods.Cnc.FileFormats
{ {
public class XccLocalDatabase public class XccLocalDatabase
{ {

10
OpenRA.Game/FileSystem/BagFile.cs → OpenRA.Mods.Cnc/FileSystem/BagFile.cs
View File

@@ -13,10 +13,12 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;
using OpenRA.FileFormats; using OpenRA.FileSystem;
using OpenRA.Mods.Cnc.FileFormats;
using OpenRA.Primitives; using OpenRA.Primitives;
using FS = OpenRA.FileSystem.FileSystem;
namespace OpenRA.FileSystem namespace OpenRA.Mods.Cnc.FileSystem
{ {
public class AudioBagLoader : IPackageLoader public class AudioBagLoader : IPackageLoader
{ {
@@ -109,7 +111,7 @@ namespace OpenRA.FileSystem
return index.ContainsKey(filename); return index.ContainsKey(filename);
} }
public IReadOnlyPackage OpenPackage(string filename, FileSystem context) public IReadOnlyPackage OpenPackage(string filename, FS context)
{ {
// Not implemented // Not implemented
return null; return null;
@@ -121,7 +123,7 @@ namespace OpenRA.FileSystem
} }
} }
bool IPackageLoader.TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package) bool IPackageLoader.TryParsePackage(Stream s, string filename, FS context, out IReadOnlyPackage package)
{ {
if (!filename.EndsWith(".bag", StringComparison.InvariantCultureIgnoreCase)) if (!filename.EndsWith(".bag", StringComparison.InvariantCultureIgnoreCase))
{ {

8
OpenRA.Game/FileSystem/BigFile.cs → OpenRA.Mods.Cnc/FileSystem/BigFile.cs
View File

@@ -12,8 +12,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using OpenRA.FileSystem;
using FS = OpenRA.FileSystem.FileSystem;
namespace OpenRA.FileSystem namespace OpenRA.Mods.Cnc.FileSystem
{ {
public class BigLoader : IPackageLoader public class BigLoader : IPackageLoader
{ {
@@ -97,7 +99,7 @@ namespace OpenRA.FileSystem
return index.ContainsKey(filename); return index.ContainsKey(filename);
} }
public IReadOnlyPackage OpenPackage(string filename, FileSystem context) public IReadOnlyPackage OpenPackage(string filename, FS context)
{ {
// Not implemented // Not implemented
return null; return null;
@@ -109,7 +111,7 @@ namespace OpenRA.FileSystem
} }
} }
bool IPackageLoader.TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package) bool IPackageLoader.TryParsePackage(Stream s, string filename, FS context, out IReadOnlyPackage package)
{ {
// Take a peek at the file signature // Take a peek at the file signature
var signature = s.ReadASCII(4); var signature = s.ReadASCII(4);

9
OpenRA.Game/FileSystem/MixFile.cs → OpenRA.Mods.Cnc/FileSystem/MixFile.cs
View File

@@ -14,9 +14,12 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.FileSystem;
using OpenRA.Mods.Cnc.FileFormats;
using OpenRA.Primitives; using OpenRA.Primitives;
using FS = OpenRA.FileSystem.FileSystem;
namespace OpenRA.FileSystem namespace OpenRA.Mods.Cnc.FileSystem
{ {
public class MixLoader : IPackageLoader public class MixLoader : IPackageLoader
{ {
@@ -222,7 +225,7 @@ namespace OpenRA.FileSystem
return index.ContainsKey(filename); return index.ContainsKey(filename);
} }
public IReadOnlyPackage OpenPackage(string filename, FileSystem context) public IReadOnlyPackage OpenPackage(string filename, FS context)
{ {
IReadOnlyPackage package; IReadOnlyPackage package;
var childStream = GetStream(filename); var childStream = GetStream(filename);
@@ -242,7 +245,7 @@ namespace OpenRA.FileSystem
} }
} }
bool IPackageLoader.TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package) bool IPackageLoader.TryParsePackage(Stream s, string filename, FS context, out IReadOnlyPackage package)
{ {
if (!filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase)) if (!filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
{ {

4
OpenRA.Game/FileSystem/PackageEntry.cs → OpenRA.Mods.Cnc/FileSystem/PackageEntry.cs
View File

@@ -13,9 +13,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;
using OpenRA.FileFormats; using OpenRA.Mods.Cnc.FileFormats;
namespace OpenRA.FileSystem namespace OpenRA.Mods.Cnc.FileSystem
{ {
public enum PackageHashType { Classic, CRC32 } public enum PackageHashType { Classic, CRC32 }

8
OpenRA.Game/FileSystem/Pak.cs → OpenRA.Mods.Cnc/FileSystem/Pak.cs
View File

@@ -12,8 +12,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using OpenRA.FileSystem;
using FS = OpenRA.FileSystem.FileSystem;
namespace OpenRA.FileSystem namespace OpenRA.Mods.Cnc.FileSystem
{ {
public class PakFileLoader : IPackageLoader public class PakFileLoader : IPackageLoader
{ {
@@ -77,7 +79,7 @@ namespace OpenRA.FileSystem
return index.ContainsKey(filename); return index.ContainsKey(filename);
} }
public IReadOnlyPackage OpenPackage(string filename, FileSystem context) public IReadOnlyPackage OpenPackage(string filename, FS context)
{ {
// Not implemented // Not implemented
return null; return null;
@@ -89,7 +91,7 @@ namespace OpenRA.FileSystem
} }
} }
bool IPackageLoader.TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package) bool IPackageLoader.TryParsePackage(Stream s, string filename, FS context, out IReadOnlyPackage package)
{ {
if (!filename.EndsWith(".pak", StringComparison.InvariantCultureIgnoreCase)) if (!filename.EndsWith(".pak", StringComparison.InvariantCultureIgnoreCase))
{ {

13
OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
View File

@@ -134,6 +134,19 @@
<Compile Include="UtilityCommands\ImportRedAlertLegacyMapCommand.cs" /> <Compile Include="UtilityCommands\ImportRedAlertLegacyMapCommand.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForDecoration.cs" /> <Compile Include="Traits\Infiltration\InfiltrateForDecoration.cs" />
<Compile Include="TraitsInterfaces.cs" /> <Compile Include="TraitsInterfaces.cs" />
<Compile Include="FileSystem\BagFile.cs" />
<Compile Include="FileSystem\BigFile.cs" />
<Compile Include="FileSystem\MixFile.cs" />
<Compile Include="FileSystem\PackageEntry.cs" />
<Compile Include="FileSystem\Pak.cs" />
<Compile Include="UtilityCommands\ListMixContentsCommand.cs" />
<Compile Include="FileFormats\Blowfish.cs" />
<Compile Include="FileFormats\BlowfishKeyProvider.cs" />
<Compile Include="FileFormats\IdxEntry.cs" />
<Compile Include="FileFormats\IdxReader.cs" />
<Compile Include="FileFormats\XccGlobalDatabase.cs" />
<Compile Include="FileFormats\XccLocalDatabase.cs" />
<Compile Include="FileFormats\CRC32.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj"> <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">

6
OpenRA.Mods.Common/UtilityCommands/ListMixContentsCommand.cs → OpenRA.Mods.Cnc/UtilityCommands/ListMixContentsCommand.cs
View File

@@ -13,10 +13,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using OpenRA.FileFormats; using OpenRA.Mods.Cnc.FileFormats;
using OpenRA.FileSystem; using OpenRA.Mods.Cnc.FileSystem;
namespace OpenRA.Mods.Common.UtilityCommands namespace OpenRA.Mods.Cnc.UtilityCommands
{ {
class ListMixContents : IUtilityCommand class ListMixContents : IUtilityCommand
{ {

1
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -760,7 +760,6 @@
<Compile Include="Widgets\Logic\Installation\ModContentDiscTooltipLogic.cs" /> <Compile Include="Widgets\Logic\Installation\ModContentDiscTooltipLogic.cs" />
<Compile Include="Widgets\Logic\Installation\InstallFromDiscLogic.cs" /> <Compile Include="Widgets\Logic\Installation\InstallFromDiscLogic.cs" />
<Compile Include="Widgets\Logic\Installation\ModContentPromptLogic.cs" /> <Compile Include="Widgets\Logic\Installation\ModContentPromptLogic.cs" />
<Compile Include="UtilityCommands\ListMixContentsCommand.cs" />
<Compile Include="UtilityCommands\ListMSCabContentsCommand.cs" /> <Compile Include="UtilityCommands\ListMSCabContentsCommand.cs" />
<Compile Include="FileFormats\MSCabCompression.cs" /> <Compile Include="FileFormats\MSCabCompression.cs" />
<Compile Include="Traits\World\ScriptLobbyDropdown.cs" /> <Compile Include="Traits\World\ScriptLobbyDropdown.cs" />