Skip to content

Commit 276925c

Browse files
diogotr7diogotr7
authored
Merge pull request #37 from Artemis-RGB/feature/genhttp
Update for GenHttp
2 parents 26b7187 + b898e5a commit 276925c

13 files changed

Lines changed: 52 additions & 49 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
steps:
1010
- name: Clone Plugins
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212

1313
- name: Build Plugins
1414
run: dotnet publish -c Release src
@@ -21,71 +21,71 @@ jobs:
2121
run: artemis-plugin-uploader upload-all --pat ${{ secrets.WORKSHOP_PAT }} --folder src
2222

2323
- name: Upload Elite Dangerous
24-
uses: actions/upload-artifact@v3
24+
uses: actions/upload-artifact@v4
2525
with:
2626
name: Artemis.Plugins.Games.EliteDangerous
27-
path: src/Artemis.Plugins.Games.EliteDangerous/bin/x64/Release/net8.0/publish
27+
path: src/Artemis.Plugins.Games.EliteDangerous/bin/x64/Release/net9.0/publish
2828
if-no-files-found: error
2929

3030
- name: Upload GTAV
31-
uses: actions/upload-artifact@v3
31+
uses: actions/upload-artifact@v4
3232
with:
3333
name: Artemis.Plugins.Games.GTAV.Module
34-
path: src/Artemis.Plugins.Games.GTAV/Artemis.Plugins.Games.GTAV.Module/bin/x64/Release/net8.0/publish
34+
path: src/Artemis.Plugins.Games.GTAV/Artemis.Plugins.Games.GTAV.Module/bin/x64/Release/net9.0/publish
3535
if-no-files-found: error
3636

3737
- name: Upload League Of Legends
38-
uses: actions/upload-artifact@v3
38+
uses: actions/upload-artifact@v4
3939
with:
4040
name: Artemis.Plugins.Games.LeagueOfLegends.Module
41-
path: src/Artemis.Plugins.Games.LeagueOfLegends/Artemis.Plugins.Games.LeagueOfLegends.Module/bin/x64/Release/net8.0/publish
41+
path: src/Artemis.Plugins.Games.LeagueOfLegends/Artemis.Plugins.Games.LeagueOfLegends.Module/bin/x64/Release/net9.0/publish
4242
if-no-files-found: error
4343

4444
- name: Upload Rocket League
45-
uses: actions/upload-artifact@v3
45+
uses: actions/upload-artifact@v4
4646
with:
4747
name: Artemis.Plugins.Games.RocketLeague
48-
path: src/Artemis.Plugins.Games.RocketLeague/bin/x64/Release/net8.0/publish
48+
path: src/Artemis.Plugins.Games.RocketLeague/bin/x64/Release/net9.0/publish
4949
if-no-files-found: error
5050

5151
- name: Upload TrackMania
52-
uses: actions/upload-artifact@v3
52+
uses: actions/upload-artifact@v4
5353
with:
5454
name: Artemis.Plugins.Games.TrackMania
55-
path: src/Artemis.Plugins.Games.TrackMania/bin/x64/Release/net8.0/publish
55+
path: src/Artemis.Plugins.Games.TrackMania/bin/x64/Release/net9.0/publish
5656
if-no-files-found: error
5757

5858
- name: Upload Truck Simulator
59-
uses: actions/upload-artifact@v3
59+
uses: actions/upload-artifact@v4
6060
with:
6161
name: Artemis.Plugins.Games.TruckSimulator
62-
path: src/Artemis.Plugins.Games.TruckSimulator/bin/x64/Release/net8.0/publish
62+
path: src/Artemis.Plugins.Games.TruckSimulator/bin/x64/Release/net9.0/publish
6363
if-no-files-found: error
6464

6565
- name: Upload Valheim
66-
uses: actions/upload-artifact@v3
66+
uses: actions/upload-artifact@v4
6767
with:
6868
name: Artemis.Plugins.Games.Valheim
69-
path: src/Artemis.Plugins.Games.Valheim/Artemis.Plugins.Games.Valheim.Module/bin/x64/Release/net8.0/publish
69+
path: src/Artemis.Plugins.Games.Valheim/Artemis.Plugins.Games.Valheim.Module/bin/x64/Release/net9.0/publish
7070
if-no-files-found: error
7171

7272
- name: Upload Fallout 4
73-
uses: actions/upload-artifact@v3
73+
uses: actions/upload-artifact@v4
7474
with:
7575
name: Artemis.Plugins.Games.Fallout4
76-
path: src/Artemis.Plugins.Games.Fallout4/bin/x64/Release/net8.0/publish
76+
path: src/Artemis.Plugins.Games.Fallout4/bin/x64/Release/net9.0/publish
7777
if-no-files-found: error
7878

7979
- name: Upload Dota 2
80-
uses: actions/upload-artifact@v3
80+
uses: actions/upload-artifact@v4
8181
with:
8282
name: Artemis.Plugins.Games.Dota2
83-
path: src/Artemis.Plugins.Games.Dota2/bin/x64/Release/net8.0/publish
83+
path: src/Artemis.Plugins.Games.Dota2/bin/x64/Release/net9.0/publish
8484
if-no-files-found: error
8585

