LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-07-15 15:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Core - Rename 'UnknownDLCPackage' to 'RawAssetDLCPackage'

Browse Source
This commit is contained in:
miku-666
2025-12-06 06:01:41 +01:00
parent dcc72a8397
commit dd57d715f9
9 changed files with 114 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
PckStudio.Core/DLC/DLCManager.cs
View File

@@ -113,14 +113,14 @@ namespace PckStudio.Core.DLC
if (!pckFile.TryGetAsset("0", PckAssetType.InfoFile, out PckAsset zeroAsset))
{
Trace.TraceError("Could not find asset named:'0'.");
return new UnknownDLCPackage(fileInfo.Name, pckFile);
return new RawAssetDLCPackage(fileInfo.Name, pckFile, ByteOrder);
}
int identifier = (zeroAsset?.HasProperty("PACKID") ?? default) ? zeroAsset.GetProperty("PACKID", int.Parse) : -1;
int identifier = zeroAsset.HasProperty("PACKID") ? zeroAsset.GetProperty("PACKID", int.Parse) : -1;
if (identifier <= 0 || identifier > GameConstants.MAX_PACK_ID)
{
Trace.TraceError($"{nameof(identifier)}({identifier}) was out of range!");
return new UnknownDLCPackage(fileInfo.Name, pckFile);
return new RawAssetDLCPackage(fileInfo.Name, pckFile, ByteOrder);
}
if (_packageRegistry.ContainsPackage(identifier))
@@ -128,9 +128,12 @@ namespace PckStudio.Core.DLC
LOCFile localisation = pckFile.GetAssetsByType(PckAssetType.LocalisationFile).FirstOrDefault()?.GetData(new LOCFileReader());
if (localisation is null)
return new UnknownDLCPackage(fileInfo.Name, pckFile);
{
Trace.TraceError("No localisation asset found.");
return new RawAssetDLCPackage(fileInfo.Name, pckFile, ByteOrder);
}
IDLCPackage package = ScanForPackageType(fileInfo, identifier, pckFile, localisation, fileReader);
IDLCPackage package = LoadDLCPackage(fileInfo, identifier, pckFile, localisation, fileReader);
if (package.GetDLCPackageType() != DLCPackageType.Invalid)
{
_packageRegistry.RegisterPackage(identifier, package, localisation);
@@ -156,7 +159,7 @@ namespace PckStudio.Core.DLC
return true;
}
private IDLCPackage ScanForPackageType(FileInfo fileInfo, int identifier, PckFile pckFile, LOCFile localisation, PckFileReader fileReader)
private IDLCPackage LoadDLCPackage(FileInfo fileInfo, int identifier, PckFile pckFile, LOCFile localisation, PckFileReader fileReader)
{
bool hasLanguage = localisation?.Languages?.Contains(PreferredLanguage) ?? default;
@@ -170,7 +173,7 @@ namespace PckStudio.Core.DLC
bool couldBeMiniGamePack = fileInfo.Name == DEFAULT_MINIGAME_PACK_FILENAME;
bool hasSkins = TryGetDLCSkinPackage(name, identifier, pckFile, fileReader, out IDLCPackage skinPackage);
DLCPackageType dlcPackageType = hasSkins ? DLCPackageType.SkinPack : DLCPackageType.Unknown;
DLCPackageType dlcPackageType = hasSkins ? DLCPackageType.SkinPack : DLCPackageType.RawAssets;
DirectoryInfo dataDirectoryInfo = fileInfo.Directory.EnumerateDirectories().Where(dirInfo => dirInfo.Name == DATA_DIRECTORY_NAME).FirstOrDefault();
@@ -191,7 +194,7 @@ namespace PckStudio.Core.DLC
}
Debug.WriteLine(dlcPackageType);
return new UnknownDLCPackage(name, pckFile);
return new RawAssetDLCPackage(name, pckFile, ByteOrder);
}
private Dictionary<string, IDictionary<string, byte[]>> GetMapData(PckFile pck, DirectoryInfo dataDirectory)

4
PckStudio.Core/DLC/DLCPackageType.cs
View File

@@ -2,8 +2,8 @@
{
public enum DLCPackageType : int
{
Unknown = -1,
Invalid,
Invalid = -1,
RawAssets,
SkinPack,
TexturePack,
MashUpPack,

12
PckStudio.Core/DLC/UnknownDLCPackage.cs → PckStudio.Core/DLC/RawAssetDLCPackage.cs
View File

@@ -3,21 +3,23 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using OMI;
using OMI.Formats.Pck;
using PckStudio.Core.Interfaces;
namespace PckStudio.Core.DLC
{
public sealed class UnknownDLCPackage : DLCPackage
public sealed class RawAssetDLCPackage : DLCPackage
{
public PckFile PckFile { get; }
public ByteOrder ByteOrder { get; }
public UnknownDLCPackage(string name, PckFile pckFile)
: base(name ?? nameof(UnknownDLCPackage), -1, default)
public RawAssetDLCPackage(string name, PckFile pckFile, ByteOrder byteOrder)
: base(name ?? nameof(RawAssetDLCPackage), -1, default)
{
PckFile = pckFile;
ByteOrder = byteOrder;
}
public override DLCPackageType GetDLCPackageType() => DLCPackageType.Unknown;
public override DLCPackageType GetDLCPackageType() => DLCPackageType.RawAssets;
}
}