Skip to content

Dlc multiplayer maintenance #386

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
JiangNanGenius wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Dlc multiplayer maintenance #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
38321af
Fix build compatibility with current ONI version
zed-assistant[bot] Mar 19, 2026
74c401f
Fix test project build compatibility with current ONI version
zed-assistant[bot] Mar 19, 2026
e47b2eb
Add test runner infrastructure (NUnit3TestAdapter + Microsoft.NET.Tes…
zed-assistant[bot] Mar 19, 2026
ad8db98
Update minimum supported game build to current version
zed-assistant[bot] Mar 19, 2026
c7b0687
Fix test infrastructure: 116->331 passing tests (300->85 failures)
zed-assistant[bot] Mar 19, 2026
3de333f
Fix personality lookup: provide test CSV data instead of error suppre…
zed-assistant[bot] Mar 19, 2026
038fffe
Add DedicatedServer with web visualizer (#384)
zed-assistant[bot] Mar 20, 2026
5b46b00
docs: start dlc multiplayer maintenance line
JiangNanGenius Jun 18, 2026
04be7f5
docs: research current dlc multiplayer requirements
JiangNanGenius Jun 18, 2026
2a927a2
feat: add dlc multiplayer preview safeguards
JiangNanGenius Jun 18, 2026
3c9ce85
feat: harden dlc save transport
JiangNanGenius Jun 18, 2026
c0ccccf
feat: harden dlc world interactions
JiangNanGenius Jun 18, 2026
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
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,8 @@ src/Assembly-CSharp
src/*/bin/
src/*/obj/
/lib

# Decompiled game sources — NEVER commit (intellectual property of Klei Entertainment)
/decompiled/
# Vite build output (served at runtime, not tracked in git)
src/DedicatedServer/wwwroot/assets/
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<PropertyGroup>
<ExposedLibrariesPath>$(MSBuildThisFileDirectory)\lib\exposed</ExposedLibrariesPath>
<ManagedPath>$(SteamLibraryPath)\steamapps\common\OxygenNotIncluded\OxygenNotIncluded_Data\Managed</ManagedPath>
<ModInstallationPath>$(UserProfile)\Documents\Klei\OxygenNotIncluded\mods\dev\$(MSBuildProjectName)</ModInstallationPath>
<ManagedPath Condition="'$(ManagedPath)' == ''">$(SteamLibraryPath)\steamapps\common\OxygenNotIncluded\OxygenNotIncluded_Data\Managed</ManagedPath>
<ModInstallationPath Condition="'$(ModInstallationPath)' == ''">$(UserProfile)\Documents\Klei\OxygenNotIncluded\mods\dev\$(MSBuildProjectName)</ModInstallationPath>
</PropertyGroup>

</Project>
6 changes: 6 additions & 0 deletions Directory.Build.props.user.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<SteamLibraryPath>C:\Program Files (x86)\Steam</SteamLibraryPath>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>

<Target Name="ExposeAssemblies" BeforeTargets="PreBuildEvent">
<Target Name="ExposeAssemblies" BeforeTargets="PreBuildEvent" Condition="'$(SkipAssemblyExposure)' != 'true'">
<ItemGroup>
<ExposeAssemblies Include="$(ManagedPath)\Assembly-CSharp*.dll"/>
<ExposureRules Include="Private and internal targets to public">
Expand Down Expand Up @@ -42,7 +42,7 @@
<ExposeAssembly SourceAssemblies="@(ExposeAssemblies)" Rules="@(ExposureRules)" OutputDirectory="$(ExposedLibrariesPath)"/>
</Target>

<Target Name="ExposeUnityAssemblies" BeforeTargets="PreBuildEvent">
<Target Name="ExposeUnityAssemblies" BeforeTargets="PreBuildEvent" Condition="'$(SkipAssemblyExposure)' != 'true'">
<ItemGroup>
<UnityAssemblies Include="$(ManagedPath)\UnityEngine.CoreModule.dll"/>
<UnityAssemblies Include="$(ManagedPath)\UnityEngine.UI.dll"/>
Expand Down Expand Up @@ -70,7 +70,7 @@
<ExposeAssembly SourceAssemblies="@(UnityAssemblies)" Rules="@(UnityExposureRules)" OutputDirectory="$(ExposedLibrariesPath)"/>
</Target>

<Target Name="ExposeHarmonyAssembly" BeforeTargets="PreBuildEvent">
<Target Name="ExposeHarmonyAssembly" BeforeTargets="PreBuildEvent" Condition="'$(SkipAssemblyExposure)' != 'true'">
<ItemGroup>
<HarmonyAssembly Include="$(ManagedPath)\0Harmony.dll"/>
<HarmonyExposureRules Include="Private and internal targets to public">
Expand Down
91 changes: 84 additions & 7 deletions OniMod.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiplayerMod", "src\Multi
EndProject
Project("{C0999D99-C6B1-4F7D-84EF-280F85768CD7}") = "Assembly-CSharp-firstpass", "src\Assembly-CSharp-firstpass\Assembly-CSharp-firstpass.csproj", "{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}"
EndProject
Project("{20A232E7-7449-4BDC-8C56-E1ED6AE24F2A}") = "Assembly-CSharp", "src\Assembly-CSharp\Assembly-CSharp.csproj", "{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}"
Project("{20A232E7-7449-4BDC-8C56-E1ED6AE24F2A}") = "Assembly-CSharp", "src\Assembly-CSharp\Assembly-CSharp.csproj", "{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{E643528F-7D08-43AF-8D51-60C6AB5D49EF}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -38,30 +38,107 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "steamworkshop", "steamworks
steamworkshop\STEAMWORSHOP_DESCRIPTION.md = steamworkshop\STEAMWORSHOP_DESCRIPTION.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DedicatedServer", "src\DedicatedServer\DedicatedServer.csproj", "{D1F86700-E48D-4892-9576-DCB20AC2E2F6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Publish|Any CPU = Publish|Any CPU
Publish|x64 = Publish|x64
Publish|x86 = Publish|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Release|Any CPU.Build.0 = Release|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Release|x64.ActiveCfg = Release|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Release|x64.Build.0 = Release|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Release|x86.ActiveCfg = Release|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Release|x86.Build.0 = Release|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Debug|x64.ActiveCfg = Debug|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Debug|x64.Build.0 = Debug|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Debug|x86.ActiveCfg = Debug|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Debug|x86.Build.0 = Debug|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Publish|Any CPU.Build.0 = Publish|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Publish|x64.ActiveCfg = Publish|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Publish|x64.Build.0 = Publish|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Publish|x86.ActiveCfg = Publish|Any CPU
{8CF3CE61-EFA2-422A-BDB9-CD8BC5376CCB}.Publish|x86.Build.0 = Publish|Any CPU
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Release|x64.ActiveCfg = Release|x64
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Release|x64.Build.0 = Release|x64
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Release|x86.ActiveCfg = Release|x86
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Release|x86.Build.0 = Release|x86
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Debug|x64.ActiveCfg = Debug|x64
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Debug|x64.Build.0 = Debug|x64
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Debug|x86.ActiveCfg = Debug|x86
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Debug|x86.Build.0 = Debug|x86
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Publish|x64.ActiveCfg = Publish|x64
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Publish|x64.Build.0 = Publish|x64
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Publish|x86.ActiveCfg = Publish|x86
{CBFB9C4F-74EA-4D63-ADA1-80A1C21B41E3}.Publish|x86.Build.0 = Publish|x86
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Release|x64.ActiveCfg = Release|x64
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Release|x64.Build.0 = Release|x64
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Release|x86.ActiveCfg = Release|x86
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Release|x86.Build.0 = Release|x86
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Debug|x64.ActiveCfg = Debug|x64
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Debug|x64.Build.0 = Debug|x64
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Debug|x86.ActiveCfg = Debug|x86
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Debug|x86.Build.0 = Debug|x86
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Publish|x64.ActiveCfg = Publish|x64
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Publish|x64.Build.0 = Publish|x64
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Publish|x86.ActiveCfg = Publish|x86
{8A5C5C20-01E6-9CDA-EE78-EDB31621438E}.Publish|x86.Build.0 = Publish|x86
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Release|x64.ActiveCfg = Release|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Release|x64.Build.0 = Release|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Release|x86.ActiveCfg = Release|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Release|x86.Build.0 = Release|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Debug|x64.ActiveCfg = Debug|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Debug|x64.Build.0 = Debug|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Debug|x86.ActiveCfg = Debug|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Debug|x86.Build.0 = Debug|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Publish|x64.ActiveCfg = Publish|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Publish|x64.Build.0 = Publish|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Publish|x86.ActiveCfg = Publish|Any CPU
{0C3E1EF7-5EFB-4FAC-B676-2C0660E959AA}.Publish|x86.Build.0 = Publish|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Release|Any CPU.Build.0 = Release|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Release|x64.ActiveCfg = Release|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Release|x64.Build.0 = Release|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Release|x86.ActiveCfg = Release|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Release|x86.Build.0 = Release|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Debug|x64.ActiveCfg = Debug|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Debug|x64.Build.0 = Debug|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Debug|x86.ActiveCfg = Debug|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Debug|x86.Build.0 = Debug|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Publish|Any CPU.Build.0 = Debug|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Publish|x64.ActiveCfg = Debug|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Publish|x64.Build.0 = Debug|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Publish|x86.ActiveCfg = Debug|Any CPU
{D1F86700-E48D-4892-9576-DCB20AC2E2F6}.Publish|x86.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{D1F86700-E48D-4892-9576-DCB20AC2E2F6} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B532045A-7A46-4262-AE5F-F663106A26E5}
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
EndGlobal
8 changes: 7 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@

This is a mod which adds multiplayer support to Oxygen not included game.

## DLC compatibility PR preview

This branch is a preview pull request for DLC-compatible multiplayer work. It keeps the upstream mod identity and focuses
on current ONI metadata, pre-load compatibility checks, large save transfer reliability, and first-pass multi-world
safety. See [DLC Multiplayer Roadmap](docs/DLC_MULTIPLAYER_ROADMAP.md) for the current plan.

## Current stage and status

Status: In development
Stage: Early WIP and proof of concept

Working functionality:

- Currently tested in Vanilla only (NO DLC)
- DLC preview support is in progress; runtime smoke testing is still required before calling DLC stable.
- Main menu UI
- Join/Load/Create MP game
- Steam overlay support
Expand Down
Loading