Skip to content

Updated dependancies to newest version, support for v1.2.11 #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VPleckaitis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Updated dependancies to newest version, support for v1.2.11 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions BannerKings/BannerKings.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bannerlord.MCM" Version="5.5.5">
<PackageReference Include="Bannerlord.MCM" Version="5.10.2">
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="Bannerlord.BuildResources" Version="1.0.1.92" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="Lib.Harmony" Version="2.2.2" IncludeAssets="compile" />
<PackageReference Include="Harmony.Extensions" Version="3.2.0.75" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="BUTR.Harmony.Analyzer" Version="1.0.1.44" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="Bannerlord.ButterLib" Version="2.6.3" IncludeAssets="compile" />
<PackageReference Include="Bannerlord.UIExtenderEx" Version="2.6.0" IncludeAssets="compile" />
<PackageReference Include="Bannerlord.BuildResources" Version="1.1.0.108" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="Lib.Harmony" Version="2.3.3" IncludeAssets="compile" />
<PackageReference Include="Harmony.Extensions" Version="3.2.0.77" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="BUTR.Harmony.Analyzer" Version="1.0.1.50" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="Bannerlord.ButterLib" Version="2.9.18" IncludeAssets="compile" />
<PackageReference Include="Bannerlord.UIExtenderEx" Version="2.12.0" IncludeAssets="compile" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" PrivateAssets="all" IncludeAssets="compile" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion BannerKings/UI/Management/Villages/VillageBuildingDailyProjectVM.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
using System;
using TaleWorlds.CampaignSystem.Settlements;
using TaleWorlds.CampaignSystem.Settlements.Buildings;
using TaleWorlds.CampaignSystem.ViewModelCollection.GameMenu.TownManagement;

namespace BannerKings.UI.Management.Villages
{
public class VillageBuildingDailyProjectVM : SettlementDailyProjectVM
{
public VillageBuildingDailyProjectVM(Action<SettlementProjectVM, bool> onSelection, Action<SettlementProjectVM> onSetAsCurrent, Action onResetCurrent, Building building) : base(onSelection, onSetAsCurrent, onResetCurrent, building)
public VillageBuildingDailyProjectVM(Action<SettlementProjectVM, bool> onSelection, Action<SettlementProjectVM> onSetAsCurrent, Action onResetCurrent, Building building, Settlement settlement) : base(onSelection, onSetAsCurrent, onResetCurrent, building, settlement)
{
}

Expand Down
3 changes: 2 additions & 1 deletion BannerKings/UI/Management/Villages/VillageBuildingProjectVM.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
using System;
using TaleWorlds.CampaignSystem.Settlements;
using TaleWorlds.CampaignSystem.Settlements.Buildings;
using TaleWorlds.CampaignSystem.ViewModelCollection.GameMenu.TownManagement;

namespace BannerKings.UI.Management.Villages
{
public class VillageBuildingProjectVM : SettlementBuildingProjectVM
{
public VillageBuildingProjectVM(Action<SettlementProjectVM, bool> onSelection, Action<SettlementProjectVM> onSetAsCurrent, Action onResetCurrent, Building building) : base(onSelection, onSetAsCurrent, onResetCurrent, building)
public VillageBuildingProjectVM(Action<SettlementProjectVM, bool> onSelection, Action<SettlementProjectVM> onSetAsCurrent, Action onResetCurrent, Building building, Settlement settlement) : base(onSelection, onSetAsCurrent, onResetCurrent, building, settlement)
{
}

Expand Down
6 changes: 4 additions & 2 deletions BannerKings/UI/Management/Villages/VillageProjectSelection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ public override void RefreshValues()
new Action<SettlementProjectVM, bool>(OnCurrentProjectSelection),
new Action<SettlementProjectVM>(OnCurrentProjectSet),
new Action(OnResetCurrentProject),
building);
building,
currentSettlement);
AvailableProjects.Add(VillageBuildingProjectVM);
if (VillageBuildingProjectVM.Building.BuildingType.StringId == villageData.CurrentBuilding.BuildingType.StringId)
{
Expand All @@ -74,7 +75,8 @@ public override void RefreshValues()
new Action<SettlementProjectVM, bool>(OnCurrentProjectSelection),
new Action<SettlementProjectVM>(OnCurrentProjectSet),
new Action(OnResetCurrentProject),
building2);
building2,
currentSettlement);
DailyDefaultList.Add(VillageBuildingDailyProjectVM);
if (VillageBuildingDailyProjectVM.Building.BuildingType.StringId ==
villageData.CurrentDefault.BuildingType.StringId)
Expand Down