Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/BUTR/Bannerlord.ButterLib in…
Browse files Browse the repository at this point in the history
…to dev
  • Loading branch information
Aragas committed Jun 18, 2022
2 parents cc8d7a2 + cbc6db5 commit 19de599
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on: windows-latest
steps:
- name: Tests Setup
uses: butr/[email protected].3
uses: butr/[email protected].4
with:
github-token: ${{secrets.GITHUB_TOKEN}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public VersionGameTypeWrapper(object? @object)
: null;
}
}

public int Compare(ApplicationVersion x, ApplicationVersion y)
{
var applicationVersionTypeComparison = x.ApplicationVersionType.CompareTo(y.ApplicationVersionType);
Expand Down
4 changes: 2 additions & 2 deletions src/Bannerlord.ButterLib/Helpers/InformationManagerUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ static InformationManagerUtils()
{
var type = AccessTools2.TypeByName("TaleWorlds.Core.InformationManager") ??
AccessTools2.TypeByName("TaleWorlds.Library.InformationManager");
foreach (var methodInfo in HarmonyLib.AccessTools.GetDeclaredMethods(type) ?? Enumerable.Empty<MethodInfo>())
foreach (var methodInfo in HarmonyLib.AccessTools.GetDeclaredMethods(type) ?? Enumerable.Empty<MethodInfo>())
{
var @params = methodInfo.GetParameters();
if (@params.Length == 1 && @params[0].ParameterType.Name.Equals("InformationMessage", StringComparison.Ordinal))
Expand All @@ -31,7 +31,7 @@ public static void DisplayMessage(InformationMessageWrapper? message)
{
return;
}

if (DisplayMessageV1 is not null)
{
DisplayMessageV1(message.Object);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class ApplicationVersionUtilsTests
{
private static readonly string TestAppVersionStr = "e1.4.3.231432";
#if e172
private static readonly ApplicationVersion TestAppVersion = ApplicationVersion.FromString("e1.4.3.231432", TaleWorlds.Library.ApplicationVersionGameType.Singleplayer);
private static readonly ApplicationVersion TestAppVersion = ApplicationVersion.FromString("e1.4.3.231432", TaleWorlds.Library.ApplicationVersionGameType.Singleplayer);
#elif e180
private static readonly ApplicationVersion TestAppVersion = ApplicationVersion.FromString("e1.4.3.231432");
#endif
Expand Down

0 comments on commit 19de599

Please sign in to comment.