t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove DrawHooks, use new penumbra IPC calls (otter pls)

Browse Source
This commit is contained in:
Stanley Dimant
2022-06-17 01:08:36 +02:00
parent f643b413f2
commit 176eb2a344
7 changed files with 230 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MareSynchronos/Models/CharacterCache.cs
View File

@@ -13,10 +13,10 @@ namespace MareSynchronos.Models
{
[JsonProperty]
public List<FileReplacement> AllReplacements =>
FileReplacements.Where(x => x.HasFileReplacement)
.Concat(FileReplacements.SelectMany(f => f.Associated).Where(f => f.HasFileReplacement))
.Concat(FileReplacements.SelectMany(f => f.Associated).SelectMany(f => f.Associated).Where(f => f.HasFileReplacement))
.Distinct().OrderBy(f => f.GamePath)
FileReplacements.Where(f => f.HasFileReplacement)
.Concat(FileReplacements.SelectMany(f => f.Associated)).Where(f => f.HasFileReplacement)
.Concat(FileReplacements.SelectMany(f => f.Associated).SelectMany(f => f.Associated)).Where(f => f.HasFileReplacement)
.Distinct().OrderBy(f => f.GamePaths[0])
.ToList();
public List<FileReplacement> FileReplacements { get; set; } = new List<FileReplacement>();
@@ -31,11 +31,10 @@ namespace MareSynchronos.Models
[JsonProperty]
public uint JobId { get; set; } = 0;
public void AddAssociatedResource(FileReplacement resource, FileReplacement mdlParent, FileReplacement mtrlParent)
public void AddAssociatedResource(FileReplacement resource, FileReplacement? mdlParent, FileReplacement? mtrlParent)
{
try
{
if (resource == null) return;
if (mdlParent == null)
{
resource.IsInUse = true;
@@ -43,16 +42,16 @@ namespace MareSynchronos.Models
return;
}
FileReplacement replacement;
if (mtrlParent == null && (replacement = FileReplacements.SingleOrDefault(f => f == mdlParent)!) != null)
var mdlReplacements = FileReplacements.Where(f => f == mdlParent && mtrlParent == null);
foreach (var mdlReplacement in mdlReplacements)
{
replacement.AddAssociated(resource);
mdlReplacement.AddAssociated(resource);
}
if ((replacement = FileReplacements.SingleOrDefault(f => f == mdlParent)?.Associated.SingleOrDefault(f => f == mtrlParent)!) != null)
var mtrlReplacements = FileReplacements.Where(f => f == mdlParent).SelectMany(a => a.Associated).Where(f => f == mtrlParent);
foreach (var mtrlReplacement in mtrlReplacements)
{
replacement.AddAssociated(resource);
mtrlReplacement.AddAssociated(resource);
}
}
catch (Exception ex)
@@ -89,7 +88,7 @@ namespace MareSynchronos.Models
public override string ToString()
{
StringBuilder stringBuilder = new();
foreach (var fileReplacement in FileReplacements.OrderBy(a => a.GamePath))
foreach (var fileReplacement in FileReplacements.OrderBy(a => a.GamePaths[0]))
{
stringBuilder.AppendLine(fileReplacement.ToString());
}