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

remove palette+ support

Browse Source
This commit is contained in:
rootdarkarchon
2024-02-09 13:15:45 +01:00
committed by Loporrit
parent 9c51d6fbdd
commit a15348b293
9 changed files with 2 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MareSynchronos/PlayerData/Data/PlayerChanges.cs
View File

@@ -7,7 +7,6 @@ public enum PlayerChanges
Glamourer = 3,
Customize = 4,
Heels = 5,
Palette = 6,
Honorific = 7,
ForcedRedraw = 8,
}

9
MareSynchronos/PlayerData/Export/MareCharaFileManager.cs
View File

@@ -49,7 +49,6 @@ public class MareCharaFileManager : DisposableMediatorSubscriberBase
if ((await dalamudUtil.RunOnFrameworkThread(() => item.Value.CurrentAddress()).ConfigureAwait(false)) != nint.Zero)
{
await _ipcManager.GlamourerRevert(logger, item.Value.Name, item.Value, Guid.NewGuid(), cts.Token).ConfigureAwait(false);
await _ipcManager.PalettePlusRemovePaletteAsync(item.Value.Address).ConfigureAwait(false);
}
else
{
@@ -117,14 +116,6 @@ public class MareCharaFileManager : DisposableMediatorSubscriberBase
{
await _ipcManager.CustomizePlusRevertAsync(tempHandler.Address).ConfigureAwait(false);
}
if (!string.IsNullOrEmpty(LoadedCharaFile.CharaFileData.PalettePlusData))
{
await _ipcManager.PalettePlusSetPaletteAsync(tempHandler.Address, LoadedCharaFile.CharaFileData.PalettePlusData).ConfigureAwait(false);
}
else
{
await _ipcManager.PalettePlusRemovePaletteAsync(tempHandler.Address).ConfigureAwait(false);
}
}
}
catch (Exception ex)

5
MareSynchronos/PlayerData/Factories/PlayerDataFactory.cs
View File

@@ -197,7 +197,6 @@ public class PlayerDataFactory
Task<string> getHeelsOffset = _ipcManager.GetHeelsOffsetAsync();
Task<string> getGlamourerData = _ipcManager.GlamourerGetCharacterCustomizationAsync(playerRelatedObject.Address);
Task<string?> getCustomizeData = _ipcManager.GetCustomizePlusScaleAsync(playerRelatedObject.Address);
Task<string> getPalettePlusData = _ipcManager.PalettePlusBuildPaletteAsync();
previousData.GlamourerString[playerRelatedObject.ObjectKind] = await getGlamourerData.ConfigureAwait(false);
_logger.LogDebug("Glamourer is now: {data}", previousData.GlamourerString[playerRelatedObject.ObjectKind]);
var customizeScale = await getCustomizeData.ConfigureAwait(false);
@@ -206,8 +205,8 @@ public class PlayerDataFactory
previousData.CustomizePlusScale[playerRelatedObject.ObjectKind] = customizeScale;
_logger.LogDebug("Customize is now: {data}", previousData.CustomizePlusScale[playerRelatedObject.ObjectKind]);
}
previousData.PalettePlusPalette = await getPalettePlusData.ConfigureAwait(false);
_logger.LogDebug("Palette is now: {data}", previousData.PalettePlusPalette);
// todo: remove once heaving api
previousData.PalettePlusPalette = string.Empty;
previousData.HonorificData = _ipcManager.HonorificGetTitle();
_logger.LogDebug("Honorific is now: {data}", previousData.HonorificData);
previousData.HeelsData = await getHeelsOffset.ConfigureAwait(false);

7
MareSynchronos/PlayerData/Handlers/PairHandler.cs
View File

@@ -288,10 +288,6 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
Logger.LogDebug("[{applicationId}] Processing {change} for {handler}", applicationId, change, handler);
switch (change)
{
case PlayerChanges.Palette:
await _ipcManager.PalettePlusSetPaletteAsync(handler.Address, charaData.PalettePlusData).ConfigureAwait(false);
break;
case PlayerChanges.Customize:
if (charaData.CustomizePlusData.TryGetValue(changes.Key, out var customizePlusData))
{
@@ -533,9 +529,6 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
Logger.LogDebug("[{applicationId}] Restoring C+ for {alias}/{name}", applicationId, OnlineUser.User.AliasOrUID, name);
await _ipcManager.CustomizePlusRevertAsync(address).ConfigureAwait(false);
tempHandler.CompareNameAndThrow(name);
Logger.LogDebug("[{applicationId}] Restoring Palette+ for {alias}/{name}", applicationId, OnlineUser.User.AliasOrUID, name);
await _ipcManager.PalettePlusRemovePaletteAsync(address).ConfigureAwait(false);
tempHandler.CompareNameAndThrow(name);
Logger.LogDebug("[{applicationId}] Restoring Honorific for {alias}/{name}", applicationId, OnlineUser.User.AliasOrUID, name);
await _ipcManager.HonorificClearTitleAsync(address).ConfigureAwait(false);
}

25
MareSynchronos/PlayerData/Services/CacheCreationService.cs
View File

@@ -21,7 +21,6 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
private Task? _cacheCreationTask;
private CancellationTokenSource _honorificCts = new();
private bool _isZoning = false;
private CancellationTokenSource _palettePlusCts = new();
private readonly Dictionary<ObjectKind, CancellationTokenSource> _glamourerCts = new();
public CacheCreationService(ILogger<CacheCreationService> logger, MareMediator mediator, GameObjectHandlerFactory gameObjectHandlerFactory,
@@ -100,15 +99,6 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
GlamourerChanged(changedType.Key);
}
});
Mediator.Subscribe<PalettePlusMessage>(this, (msg) =>
{
if (_isZoning) return;
if (msg.Character.Address == _playerRelatedObjects[ObjectKind.Player].Address)
{
Logger.LogDebug("Received PalettePlus change, updating player");
PalettePlusChanged();
}
});
Mediator.Subscribe<HonorificMessage>(this, (msg) =>
{
if (_isZoning) return;
@@ -172,21 +162,6 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
await AddPlayerCacheToCreate().ConfigureAwait(false);
}, token);
}
private void PalettePlusChanged()
{
_palettePlusCts?.Cancel();
_palettePlusCts?.Dispose();
_palettePlusCts = new();
var token = _palettePlusCts.Token;
_ = Task.Run(async () =>
{
await Task.Delay(TimeSpan.FromSeconds(1), token).ConfigureAwait(false);
await AddPlayerCacheToCreate().ConfigureAwait(false);
}, token);
}
private void ProcessCacheCreation()
{
if (_isZoning) return;