Skip to content

Commit f1275dd

Browse files
committed
Switch to ModTek libs, updated versions.
1 parent 2b8b510 commit f1275dd

5 files changed

Lines changed: 14 additions & 140 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
-xr!source "-xr!.*"
2929
)
3030
release-notes: |
31-
Requires ModTek v4 or later.
31+
Requires ModTek v4.3 or later.
3232
MechEngineer.zip contains:
3333
- MechEngineer
3434
- [CustomComponents](https://github.com/BattletechModders/CustomComponents) (Required)

source/Control.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using MechEngineer.Features;
77
using MechEngineer.Features.OverrideStatTooltips.Helper;
88
using MechEngineer.Misc;
9-
using NullableLogging;
109

1110
namespace MechEngineer;
1211

@@ -43,8 +42,6 @@ public static void Start(string modDirectory, string json)
4342
Log.Main.Info?.Log("settings loaded");
4443
Log.Main.Debug?.Log("debugging enabled");
4544

46-
Harmony.CreateAndPatchAll(typeof(NullableLogger), nameof(MechEngineer) + "." + nameof(NullableLogger));
47-
4845
Log.Main.Debug?.Log("setting up features");
4946

5047
foreach (var feature in FeaturesList.Features)

source/Log.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#nullable enable
2-
using HBS.Logging;
3-
using NullableLogging;
1+
using HBS.Logging;
2+
using ModTek.Public;
43

54
namespace MechEngineer;
65

source/MechEngineer.csproj

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
</PropertyGroup>
1717
<PropertyGroup>
1818
<OutputType>Library</OutputType>
19-
<TargetFramework>net471</TargetFramework>
20-
<LangVersion>11</LangVersion>
19+
<TargetFramework>net472</TargetFramework>
20+
<LangVersion>13</LangVersion>
2121
<AssemblySearchPaths>
2222
$(ReferencePath);
2323
{HintPathFromItem};
24+
$(BattleTechGameDir)\Mods\ModTek\lib\;
2425
$(BattleTechGameDir)\BattleTech_Data\Managed\
2526
</AssemblySearchPaths>
2627
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
@@ -36,22 +37,21 @@
3637
<PublicizerRuntimeStrategies>Unsafe</PublicizerRuntimeStrategies>
3738
</PropertyGroup>
3839
<ItemGroup>
39-
<PackageReference Include="Krafs.Publicizer" Version="2.2.1" />
40+
<PackageReference Include="Krafs.Publicizer" Version="2.3.0" />
4041
<Publicize Include="Assembly-CSharp" />
4142
<Publicize Include="DOTween;DOTweenPro" />
4243
<Publicize Include="UnityEngine.CoreModule" />
4344
</ItemGroup>
4445
<ItemGroup>
45-
<PackageReference Include="HarmonyX" Version="2.10.1">
46-
<PrivateAssets>all</PrivateAssets>
47-
<ExcludeAssets>runtime</ExcludeAssets>
48-
</PackageReference>
49-
<PackageReference Include="PolySharp" Version="1.13.2">
46+
<PackageReference Include="PolySharp" Version="1.15.0">
5047
<PrivateAssets>all</PrivateAssets>
5148
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
5249
</PackageReference>
5350
</ItemGroup>
5451
<ItemGroup>
52+
<Reference Include="0Harmony">
53+
<Private>False</Private>
54+
</Reference>
5555
<Reference Include="CustomComponents">
5656
<!-- relative to ME -->
5757
<HintPath>$(MechEngineerModPath)\..\CustomComponents\CustomComponents.dll</HintPath>
@@ -72,6 +72,9 @@
7272
<Reference Include="InControl">
7373
<Private>False</Private>
7474
</Reference>
75+
<Reference Include="ModTek">
76+
<Private>False</Private>
77+
</Reference>
7578
<Reference Include="System">
7679
<Private>False</Private>
7780
</Reference>

source/NullableLogger.cs

Lines changed: 0 additions & 125 deletions
This file was deleted.

0 commit comments

Comments
 (0)