Update to Impostor 1.9

NuclearPowered · Jan 25, 2024 · e9caad2 · e9caad2
1 parent 187703c
commit e9caad2
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 77 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 7.*
+          dotnet-version: 8.*
 
       - name: Run the Cake script
         uses: cake-build/cake-action@v1
@@ -24,17 +24,11 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: Reactor.Impostor.dll
-          path: Reactor.Impostor/bin/Release/net7.0/Reactor.Impostor.dll
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: Reactor.Impostor.Http.dll
-          path: Reactor.Impostor.Http/bin/Release/net7.0/Reactor.Impostor.Http.dll
+          path: Reactor.Impostor/bin/Release/net8.0/Reactor.Impostor.dll
 
       - uses: softprops/action-gh-release@v1
         if: github.ref_type == 'tag'
         with:
           draft: true
           files: |
-            Reactor.Impostor/bin/Release/net7.0/Reactor.Impostor.dll
-            Reactor.Impostor.Http/bin/Release/net7.0/Reactor.Impostor.Http.dll
+            Reactor.Impostor/bin/Release/net8.0/Reactor.Impostor.dll
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>

diff --git a/Reactor.Impostor.Http/Reactor.Impostor.Http.csproj b/Reactor.Impostor.Http/Reactor.Impostor.Http.csproj
diff --git a/Reactor.Impostor.Http/ReactorHttpPlugin.cs b/Reactor.Impostor.Http/ReactorHttpPlugin.cs
diff --git a/Reactor.Impostor.Http/ReactorHttpPluginStartup.cs b/Reactor.Impostor.Http/ReactorHttpPluginStartup.cs
diff --git a/Reactor.Impostor.sln b/Reactor.Impostor.sln
@@ -1,12 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# 
+#
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reactor.Impostor", "Reactor.Impostor\Reactor.Impostor.csproj", "{1522BD93-2A54-4B2C-8137-179978CD8D98}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reactor.Impostor.Example", "Reactor.Impostor.Example\Reactor.Impostor.Example.csproj", "{9CA8D857-B2B8-4A82-9622-9E87281EC6E3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reactor.Impostor.Http", "Reactor.Impostor.Http\Reactor.Impostor.Http.csproj", "{73A555DA-C1E2-4458-89D1-4CF4FEF06F59}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,9 +19,5 @@ Global
 		{9CA8D857-B2B8-4A82-9622-9E87281EC6E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9CA8D857-B2B8-4A82-9622-9E87281EC6E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9CA8D857-B2B8-4A82-9622-9E87281EC6E3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73A555DA-C1E2-4458-89D1-4CF4FEF06F59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73A555DA-C1E2-4458-89D1-4CF4FEF06F59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73A555DA-C1E2-4458-89D1-4CF4FEF06F59}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73A555DA-C1E2-4458-89D1-4CF4FEF06F59}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/Reactor.Impostor.Http/ClientModsHeader.cs → Reactor.Impostor/Http/ClientModsHeader.cs b/Reactor.Impostor.Http/ClientModsHeader.cs → Reactor.Impostor/Http/ClientModsHeader.cs
diff --git a/...r.Impostor.Http/ReactorHandshakeFilter.cs → ...r.Impostor/Http/ReactorHandshakeFilter.cs b/...r.Impostor.Http/ReactorHandshakeFilter.cs → ...r.Impostor/Http/ReactorHandshakeFilter.cs
@@ -1,5 +1,5 @@
 using Impostor.Api.Games;
-using Impostor.Http;
+using Impostor.Api.Http;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 

diff --git a/Reactor.Impostor/Reactor.Impostor.csproj b/Reactor.Impostor/Reactor.Impostor.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Impostor.Api" Version="1.8.0" />
+        <PackageReference Include="Impostor.Api" Version="1.9.0" />
         <PackageReference Include="Reactor.Networking.Shared" Version="2.0.0" PrivateAssets="all" />
     </ItemGroup>
 

diff --git a/Reactor.Impostor/ReactorPluginStartup.cs b/Reactor.Impostor/ReactorPluginStartup.cs
@@ -1,20 +1,31 @@
 using Impostor.Api.Events;
+using Impostor.Api.Http;
 using Impostor.Api.Plugins;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Reactor.Impostor.Http;
 using Reactor.Impostor.Rpcs;
 
 namespace Reactor.Impostor;
 
-public class ReactorPluginStartup : IPluginStartup
+public class ReactorPluginStartup : IPluginHttpStartup
 {
     public void ConfigureServices(IServiceCollection services)
     {
         services.AddSingleton<IEventListener, HandshakeEventListener>();
         services.AddSingleton<IReactorCustomRpcManager, ReactorCustomRpcManager>();
+
+        services.AddSingleton<IListingFilter, ReactorHandshakeFilter>();
+        services.AddSingleton<ClientModsHeader>();
+    }
+
+    public void ConfigureWebApplication(IApplicationBuilder builder)
+    {
+        builder.UseMiddleware<ClientModsHeader>();
     }
 
     public void ConfigureHost(IHostBuilder host)
     {
     }
-}
+}