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

I hate merges

Browse Source
This commit is contained in:
rootdarkarchon
2023-02-19 23:37:25 +01:00
parent d99a6f8294
commit 62d4347196
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MareSynchronos/Factories/CharacterDataFactory.cs
View File

@@ -151,9 +151,12 @@ public class CharacterDataFactory : MediatorSubscriberBase
Task<string> getPalettePlusData = new(() => _ipcManager.PalettePlusBuildPalette()); Task<string> getPalettePlusData = new(() => _ipcManager.PalettePlusBuildPalette());
_processingQueue.Enqueue(getPalettePlusData); _processingQueue.Enqueue(getPalettePlusData);
Task.WaitAll(new[] { getGlamourerData, getCustomizeData, getPalettePlusData }, token); Task.WaitAll(new[] { getGlamourerData, getCustomizeData, getPalettePlusData }, token);
previousData.GlamourerString[playerRelatedObject.ObjectKind] = getGlamourerData.Result; previousData.GlamourerString[playerRelatedObject.ObjectKind] = await getGlamourerData.ConfigureAwait(true);
previousData.CustomizePlusScale = getCustomizeData.Result; previousData.CustomizePlusScale = await getCustomizeData.ConfigureAwait(true);
previousData.PalettePlusPalette = getPalettePlusData.Result; previousData.PalettePlusPalette = await getPalettePlusData.ConfigureAwait(true);
_logger.LogDebug("Glamourer is now: {data}", previousData.GlamourerString[playerRelatedObject.ObjectKind]);
_logger.LogDebug("Customize is now: {data}", previousData.CustomizePlusScale);
_logger.LogDebug("Palette is now: {data}", previousData.PalettePlusPalette);
// gather static replacements from render model // gather static replacements from render model
var (forwardResolve, reverseResolve) = BuildDataFromModel(objectKind, charaPointer, token); var (forwardResolve, reverseResolve) = BuildDataFromModel(objectKind, charaPointer, token);

9
MareSynchronos/Managers/CachedPlayer.cs
View File

@@ -55,7 +55,7 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
if (string.Equals(characterData.DataHash.Value, _cachedData.DataHash.Value, StringComparison.Ordinal) && !forced) return; if (string.Equals(characterData.DataHash.Value, _cachedData.DataHash.Value, StringComparison.Ordinal) && !forced) return;
CheckUpdatedData(_cachedData, characterData, forced, out var charaDataToUpdate); CheckUpdatedData(_cachedData.DeepClone(), characterData, forced, out var charaDataToUpdate);
NotifyForMissingPlugins(characterData, warning); NotifyForMissingPlugins(characterData, warning);
@@ -121,7 +121,6 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
{ {
_logger.LogDebug("Updating {object}/{kind} (Diff manip data) => {change}", this, objectKind, PlayerChanges.Mods); _logger.LogDebug("Updating {object}/{kind} (Diff manip data) => {change}", this, objectKind, PlayerChanges.Mods);
charaDataToUpdate[objectKind].Add(PlayerChanges.Mods); charaDataToUpdate[objectKind].Add(PlayerChanges.Mods);
continue;
} }
bool heelsOffsetDifferent = oldData.HeelsOffset != newData.HeelsOffset; bool heelsOffsetDifferent = oldData.HeelsOffset != newData.HeelsOffset;
@@ -129,7 +128,6 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
{ {
_logger.LogDebug("Updating {object}/{kind} (Diff heels data) => {change}", this, objectKind, PlayerChanges.Heels); _logger.LogDebug("Updating {object}/{kind} (Diff heels data) => {change}", this, objectKind, PlayerChanges.Heels);
charaDataToUpdate[objectKind].Add(PlayerChanges.Heels); charaDataToUpdate[objectKind].Add(PlayerChanges.Heels);
continue;
} }
bool customizeDataDifferent = !string.Equals(oldData.CustomizePlusData, newData.CustomizePlusData, StringComparison.Ordinal); bool customizeDataDifferent = !string.Equals(oldData.CustomizePlusData, newData.CustomizePlusData, StringComparison.Ordinal);
@@ -137,7 +135,6 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
{ {
_logger.LogDebug("Updating {object}/{kind} (Diff customize data) => {change}", this, objectKind, PlayerChanges.Customize); _logger.LogDebug("Updating {object}/{kind} (Diff customize data) => {change}", this, objectKind, PlayerChanges.Customize);
charaDataToUpdate[objectKind].Add(PlayerChanges.Customize); charaDataToUpdate[objectKind].Add(PlayerChanges.Customize);
continue;
} }
bool palettePlusDataDifferent = !string.Equals(oldData.PalettePlusData, newData.PalettePlusData, StringComparison.Ordinal); bool palettePlusDataDifferent = !string.Equals(oldData.PalettePlusData, newData.PalettePlusData, StringComparison.Ordinal);
@@ -145,7 +142,6 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
{ {
_logger.LogDebug("Updating {object}/{kind} (Diff palette data) => {change}", this, objectKind, PlayerChanges.Palette); _logger.LogDebug("Updating {object}/{kind} (Diff palette data) => {change}", this, objectKind, PlayerChanges.Palette);
charaDataToUpdate[objectKind].Add(PlayerChanges.Palette); charaDataToUpdate[objectKind].Add(PlayerChanges.Palette);
continue;
} }
} }
} }
@@ -153,7 +149,7 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
foreach (var data in charaDataToUpdate.ToList()) foreach (var data in charaDataToUpdate.ToList())
{ {
if (!data.Value.Any()) charaDataToUpdate.Remove(data.Key); if (!data.Value.Any()) charaDataToUpdate.Remove(data.Key);
else charaDataToUpdate[data.Key] = data.Value.OrderBy(p => (int)p).ToHashSet(); else charaDataToUpdate[data.Key] = data.Value.OrderByDescending(p => (int)p).ToHashSet();
} }
} }
@@ -331,7 +327,6 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
} }
break; break;
} }
break;
} }
if (handler != _currentOtherChara) handler.Dispose(); if (handler != _currentOtherChara) handler.Dispose();

2
MareSynchronos/MareSynchronos.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Authors></Authors> <Authors></Authors>
<Company></Company> <Company></Company>
<Version>0.7.34</Version> <Version>0.7.35</Version>
<Description></Description> <Description></Description>
<Copyright></Copyright> <Copyright></Copyright>
<PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl> <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>