Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions Library/Scripting/Engine/GroupStatus.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System.Diagnostics.CodeAnalysis;
using System.IO.Compression;
using System.Text;
using System.Text.Json;

namespace BlocklyNet.Scripting.Engine;

Expand Down
1 change: 0 additions & 1 deletion Library/Scripting/Engine/ScriptEngine.Input.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Text.Json;
using System.Text.Json.Nodes;
using BlocklyNet.Extensions.Builder;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
Expand Down
17 changes: 9 additions & 8 deletions Library/Scripting/ScriptCommon.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using BlocklyNet.Scripting.Engine;
using BlocklyNet.Scripting.Logging;
using System.Text.Json;

namespace BlocklyNet.Scripting;

Expand Down Expand Up @@ -104,18 +103,20 @@ private class CustomGroupInformation
/// </summary>
private readonly Stack<CustomGroupInformation> _ActiveGroups = [];

/// <summary>
/// Decode list of modifiers on this script.
/// </summary>
/// <param name="status">Some status information.</param>
/// <returns>List of modifiers.</returns>
protected IEnumerable<TModifierType> GetModifiers(GroupStatus status)
=> BlockyUtils.Decompress<CustomGroupInformation>(status.CustomizerBlob)?.Modifiers ?? Enumerable.Empty<TModifierType>();

/// <inheritdoc/>
public override async Task BeginGroupExecutionAsync(GroupStatus status, bool repeat)
{
if (repeat)
{
/* Reconstruct extra information. */
var info = BlockyUtils.Decompress<CustomGroupInformation>(status.CustomizerBlob)!;

/* Re-apply all side effects on the logging. */
foreach (var modifier in info.Modifiers)
foreach (var modifier in GetModifiers(status))
await modifier.ApplyAsync(this, false);
}
else
_ActiveGroups.Push(new() { ModifierIndex = _Modifiers.Count });
}
Expand Down