8686
- name: Upload CSGO
87-
uses: actions/upload-artifact@v3
87+
uses: actions/upload-artifact@v4
8888
with:
8989
name: Artemis.Plugins.Games.CSGO
90-
path: src/Artemis.Plugins.Games.CSGO/bin/x64/Release/net8.0/publish
90+
path: src/Artemis.Plugins.Games.CSGO/bin/x64/Release/net9.0/publish
9191
if-no-files-found: error

‎src/Artemis.Plugins.Games.CSGO/Artemis.Plugins.Games.CSGO.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Platforms>x64</Platforms>
55
<EnableDynamicLoading>true</EnableDynamicLoading>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2024.313.2" />
10+
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2025.216.4" />
1111
<PackageReference Include="ArtemisRGB.GameFinder" Version="2.3.0" />
1212
</ItemGroup>
1313

‎src/Artemis.Plugins.Games.Dota2/Artemis.Plugins.Games.Dota2.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Platforms>x64</Platforms>
55
<EnableDynamicLoading>true</EnableDynamicLoading>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2024.313.2" />
10+
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2025.216.4" />
1111
<PackageReference Include="ArtemisRGB.GameFinder" Version="2.3.0" />
1212
</ItemGroup>
1313

‎src/Artemis.Plugins.Games.EliteDangerous/Artemis.Plugins.Games.EliteDangerous.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Platforms>x64</Platforms>
55
<EnableDynamicLoading>true</EnableDynamicLoading>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2024.303.4" />
9+
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2025.216.4" />
1010
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1111
</ItemGroup>
1212

‎src/Artemis.Plugins.Games.Fallout4/Artemis.Plugins.Games.Fallout4.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Platforms>x64</Platforms>
55
<EnableDynamicLoading>true</EnableDynamicLoading>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2024.303.4" />
10+
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2025.216.4" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/Artemis.Plugins.Games.GTAV/Artemis.Plugins.Games.GTAV.Module/Artemis.Plugins.Games.GTAV.Module.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Platforms>x64</Platforms>
55
<EnableDynamicLoading>true</EnableDynamicLoading>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2024.303.4" />
9+
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2025.216.4" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/Artemis.Plugins.Games.LeagueOfLegends/Artemis.Plugins.Games.LeagueOfLegends.Module/Artemis.Plugins.Games.LeagueOfLegends.Module.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Platforms>x64</Platforms>
55
<EnableDynamicLoading>true</EnableDynamicLoading>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2024.303.4" />
10+
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2025.216.4" />
1111
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
1212
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
1313
</ItemGroup>

‎src/Artemis.Plugins.Games.RocketLeague/Artemis.Plugins.Games.RocketLeague.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Platforms>x64</Platforms>
55
<EnableDynamicLoading>true</EnableDynamicLoading>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2024.303.4" />
9+
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2025.216.4" />
1010
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
1111
</ItemGroup>
1212

‎src/Artemis.Plugins.Games.RocketLeague/RocketLeagueModule.cs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Artemis.Core.Modules;
22
using Artemis.Core.Services;
33
using Artemis.Core;
4-
using SkiaSharp;
54
using System.Collections.Generic;
65

76
namespace Artemis.Plugins.Games.RocketLeague
@@ -11,7 +10,7 @@ public class RocketLeagueModule : Module<RocketLeagueDataModel>
1110
{
1211
private readonly IWebServerService _webServerService;
1312

14-
private DataModelJsonPluginEndPoint<RocketLeagueDataModel> _updateEndpoint;
13+
private JsonPluginEndPoint<RocketLeagueDataModel> _updateEndpoint;
1514

1615
public override List<IModuleActivationRequirement> ActivationRequirements { get; } = new() { new ProcessActivationRequirement("RocketLeague") };
1716

@@ -22,16 +21,21 @@ public RocketLeagueModule(IWebServerService webServerService)
2221

2322
public override void Enable()
2423
{
25-
_updateEndpoint = _webServerService.AddDataModelJsonEndPoint(this, "update");
26-
_updateEndpoint.ProcessedRequest += OnProcessedRequest;
24+
_updateEndpoint = _webServerService.AddJsonEndPoint<RocketLeagueDataModel>(this, "update", OnProcessedRequest);
2725
}
2826

29-
private void OnProcessedRequest(object sender, EndpointRequestEventArgs e)
27+
private void OnProcessedRequest(RocketLeagueDataModel data)
3028
{
29+
DataModel.Match = data.Match;
30+
DataModel.Player = data.Player;
31+
DataModel.Car = data.Car;
32+
DataModel.Status = data.Status;
33+
3134
if (DataModel.Player == null)
3235
{
3336
DataModel.Match.MyTeam = null;
3437
DataModel.Match.OpponentTeam = null;
38+
return;
3539
}
3640

3741
if (DataModel.Player.Team == 0)
@@ -48,7 +52,6 @@ private void OnProcessedRequest(object sender, EndpointRequestEventArgs e)
4852

4953
public override void Disable()
5054
{
51-
_updateEndpoint.ProcessedRequest -= OnProcessedRequest;
5255
_webServerService.RemovePluginEndPoint(_updateEndpoint);
5356
}
5457

‎src/Artemis.Plugins.Games.TrackMania/Artemis.Plugins.Games.TrackMania.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Platforms>x64</Platforms>
55
<EnableDynamicLoading>true</EnableDynamicLoading>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2024.303.4" />
10+
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2025.216.4" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

0 commit comments

Comments
 (0)