diff --git a/MacroPad.Plugins.Nodes.Discord/MacroPad.Plugins.Nodes.Discord.csproj b/MacroPad.Plugins.Nodes.Discord/MacroPad.Plugins.Nodes.Discord.csproj index 5ef64d5..a257000 100644 --- a/MacroPad.Plugins.Nodes.Discord/MacroPad.Plugins.Nodes.Discord.csproj +++ b/MacroPad.Plugins.Nodes.Discord/MacroPad.Plugins.Nodes.Discord.csproj @@ -28,6 +28,9 @@ + + PreserveNewest + Always diff --git a/MacroPad.Plugins.Nodes.Discord/PluginInfos.cs b/MacroPad.Plugins.Nodes.Discord/PluginInfos.cs index d61cdbb..935d84d 100644 --- a/MacroPad.Plugins.Nodes.Discord/PluginInfos.cs +++ b/MacroPad.Plugins.Nodes.Discord/PluginInfos.cs @@ -6,18 +6,6 @@ namespace MacroPad.Plugins.Nodes.VoiceMeeter { public class PluginInfos : IPluginInfos { - public string Name => "Discord"; - - public string Description => "A plugin that allows you to interact with Discord using 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 DiscordCategory()]; diff --git a/MacroPad.Plugins.Nodes.Discord/icon.png b/MacroPad.Plugins.Nodes.Discord/icon.png new file mode 100644 index 0000000..90e9f17 Binary files /dev/null and b/MacroPad.Plugins.Nodes.Discord/icon.png differ diff --git a/MacroPad.Plugins.Nodes.Discord/plugin.json b/MacroPad.Plugins.Nodes.Discord/plugin.json index b17c452..aa06b12 100644 --- a/MacroPad.Plugins.Nodes.Discord/plugin.json +++ b/MacroPad.Plugins.Nodes.Discord/plugin.json @@ -1,3 +1,10 @@ { - "Main": "MacroPad.Plugins.Nodes.Discord.dll" + "filename": "MacroPad.Plugins.Nodes.Discord.dll", + "name": "Discord", + "description": "A plugin that allows you to interact with Discord", + "version": "1.0.0", + "author": "Piripe", + "supportedPlatforms": [], + "iconType": "Image", + "icon": "icon.png" } \ No newline at end of file diff --git a/MacroPad.Plugins.Nodes.Javascript/MacroPad.Plugins.Nodes.Javascript.csproj b/MacroPad.Plugins.Nodes.Javascript/MacroPad.Plugins.Nodes.Javascript.csproj index ca24bf3..7844a5b 100644 --- a/MacroPad.Plugins.Nodes.Javascript/MacroPad.Plugins.Nodes.Javascript.csproj +++ b/MacroPad.Plugins.Nodes.Javascript/MacroPad.Plugins.Nodes.Javascript.csproj @@ -21,6 +21,9 @@ + + PreserveNewest + Always diff --git a/MacroPad.Plugins.Nodes.Javascript/PluginInfos.cs b/MacroPad.Plugins.Nodes.Javascript/PluginInfos.cs index b6807f1..07262ae 100644 --- a/MacroPad.Plugins.Nodes.Javascript/PluginInfos.cs +++ b/MacroPad.Plugins.Nodes.Javascript/PluginInfos.cs @@ -5,18 +5,6 @@ namespace MacroPad.Plugins.Nodes.Javascript { public class PluginInfos : IPluginInfos { - public string Name => "JavaScript Plugin"; - - public string Description => "A plugin that allows you to run JavaScript on 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 => []; diff --git a/MacroPad.Plugins.Nodes.Javascript/icon.png b/MacroPad.Plugins.Nodes.Javascript/icon.png new file mode 100644 index 0000000..275ef5a Binary files /dev/null and b/MacroPad.Plugins.Nodes.Javascript/icon.png differ diff --git a/MacroPad.Plugins.Nodes.Javascript/plugin.json b/MacroPad.Plugins.Nodes.Javascript/plugin.json index 9c56e29..ddb21d1 100644 --- a/MacroPad.Plugins.Nodes.Javascript/plugin.json +++ b/MacroPad.Plugins.Nodes.Javascript/plugin.json @@ -1,3 +1,10 @@ { - "Main": "MacroPad.Plugins.Nodes.Javascript.dll" + "filename": "MacroPad.Plugins.Nodes.Javascript.dll", + "name": "JavaScript", + "description": "A plugin that allows you to run JavaScript", + "version": "1.0.0", + "author": "Piripe", + "supportedPlatforms": [], + "iconType": "Image", + "icon": "icon.png" } \ No newline at end of file diff --git a/MacroPad.Plugins.Nodes.OBS/MacroPad.Plugins.Nodes.OBS.csproj b/MacroPad.Plugins.Nodes.OBS/MacroPad.Plugins.Nodes.OBS.csproj index 43639d6..3e1e763 100644 --- a/MacroPad.Plugins.Nodes.OBS/MacroPad.Plugins.Nodes.OBS.csproj +++ b/MacroPad.Plugins.Nodes.OBS/MacroPad.Plugins.Nodes.OBS.csproj @@ -25,6 +25,9 @@ + + PreserveNewest + Always diff --git a/MacroPad.Plugins.Nodes.OBS/Nodes/SetCurrentScene.cs b/MacroPad.Plugins.Nodes.OBS/Nodes/SetCurrentScene.cs index 611580b..8f97ede 100644 --- a/MacroPad.Plugins.Nodes.OBS/Nodes/SetCurrentScene.cs +++ b/MacroPad.Plugins.Nodes.OBS/Nodes/SetCurrentScene.cs @@ -24,7 +24,7 @@ internal class SetCurrentScene : INodeRunner public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true; - public NodeRunnerResult Run(IResourceManager r) + public NodeRunnerResult Run(INodeResourceManager r) { OBSProtocol.Run(x => x.SetCurrentProgramScene(((SceneBasicInfo)r.GetValue(0)).Name)); diff --git a/MacroPad.Plugins.Nodes.OBS/PluginInfos.cs b/MacroPad.Plugins.Nodes.OBS/PluginInfos.cs index 6f8d16f..8096736 100644 --- a/MacroPad.Plugins.Nodes.OBS/PluginInfos.cs +++ b/MacroPad.Plugins.Nodes.OBS/PluginInfos.cs @@ -7,18 +7,6 @@ namespace MacroPad.Plugins.Nodes.VoiceMeeter { public class PluginInfos : IPluginInfos { - public string Name => "OBS"; - - public string Description => "A plugin that allows you to interact with OBS using MacroPad."; - - public string Version => "1.0.0"; - - public string Author => "Piripe"; - - public string? AuthorUrl => null; - - public string? SourceUrl => null; - public IProtocol[] Protocols => [ new OBSProtocol() ]; public INodeCategory[] NodeCategories => [ new OBSCategory() ]; diff --git a/MacroPad.Plugins.Nodes.OBS/icon.png b/MacroPad.Plugins.Nodes.OBS/icon.png new file mode 100644 index 0000000..65795da Binary files /dev/null and b/MacroPad.Plugins.Nodes.OBS/icon.png differ diff --git a/MacroPad.Plugins.Nodes.OBS/plugin.json b/MacroPad.Plugins.Nodes.OBS/plugin.json index 15b2ebd..e49308f 100644 --- a/MacroPad.Plugins.Nodes.OBS/plugin.json +++ b/MacroPad.Plugins.Nodes.OBS/plugin.json @@ -1,3 +1,10 @@ { - "Main": "MacroPad.Plugins.Nodes.OBS.dll" + "filename": "MacroPad.Plugins.Nodes.OBS.dll", + "name": "OBS", + "description": "A plugin that allows you to interact with OBS", + "version": "1.0.0", + "author": "Piripe", + "supportedPlatforms": [ "Windows", "Linux", "Darwin" ], + "iconType": "Image", + "icon": "icon.png" } \ No newline at end of file diff --git a/MacroPad.Plugins.Nodes.VoiceMeeter/MacroPad.Plugins.Nodes.VoiceMeeter.csproj b/MacroPad.Plugins.Nodes.VoiceMeeter/MacroPad.Plugins.Nodes.VoiceMeeter.csproj index 9fbba25..f026cf8 100644 --- a/MacroPad.Plugins.Nodes.VoiceMeeter/MacroPad.Plugins.Nodes.VoiceMeeter.csproj +++ b/MacroPad.Plugins.Nodes.VoiceMeeter/MacroPad.Plugins.Nodes.VoiceMeeter.csproj @@ -21,6 +21,9 @@ + + PreserveNewest + Always diff --git a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/GetNumberParameter.cs b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/GetNumberParameter.cs index 0a89821..691d8b4 100644 --- a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/GetNumberParameter.cs +++ b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/GetNumberParameter.cs @@ -18,7 +18,7 @@ internal class GetNumberParameter : INodeGetter public INodeComponent[] Components => []; public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true; - public object[] GetOutputs(IResourceManager resource) + public object[] GetOutputs(INodeResourceManager resource) { string value = (string)resource.GetValue(0); if (value != null) diff --git a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/GetTextParameter.cs b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/GetTextParameter.cs index d09c8c7..6ae7e75 100644 --- a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/GetTextParameter.cs +++ b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/GetTextParameter.cs @@ -18,7 +18,7 @@ internal class GetTextParameter : INodeGetter public INodeComponent[] Components => []; public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true; - public object[] GetOutputs(IResourceManager resource) + public object[] GetOutputs(INodeResourceManager resource) { string value = (string)resource.GetValue(0); if (value != null) return [VoiceMeeterRemote.GetString(value)]; diff --git a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetBusGain.cs b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetBusGain.cs index 2460834..1ca55bf 100644 --- a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetBusGain.cs +++ b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetBusGain.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.Plugins.Nodes.VoiceMeeter.Nodes { @@ -23,7 +24,7 @@ internal class SetBusGain : INodeRunner public INodeComponent[] Components => [ new ComboBox() { - GetItems = (IResourceManager resource, IDeviceLayoutButton button, IDeviceOutput output) => { + GetItems = (IResourceManager resource) => { Static.Update(); return Static.BusesName; }, @@ -34,7 +35,7 @@ internal class SetBusGain : INodeRunner public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true; - public NodeRunnerResult Run(IResourceManager resource) + public NodeRunnerResult Run(INodeResourceManager resource) { VoiceMeeterRemote.SetParameter($"Bus({resource.GetData("v")}).Gain", decimal.ToSingle((decimal)resource.GetValue(0))); diff --git a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetNumberParameter.cs b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetNumberParameter.cs index da526f0..7e02c2f 100644 --- a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetNumberParameter.cs +++ b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetNumberParameter.cs @@ -24,7 +24,7 @@ internal class SetNumberParameter : INodeRunner public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true; - public NodeRunnerResult Run(IResourceManager resource) + public NodeRunnerResult Run(INodeResourceManager resource) { string value = (string)resource.GetValue(0); if (value != null) _ = VoiceMeeterRemote.SetParameter(value, decimal.ToSingle((decimal)resource.GetValue(1))); diff --git a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetStripGain.cs b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetStripGain.cs index 08103d4..3c3087d 100644 --- a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetStripGain.cs +++ b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetStripGain.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.Plugins.Nodes.VoiceMeeter.Nodes { @@ -23,7 +24,7 @@ internal class SetStripGain : INodeRunner public INodeComponent[] Components => [ new ComboBox() { - GetItems = (IResourceManager resource, IDeviceLayoutButton button, IDeviceOutput output) => { + GetItems = (IResourceManager resource) => { Static.Update(); return Static.StripsName; }, @@ -34,7 +35,7 @@ internal class SetStripGain : INodeRunner public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true; - public NodeRunnerResult Run(IResourceManager resource) + public NodeRunnerResult Run(INodeResourceManager resource) { VoiceMeeterRemote.SetParameter($"Strip({resource.GetData("v")}).Gain", decimal.ToSingle((decimal)resource.GetValue(0))); diff --git a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetTextParameter.cs b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetTextParameter.cs index ea78a7e..faebd93 100644 --- a/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetTextParameter.cs +++ b/MacroPad.Plugins.Nodes.VoiceMeeter/Nodes/SetTextParameter.cs @@ -23,7 +23,7 @@ internal class SetTextParameter : INodeRunner public bool IsVisible(IDeviceLayoutButton button, IDeviceOutput output) => true; - public NodeRunnerResult Run(IResourceManager resource) + public NodeRunnerResult Run(INodeResourceManager resource) { VoiceMeeterRemote.SetParameter((string)resource.GetValue(0), (string)resource.GetValue(1)); diff --git a/MacroPad.Plugins.Nodes.VoiceMeeter/PluginInfos.cs b/MacroPad.Plugins.Nodes.VoiceMeeter/PluginInfos.cs index 58ecad1..3365ef2 100644 --- a/MacroPad.Plugins.Nodes.VoiceMeeter/PluginInfos.cs +++ b/MacroPad.Plugins.Nodes.VoiceMeeter/PluginInfos.cs @@ -5,23 +5,11 @@ namespace MacroPad.Plugins.Nodes.VoiceMeeter { public class PluginInfos : IPluginInfos { - public string Name => "VoiceMeeter"; + public IProtocol[] Protocols => []; - public string Description => "A plugin that allows you to interact with VoiceMeeter using MacroPad."; + public INodeCategory[] NodeCategories => [ new VoiceMeeterCategory() ]; - public string Version => "1.0.0"; - - public string Author => "Piripe"; - - public string? AuthorUrl => null; - - public string? SourceUrl => null; - - public IProtocol[] Protocols => new IProtocol[0]; - - public INodeCategory[] NodeCategories => new INodeCategory[] { new VoiceMeeterCategory() }; - - public NodeType[] NodeTypes => new NodeType[0]; + public NodeType[] NodeTypes => []; public ISettingsComponent[] Settings => []; } } \ No newline at end of file diff --git a/MacroPad.Plugins.Nodes.VoiceMeeter/icon.png b/MacroPad.Plugins.Nodes.VoiceMeeter/icon.png new file mode 100644 index 0000000..e790b07 Binary files /dev/null and b/MacroPad.Plugins.Nodes.VoiceMeeter/icon.png differ diff --git a/MacroPad.Plugins.Nodes.VoiceMeeter/plugin.json b/MacroPad.Plugins.Nodes.VoiceMeeter/plugin.json index 6f6effa..1243828 100644 --- a/MacroPad.Plugins.Nodes.VoiceMeeter/plugin.json +++ b/MacroPad.Plugins.Nodes.VoiceMeeter/plugin.json @@ -1,3 +1,10 @@ { - "Main": "MacroPad.Plugins.Nodes.VoiceMeeter.dll" + "filename": "MacroPad.Plugins.Nodes.VoiceMeeter.dll", + "name": "VoiceMeeter", + "description": "A plugin that allows you to interact with VoiceMeeter", + "version": "1.0.0", + "author": "Piripe", + "supportedPlatforms": [ "Windows" ], + "iconType": "Image", + "icon": "icon.png" } \ No newline at end of file diff --git a/MacroPad.Plugins/MacroPad.Plugins.Protocol.Midi.csproj b/MacroPad.Plugins/MacroPad.Plugins.Protocol.Midi.csproj index b8bfa19..8093803 100644 --- a/MacroPad.Plugins/MacroPad.Plugins.Protocol.Midi.csproj +++ b/MacroPad.Plugins/MacroPad.Plugins.Protocol.Midi.csproj @@ -14,7 +14,7 @@ - + @@ -25,6 +25,9 @@ + + PreserveNewest + Always diff --git a/MacroPad.Plugins/PluginInfos.cs b/MacroPad.Plugins/PluginInfos.cs index 5690fc4..54f562b 100644 --- a/MacroPad.Plugins/PluginInfos.cs +++ b/MacroPad.Plugins/PluginInfos.cs @@ -6,18 +6,6 @@ namespace MacroPad.Plugins.Protocol.Midi { public class PluginInfos : IPluginInfos { - public string Name => "MIDI Protocol"; - - public string Description => "A plugin that allows you to connect any MIDI device to MacroPad."; - - public string Version => "1.0.0"; - - public string Author => "Piripe"; - - public string? AuthorUrl => null; - - public string? SourceUrl => null; - public IProtocol[] Protocols => [new MidiProtocol()]; public INodeCategory[] NodeCategories => []; diff --git a/MacroPad.Plugins/icon.png b/MacroPad.Plugins/icon.png new file mode 100644 index 0000000..5eb6355 Binary files /dev/null and b/MacroPad.Plugins/icon.png differ diff --git a/MacroPad.Plugins/plugin.json b/MacroPad.Plugins/plugin.json index a9ceb9b..eb84c34 100644 --- a/MacroPad.Plugins/plugin.json +++ b/MacroPad.Plugins/plugin.json @@ -1,3 +1,10 @@ { - "Main": "MacroPad.Plugins.Protocol.Midi.dll" + "filename": "MacroPad.Plugins.Protocol.Midi.dll", + "name": "MIDI Devices", + "description": "A plugin that allows you to connect any MIDI device", + "version": "1.0.0", + "author": "Piripe", + "supportedPlatforms": [ "Windows", "Linux", "Darwin" ], + "iconType": "Image", + "icon": "icon.png" } \ No newline at end of file