Skip to content

Commit

Permalink
update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@diogotr7
diogotr7 committed Jan 13, 2024
1 parent f0f973e commit a267623
Show file tree
Hide file tree
Showing 12 changed files with 40 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/Artemis.Plugins.Games.CSGO/Artemis.Plugins.Games.CSGO.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1009.1" />
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1017.2" />
<PackageReference Include="ArtemisRGB.GameFinder" Version="2.2.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Artemis.Plugins.Games.Dota2/Artemis.Plugins.Games.Dota2.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1009.1" />
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1017.2" />
<PackageReference Include="ArtemisRGB.GameFinder" Version="2.2.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Artemis.Plugins.Games.EliteDangerous/Artemis.Plugins.Games.EliteDangerous.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1009.1" />
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1017.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Artemis.Plugins.Games.Fallout4/Artemis.Plugins.Games.Fallout4.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1009.1" />
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1017.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ins.Games.GTAV/Artemis.Plugins.Games.GTAV.Module/Artemis.Plugins.Games.GTAV.Module.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1009.1" />
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1017.2" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ....Plugins.Games.LeagueOfLegends.Module/Artemis.Plugins.Games.LeagueOfLegends.Module.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1009.1" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1017.2" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
</ItemGroup>

Expand Down
43 changes: 28 additions & 15 deletions ...ends/Artemis.Plugins.Games.LeagueOfLegends.Module/InGameApi/DataModels/PlayerDataModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Artemis.Plugins.Games.LeagueOfLegends.Module.InGameApi.GameDataModels;
using Artemis.Plugins.Games.LeagueOfLegends.Module.Utils;
using System;
using System.Diagnostics.CodeAnalysis;
using SummonerSpell = Artemis.Plugins.Games.LeagueOfLegends.Module.InGameApi.DataModels.Enums.SummonerSpell;
using ChampionEnum = Artemis.Plugins.Games.LeagueOfLegends.Module.InGameApi.DataModels.Enums.Champion;
using Rune = Artemis.Plugins.Games.LeagueOfLegends.Module.InGameApi.DataModels.Enums.Rune;
Expand Down Expand Up @@ -38,21 +39,7 @@ public class PlayerDataModel : DataModel

public void Update(RootGameData rootGameData)
{
var hashIndex = rootGameData.ActivePlayer.SummonerName.IndexOf('#');
if (hashIndex == -1)
return;
var summonerNameWithoutHash = rootGameData.ActivePlayer.SummonerName.AsSpan()[..hashIndex];
AllPlayer? allPlayer = null;
foreach (var player in rootGameData.AllPlayers)
{
if (!player.SummonerName.AsSpan().Equals(summonerNameWithoutHash, StringComparison.OrdinalIgnoreCase))
continue;

allPlayer = player;
break;
}

if (allPlayer == null)
if (!TryFindActivePlayer(rootGameData, out var allPlayer))
return;

SummonerName = rootGameData.ActivePlayer.SummonerName;
Expand Down Expand Up @@ -82,6 +69,32 @@ public void Update(RootGameData rootGameData)
SpellD = ParseEnum<SummonerSpell>.TryParseOr(allPlayer.SummonerSpells.SummonerSpellOne?.RawDisplayName, SummonerSpell.Unknown);
SpellF = ParseEnum<SummonerSpell>.TryParseOr(allPlayer.SummonerSpells.SummonerSpellTwo?.RawDisplayName, SummonerSpell.Unknown);
}

private static bool TryFindActivePlayer(RootGameData rootGameData, [NotNullWhen(returnValue: true)] out AllPlayer? allPlayer)
{
allPlayer = null;

if (string.IsNullOrWhiteSpace(rootGameData?.ActivePlayer?.SummonerName))
return false;

ReadOnlySpan<char> summonerName = rootGameData.ActivePlayer.SummonerName;

var hashIndex = summonerName.IndexOf('#');
if (hashIndex == -1)
return false;

var summonerNameWithoutHash = summonerName[..hashIndex];
foreach (var player in rootGameData.AllPlayers)
{
if (summonerNameWithoutHash.Equals(player.SummonerName, StringComparison.OrdinalIgnoreCase))
{
allPlayer = player;
return true;
}
}

return false;
}
}

public class RunesDataModel : DataModel
Expand Down
2 changes: 1 addition & 1 deletion ....LeagueOfLegends/Artemis.Plugins.Games.LeagueOfLegends.Module/LeagueClient/LcuWsClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private async Task ReadLoop()
{
try
{
await using var memoryStream = (_memoryStreamManager.GetStream() as RecyclableMemoryStream)!;
await using var memoryStream = _memoryStreamManager.GetStream();
ValueWebSocketReceiveResult result;
do
{
Expand Down
2 changes: 1 addition & 1 deletion src/Artemis.Plugins.Games.RocketLeague/Artemis.Plugins.Games.RocketLeague.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1009.1" />
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1017.2" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Artemis.Plugins.Games.TrackMania/Artemis.Plugins.Games.TrackMania.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1009.1" />
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1017.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Artemis.Plugins.Games.TruckSimulator/Artemis.Plugins.Games.TruckSimulator.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1009.1" />
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1017.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ....Valheim/Artemis.Plugins.Games.Valheim.Module/Artemis.Plugins.Games.Valheim.Module.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1009.1" />
<PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1017.2" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit a267623

Please sign in to comment.