Skip to content

Make it possible to use DeserializerManager in other plugins. #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Skunkynator wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make it possible to use DeserializerManager in other plugins. #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91dfeb1
Fix errors when for some reason there is something other then a Beatm…
Mar 8, 2025
274397e
Modify DeserializerManager to be public
Mar 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions Heck/Services/Deserialize/DeserializerManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,19 @@
namespace Heck.Deserialize;

[UsedImplicitly]
internal class DeserializerManager
public class DeserializerManager
{
private readonly HashSet<DataDeserializer> _customDataDeserializers = [];
private readonly SiraLog _log;
private TrackBuilder _trackManager = new();
private Dictionary<string, List<object>> _pointDefinitions = new();

private DeserializerManager(SiraLog log)
{
_log = log;
}

internal void DeserializeBeatmapData(
public void DeserializeBeatmapData(
#if !PRE_V1_37_1
BeatmapLevel beatmapLevel,
#else
Expand All @@ -32,7 +34,8 @@ internal void DeserializeBeatmapData(
IReadonlyBeatmapData untransformedBeatmapData,
bool leftHanded,
out Dictionary<string, Track> beatmapTracks,
out HashSet<(object? Id, DeserializedData DeserializedData)> deserializedDatas)
out HashSet<(object? Id, DeserializedData DeserializedData)> deserializedDatas,
bool reusable = false)
{
_log.Trace("Deserializing BeatmapData");

Expand All @@ -44,7 +47,11 @@ internal void DeserializeBeatmapData(
}

// tracks are built based off the untransformed beatmapdata so modifiers like "no walls" do not prevent track creation
TrackBuilder trackManager = new();
if (!reusable)
{
_trackManager = new();
}

foreach (BeatmapObjectData beatmapObjectData in
((CustomBeatmapData)untransformedBeatmapData).beatmapObjectDatas)
{
Expand All @@ -69,12 +76,15 @@ internal void DeserializeBeatmapData(

foreach (string trackName in trackNames)
{
trackManager.AddTrack(trackName);
_trackManager.AddTrack(trackName);
}
}

// Point definitions
Dictionary<string, List<object>> pointDefinitions = new();
if (!reusable)
{
_pointDefinitions = new();
}

if (v2)
{
Expand Down Expand Up @@ -139,7 +149,7 @@ internal void DeserializeBeatmapData(
////customBeatmapData.customData["eventDefinitions"] = eventDefinitions;

// Currently used by Chroma.GameObjectTrackController
beatmapTracks = trackManager.Tracks;
beatmapTracks = _trackManager.Tracks;

#if !PRE_V1_37_1
float bpm = beatmapLevel.beatsPerMinute;
Expand All @@ -150,9 +160,9 @@ internal void DeserializeBeatmapData(
object[] inputs =
[
customBeatmapData,
trackManager,
pointDefinitions, // TODO: use a readonly implementation
trackManager.Tracks,
_trackManager,
_pointDefinitions, // TODO: use a readonly implementation
_trackManager.Tracks,
leftHanded,
bpm
];
Expand All @@ -176,9 +186,9 @@ internal void DeserializeBeatmapData(

void AddPoint(string pointDataName, List<object> pointData)
{
if (!pointDefinitions.ContainsKey(pointDataName))
if (!_pointDefinitions.ContainsKey(pointDataName))
{
pointDefinitions.Add(pointDataName, pointData);
_pointDefinitions.Add(pointDataName, pointData);
}
else
{
Expand Down
6 changes: 5 additions & 1 deletion NoodleExtensions/Managers/NoodleObjectsCallbacksManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,11 @@ internal void ManualUpdate(float songTime)
linkedListNode != null;
linkedListNode = linkedListNode.Next)
{
BeatmapObjectData value2 = (BeatmapObjectData)linkedListNode.Value;
if (linkedListNode.Value is not BeatmapObjectData value2)
{
continue;
}

if (!_deserializedData.Resolve(value2, out NoodleObjectData? noodleData))
{
throw new InvalidOperationException(
Expand Down