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

major refactoring, maybe some bugfixes, idk

Browse Source
This commit is contained in:
Stanley Dimant
2022-06-24 00:47:47 +02:00
parent 0fe3f1cf25
commit 2dcd02d170
22 changed files with 997 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
MareSynchronos/Factories/CharacterCacheFactory.cs → MareSynchronos/Factories/CharacterDataFactory.cs
View File

@@ -1,29 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using Dalamud.Game.ClientState;
using Dalamud.Logging;
using FFXIVClientStructs.FFXIV.Client.Game.Character;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using FFXIVClientStructs.FFXIV.Client.System.Resource;
using MareSynchronos.Managers;
using MareSynchronos.Models;
using MareSynchronos.Utils;
using Penumbra.GameData.ByteString;
using Penumbra.Interop.Structs;
namespace MareSynchronos.Factories
{
public class CharacterCacheFactory
public class CharacterDataFactory
{
private readonly ClientState _clientState;
private readonly IpcManager _ipcManager;
private readonly FileReplacementFactory _factory;
public CharacterCacheFactory(ClientState clientState, IpcManager ipcManager, FileReplacementFactory factory)
public CharacterDataFactory(ClientState clientState, IpcManager ipcManager, FileReplacementFactory factory)
{
Logger.Debug("Creating " + nameof(CharacterDataFactory));
_clientState = clientState;
_ipcManager = ipcManager;
_factory = factory;
@@ -34,13 +32,14 @@ namespace MareSynchronos.Factories
return _clientState.LocalPlayer!.Name.ToString();
}
public unsafe CharacterCache BuildCharacterCache()
public unsafe CharacterData BuildCharacterData()
{
var cache = new CharacterCache();
Stopwatch st = Stopwatch.StartNew();
var cache = new CharacterData();
while (_clientState.LocalPlayer == null)
{
PluginLog.Debug("Character is null but it shouldn't be, waiting");
Logger.Debug("Character is null but it shouldn't be, waiting");
Thread.Sleep(50);
}
var model = (CharacterBase*)((Character*)_clientState.LocalPlayer!.Address)->GameObject.GetDrawObject();
@@ -100,6 +99,13 @@ namespace MareSynchronos.Factories
}
}
cache.GlamourerString = _ipcManager.GlamourerGetCharacterCustomization()!;
cache.ManipulationString = _ipcManager.PenumbraGetMetaManipulations(_clientState.LocalPlayer!.Name.ToString());
cache.JobId = _clientState.LocalPlayer!.ClassJob.Id;
st.Stop();
Logger.Debug("Building Character Data took " + st.Elapsed);
return cache;
}
}

2
MareSynchronos/Factories/FileCacheFactory.cs
View File

@@ -9,7 +9,7 @@ namespace MareSynchronos.Factories
public FileCache Create(string file)
{
FileInfo fileInfo = new(file);
string sha1Hash = Crypto.GetFileHash(fileInfo.FullName);
var sha1Hash = Crypto.GetFileHash(fileInfo.FullName);
return new FileCache()
{
Filepath = fileInfo.FullName,

14
MareSynchronos/Factories/FileReplacementFactory.cs
View File

@@ -1,26 +1,28 @@
using Dalamud.Game.ClientState;
using MareSynchronos.Managers;
using MareSynchronos.Managers;
using MareSynchronos.Models;
using MareSynchronos.Utils;
namespace MareSynchronos.Factories
{
public class FileReplacementFactory
{
private readonly IpcManager ipcManager;
private readonly IpcManager _ipcManager;
public FileReplacementFactory(IpcManager ipcManager)
{
this.ipcManager = ipcManager;
Logger.Debug("Creating " + nameof(FileReplacementFactory));
this._ipcManager = ipcManager;
}
public FileReplacement Create()
{
if (!ipcManager.CheckPenumbraApi())
if (!_ipcManager.CheckPenumbraApi())
{
throw new System.Exception();
}
return new FileReplacement(ipcManager.PenumbraModDirectory()!);
return new FileReplacement(_ipcManager.PenumbraModDirectory()!);
}
}
}