From cdc4336ed5383f2269680c7630ef859d8aac9c8d Mon Sep 17 00:00:00 2001 From: Guus Waals <_@guusw.nl> Date: Fri, 10 Jan 2025 20:46:18 +0800 Subject: [PATCH] Update build process and disable debug mode --- make_links_win | 3 ++- mod/Mod.cs | 4 ++-- mod/PLibBuildings/PBuilding.Utils.cs | 6 +++--- mod/build | 9 +++++++-- mod/oni-prio.csproj | 3 +-- oni-prio.sln | 4 ++-- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/make_links_win b/make_links_win index 8500b96..e9f3e11 100644 --- a/make_links_win +++ b/make_links_win @@ -1,3 +1,4 @@ ln -s "C:\Users\Guus\AppData\LocalLow\Klei\Oxygen Not Included" Logs ln -s "C:\Program Files (x86)\Steam\steamapps\common\OxygenNotIncluded" OxygenNotIncluded -ln -s "C:\Users\Guus\Documents\Klei\OxygenNotIncluded" OxygenNotIncludedData \ No newline at end of file +ln -s "C:\Users\Guus\Documents\Klei\OxygenNotIncluded" OxygenNotIncludedData +ln -s "C:\Program Files (x86)\Steam\steamapps\common\OxygenNotIncluded\OxygenNotIncluded_Data\Managed" Libs \ No newline at end of file diff --git a/mod/Mod.cs b/mod/Mod.cs index 37bdc67..f2ccdb2 100644 --- a/mod/Mod.cs +++ b/mod/Mod.cs @@ -20,11 +20,11 @@ namespace PriorityUX { public override void OnLoad(Harmony harmony) { Debug.Log("UX Mod Load"); - Harmony.DEBUG = true; + // Harmony.DEBUG = true; base.OnLoad(harmony); - Debug.Log("UX Mod PostLoad base"); + // Debug.Log("UX Mod PostLoad base"); PUtil.InitLibrary(); LocString.CreateLocStringKeys(typeof(Strings.PRIORITYUX)); diff --git a/mod/PLibBuildings/PBuilding.Utils.cs b/mod/PLibBuildings/PBuilding.Utils.cs index e1e1468..9344cc4 100644 --- a/mod/PLibBuildings/PBuilding.Utils.cs +++ b/mod/PLibBuildings/PBuilding.Utils.cs @@ -37,11 +37,11 @@ namespace PeterHan.PLib.Buildings { private static void ApplyAlwaysOperational(GameObject go) { // Remove default components that could make a building non-operational if (go.TryGetComponent(out BuildingEnabledButton enabled)) - Object.DestroyImmediate(enabled); + UnityEngine.Object.DestroyImmediate(enabled); if (go.TryGetComponent(out Operational op)) - Object.DestroyImmediate(op); + UnityEngine.Object.DestroyImmediate(op); if (go.TryGetComponent(out LogicPorts lp)) - Object.DestroyImmediate(lp); + UnityEngine.Object.DestroyImmediate(lp); } /// diff --git a/mod/build b/mod/build index 11cb79f..f83955b 100755 --- a/mod/build +++ b/mod/build @@ -1,13 +1,13 @@ #/bin/bash -msbuild=/Library/Frameworks/Mono.framework/Versions/6.12.0/bin/msbuild +msbuild=${msbuild:-/Library/Frameworks/Mono.framework/Versions/6.12.0/bin/msbuild} ROOT=$( cd "$(dirname "$0")" ; pwd -P ) pushd $ROOT # Do the build (need to use mono) # $msbuild -$msbuild -p:Configuration=Release +"$msbuild" -p:Configuration=Release set -x rm -rf dist @@ -15,3 +15,8 @@ mkdir dist # cp bin/Debug/net48/oni-prio.dll dist/ cp bin/Release/net48/oni-prio.dll dist/ cp -r meta/* dist/ + +MODPATH=../OxygenNotIncludedData/mods/Local/PriorityUX +rm -rf $MODPATH +mkdir -p $MODPATH +cp dist/* $MODPATH diff --git a/mod/oni-prio.csproj b/mod/oni-prio.csproj index 8bf06ca..6b646f4 100644 --- a/mod/oni-prio.csproj +++ b/mod/oni-prio.csproj @@ -1,11 +1,10 @@ - net48 oni_prio enable enable - 8.0 + 10.0 diff --git a/oni-prio.sln b/oni-prio.sln index 8821fa6..d44e42d 100644 --- a/oni-prio.sln +++ b/oni-prio.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "oni-prio", "mod\oni-prio.csproj", "{B5C0FB18-102D-434C-B8D7-2DDAE54367D6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "reference\Assembly-CSharp.csproj", "{501D90AF-582D-4F90-9FE6-1479FBA92A4B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "reference\Assembly-CSharp\Assembly-CSharp.csproj", "{501D90AF-582D-4F90-9FE6-1479FBA92A4B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "reference-firstpass\Assembly-CSharp-firstpass.csproj", "{F0AD7234-F5CE-4A5E-8E8A-F621F0B7C0A0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "reference\Assembly-CSharp-firstpass\Assembly-CSharp-firstpass.csproj", "{F0AD7234-F5CE-4A5E-8E8A-F621F0B7C0A0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution