UI Refactor

.gitignore

@@ -397,4 +397,10 @@ FodyWeavers.xsd
 *.msp
 
 # JetBrains Rider
-*.sln.iml
+*.sln.iml
+
+# config file created by Avalonia by error sometimes
+config.json
+
+
+!MacroPad.Core/BasePlugin/**

ConsoleApp1/Program.cs

@@ -1,6 +1,7 @@
 
 using MacroPad.Core;
 using MacroPad.Core.Device;
+using MacroPad.Core.Plugin;
 using MacroPad.Shared.Plugin;
 using MacroPad.Shared.Plugin.Protocol;
 using System.Reflection;

MacroPad.Core/BasePlugin/BasePluginInfos.cs

@@ -5,21 +5,9 @@ namespace MacroPad.Core.BasePlugin
 {
     public class BasePluginInfos : IPluginInfos
     {
-        public string Name => "Base Plugin";
-
-        public string Description => "The usefulest plugin of MacroPad.";
-
-        public string Version => "1.0.0";
-
-        public string Author => "Piripe";
-
-        public string? AuthorUrl => null;
-
-        public string? SourceUrl => null;
-
         public IProtocol[] Protocols => [];
 
-        public INodeCategory[] NodeCategories => [new BranchingCategory(), new ConditionsCategory() ,new ConstantsCategory(), new DebugCategory(), new TextCategory()];
+        public INodeCategory[] NodeCategories => [new BranchingCategory(), new ButtonCategory(), new ConditionsCategory(), new ConstantsCategory(), new DebugCategory(), new MathCategory(), new ProfileCategory(), new TextCategory(), new VariableCategory()];
 
         public NodeType[] NodeTypes => [.. DefaultTypes.types];
         public ISettingsComponent[] Settings => [];

MacroPad.Core/BasePlugin/Branching/GetBranch.cs

@@ -18,9 +18,9 @@ public class GetBranch : INodeGetter
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
-            return new object[] { resource.GetValue((bool)resource.GetValue(0) ? 2 : 1) };
+            return [ resource.GetValue((bool)resource.GetValue(0) ? 2 : 1) ];
         }
     }
 }

MacroPad.Core/BasePlugin/Branching/RunBranch.cs

@@ -21,7 +21,7 @@ public class SetPaletteColor : INodeRunner
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public NodeRunnerResult Run(IResourceManager resource)
+        public NodeRunnerResult Run(INodeResourceManager resource)
         {
             return new NodeRunnerResult() { Results = [], RunnerOutputIndex = (bool)resource.GetValue(0) ? 1 : 0 };
         }

MacroPad.Core/BasePlugin/Button/GetCurrentValue.cs

@@ -18,7 +18,7 @@ public class GetCurrentValue : INodeGetter
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => button.Type == ButtonType.Slider;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [(decimal)(NodeManager.CurrentDevice != null && NodeManager.CurrentButton != null ? NodeManager.CurrentDevice.ButtonsCurrentValue[NodeManager.CurrentButton.Id].Value : 0)];
         }

MacroPad.Core/BasePlugin/Button/SetCurrentPaletteColor.cs

@@ -1,6 +1,7 @@
 using MacroPad.Shared.Device;
 using MacroPad.Shared.Plugin.Nodes;
 using MacroPad.Shared.Plugin.Components;
+using MacroPad.Shared.Plugin;
 
 namespace MacroPad.Core.BasePlugin.Button
 {
@@ -22,9 +23,9 @@ public class SetCurrentPaletteColor : INodeRunner
         public INodeComponent[] Components => [
             new ComboBox()
             {
-                GetItems = (IResourceManager resource, IDeviceLayoutButton button, IDeviceOutput output) =>
+                GetItems = (IResourceManager resource) =>
                 {
-                    return output.Palette.Select(x=>x.Name).ToArray();
+                    return resource.GetVirtual<IDeviceOutput>(VirtualDataKey.DeviceOutput)?.Palette.Select(x=>x.Name).ToArray() ?? [];
                 },
                 GetSelection = (IResourceManager resource) =>
                 {
@@ -38,7 +39,7 @@ public class SetCurrentPaletteColor : INodeRunner
         ];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => output.OutputType == OutputType.Palette;
-        public NodeRunnerResult Run(IResourceManager resource)
+        public NodeRunnerResult Run(INodeResourceManager resource)
         {
             if (NodeManager.CurrentButton != null) NodeManager.CurrentDevice?.SetButtonContent(NodeManager.CurrentButton, resource.GetData<int>("color"));
             return new NodeRunnerResult() { Results = [], RunnerOutputIndex = 0 };

MacroPad.Core/BasePlugin/Conditions/Condition.cs

@@ -1,6 +1,7 @@
 using MacroPad.Shared.Device;
 using MacroPad.Shared.Plugin.Nodes;
 using MacroPad.Shared.Plugin.Components;
+using MacroPad.Shared.Plugin;
 
 namespace MacroPad.Core.BasePlugin.Conditions
 {
@@ -41,7 +42,7 @@ public class Condition : INodeGetter
         private static decimal ObjectToDecimal(object x) => (decimal.TryParse(x.ToString(), out decimal val) ? val : 0m);
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [ _operations[resource.GetData<int>("o")](resource.GetValue(0), resource.GetValue(1)) ];
         }

MacroPad.Core/BasePlugin/Constants/Boolean.cs

@@ -1,6 +1,7 @@
 using MacroPad.Shared.Device;
 using MacroPad.Shared.Plugin.Nodes;
 using MacroPad.Shared.Plugin.Components;
+using MacroPad.Shared.Plugin;
 
 namespace MacroPad.Core.BasePlugin.Constants
 {
@@ -23,7 +24,7 @@ internal class Boolean : INodeGetter
         } ];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [resource.GetData<bool?>("v") ?? false];
         }

MacroPad.Core/BasePlugin/Constants/Number.cs

@@ -1,6 +1,7 @@
 using MacroPad.Shared.Device;
 using MacroPad.Shared.Plugin.Nodes;
 using MacroPad.Shared.Plugin.Components;
+using MacroPad.Shared.Plugin;
 
 namespace MacroPad.Core.BasePlugin.Constants
 {
@@ -24,9 +25,9 @@ internal class Number : INodeGetter
         } ];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
-            return new object[] { resource.GetData<decimal?>("v") ?? 0m };
+            return [ resource.GetData<decimal?>("v") ?? 0m ];
         }
     }
 }

MacroPad.Core/BasePlugin/Constants/Text.cs

@@ -1,6 +1,7 @@
 using MacroPad.Shared.Device;
 using MacroPad.Shared.Plugin.Nodes;
 using MacroPad.Shared.Plugin.Components;
+using MacroPad.Shared.Plugin;
 
 namespace MacroPad.Core.BasePlugin.Constants
 {
@@ -22,7 +23,7 @@ internal class Text : INodeGetter
         } ];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [resource.GetData<string>("v") ?? ""];
         }

MacroPad.Core/BasePlugin/Debug/WriteLine.cs

@@ -0,0 +1,30 @@
+using MacroPad.Shared.Device;
+using MacroPad.Shared.Plugin.Nodes;
+
+namespace MacroPad.Core.BasePlugin.Debug
+{
+    public class WriteLine : INodeRunner
+    {
+        public string Name => "Write Line";
+
+        public string Description => "Write a line in the console.";
+
+        public string Id => "WriteLine";
+
+        public TypeNamePair[] Inputs => [new(typeof(string), "Text")];
+
+        public TypeNamePair[] Outputs => [];
+
+        public int RunnerOutputCount => 1;
+        public string[] RunnerOutputsName => [];
+
+        public INodeComponent[] Components => [];
+
+        public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
+        public NodeRunnerResult Run(INodeResourceManager resource)
+        {
+            System.Diagnostics.Debug.WriteLine(resource.GetValue(0));
+            return new NodeRunnerResult() { Results = [], RunnerOutputIndex = 0 };
+        }
+    }
+}

MacroPad.Core/BasePlugin/DefaultTypes.cs

@@ -1,5 +1,4 @@
 using MacroPad.Shared.Plugin;
-using MacroPad.Shared.Plugin.Nodes;
 using MacroPad.Shared.Plugin.Components;
 
 namespace MacroPad.Core.BasePlugin

MacroPad.Core/BasePlugin/Math/Absolute.cs

@@ -18,7 +18,7 @@ public class Absolute : INodeGetter
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [System.Math.Abs((decimal)resource.GetValue(0))];
         }

MacroPad.Core/BasePlugin/Math/Floor.cs

@@ -18,7 +18,7 @@ public class Floor : INodeGetter
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [System.Math.Floor((decimal)resource.GetValue(0))];
         }

MacroPad.Core/BasePlugin/Math/Map.cs

@@ -18,7 +18,7 @@ public class Map : INodeGetter
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             decimal value = (decimal)resource.GetValue(0);
             decimal minIn = (decimal)resource.GetValue(1);

MacroPad.Core/BasePlugin/Math/Max.cs

@@ -18,7 +18,7 @@ public class Max : INodeGetter
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [System.Math.Max((decimal)resource.GetValue(0), (decimal)resource.GetValue(1))];
         }

MacroPad.Core/BasePlugin/Math/Min.cs

@@ -18,7 +18,7 @@ public class Min : INodeGetter
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [System.Math.Min((decimal)resource.GetValue(0), (decimal)resource.GetValue(1))];
         }

MacroPad.Core/BasePlugin/Math/MinMax.cs

@@ -18,7 +18,7 @@ public class MinMax : INodeGetter
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [System.Math.Min(System.Math.Max((decimal)resource.GetValue(0), (decimal)resource.GetValue(1)), (decimal)resource.GetValue(2))];
         }

MacroPad.Core/BasePlugin/Math/Operation.cs

@@ -1,6 +1,7 @@
 using MacroPad.Shared.Device;
 using MacroPad.Shared.Plugin.Nodes;
 using MacroPad.Shared.Plugin.Components;
+using MacroPad.Shared.Plugin;
 
 namespace MacroPad.Core.BasePlugin.Math
 {
@@ -41,7 +42,7 @@ public class Operation : INodeGetter
         ];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [_operations[resource.GetData<int>("o")]((decimal)resource.GetValue(0), (decimal)resource.GetValue(1))];
         }

MacroPad.Core/BasePlugin/Math/Round.cs

@@ -18,7 +18,7 @@ public class Round : INodeGetter
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [System.Math.Round((decimal)resource.GetValue(0))];
         }

MacroPad.Core/BasePlugin/Profile/SetProfile.cs

@@ -2,6 +2,7 @@
 using MacroPad.Shared.Device;
 using MacroPad.Shared.Plugin.Nodes;
 using MacroPad.Shared.Plugin.Components;
+using MacroPad.Shared.Plugin;
 
 namespace MacroPad.Core.BasePlugin.Profile
 {
@@ -33,7 +34,7 @@ private int GetProfileIndex(DeviceCore? device, IResourceManager resource)
 
         public INodeComponent[] Components => [
             new ComboBox() {
-                GetItems = (IResourceManager resource, IDeviceLayoutButton button, IDeviceOutput output) =>
+                GetItems = (IResourceManager resource) =>
                 {
                     return DeviceManager.SelectedDevice?.DeviceProfiles.Select(x=>x.Name).ToArray() ?? [];
                 },
@@ -47,7 +48,7 @@ private int GetProfileIndex(DeviceCore? device, IResourceManager resource)
         ];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public NodeRunnerResult Run(IResourceManager resource)
+        public NodeRunnerResult Run(INodeResourceManager resource)
         {
             if (NodeManager.CurrentDevice != null) NodeManager.CurrentDevice.SelectProfile(GetProfileIndex(NodeManager.CurrentDevice, resource));
             return new NodeRunnerResult() { Results = [], RunnerOutputIndex = 0 };

MacroPad.Core/BasePlugin/Text/Join.cs

@@ -1,10 +1,5 @@
 using MacroPad.Shared.Device;
 using MacroPad.Shared.Plugin.Nodes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MacroPad.Core.BasePlugin.Text
 {
@@ -23,7 +18,7 @@ public class Join : INodeGetter
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [string.Concat(resource.GetValue(0), resource.GetValue(1))];
         }

MacroPad.Core/BasePlugin/Text/Replace.cs

@@ -1,10 +1,5 @@
 using MacroPad.Shared.Device;
 using MacroPad.Shared.Plugin.Nodes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MacroPad.Core.BasePlugin.Text
 {
@@ -23,7 +18,7 @@ public class Replace : INodeGetter
         public INodeComponent[] Components => [];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             return [((string)resource.GetValue(0)).Replace((string)resource.GetValue(1), (string)resource.GetValue(2))];
         }

MacroPad.Core/BasePlugin/Variables/Get.cs

@@ -1,7 +1,8 @@
 using MacroPad.Shared.Device;
 using MacroPad.Shared.Plugin.Nodes;
 using MacroPad.Shared.Plugin.Components;
-using Newtonsoft.Json.Linq;
+using MacroPad.Shared.Plugin;
+using System.Text.Json.Nodes;
 
 namespace MacroPad.Core.BasePlugin.Variables
 {
@@ -23,10 +24,10 @@ public class Get : INodeGetter
         } ];
 
         public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true;
-        public object[] GetOutputs(IResourceManager resource)
+        public object[] GetOutputs(INodeResourceManager resource)
         {
             string var = resource.GetData<string>("v") ?? "";
-            return [(DeviceManager.Config.Variables.TryGetValue(var, out JToken? value) ? value.Value<object>() : null) ?? ""];
+            return [(DeviceManager.Config.Variables.TryGetValue(var, out JsonValue? value) ? value.TryGetValue(out object? value2) ? value2 : null : null) ?? ""];
         }
     }
 }