readd 1.39 support

Aeroluna · Jan 14, 2025 · 46b8bf2 · 46b8bf2
1 parent 63d4583
commit 46b8bf2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     name: Build
     strategy:
       matrix:
-        game-version: [ 1.29.1, 1.34.2, 1.37.1, 1.40.0 ]
+        game-version: [ 1.29.1, 1.34.2, 1.37.1, 1.39.1, 1.40.0 ]
     uses: Aeroluna/workflows/.github/workflows/bs-build-version-release.yml@main
     with:
       project-path: Vivify/Vivify.csproj

diff --git a/Vivify.sln b/Vivify.sln
@@ -28,6 +28,8 @@ Global
 		Release-1.37.1|Any CPU = Release-1.37.1|Any CPU
 		Release-1.40.0|Any CPU = Release-1.40.0|Any CPU
 		Debug-1.40.0|Any CPU = Debug-1.40.0|Any CPU
+		Debug-1.39.1|Any CPU = Debug-1.39.1|Any CPU
+		Release-1.39.1|Any CPU = Release-1.39.1|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1A4D027F-DF68-498D-A3C7-89B997F38608}.Debug-1.34.2|Any CPU.ActiveCfg = Debug-1.34.2|Any CPU
@@ -46,6 +48,10 @@ Global
 		{1A4D027F-DF68-498D-A3C7-89B997F38608}.Release-1.40.0|Any CPU.Build.0 = Release-1.40.0|Any CPU
 		{1A4D027F-DF68-498D-A3C7-89B997F38608}.Debug-1.40.0|Any CPU.ActiveCfg = Debug-1.40.0|Any CPU
 		{1A4D027F-DF68-498D-A3C7-89B997F38608}.Debug-1.40.0|Any CPU.Build.0 = Debug-1.40.0|Any CPU
+		{1A4D027F-DF68-498D-A3C7-89B997F38608}.Debug-1.39.1|Any CPU.ActiveCfg = Debug-1.39.1|Any CPU
+		{1A4D027F-DF68-498D-A3C7-89B997F38608}.Debug-1.39.1|Any CPU.Build.0 = Debug-1.39.1|Any CPU
+		{1A4D027F-DF68-498D-A3C7-89B997F38608}.Release-1.39.1|Any CPU.ActiveCfg = Release-1.39.1|Any CPU
+		{1A4D027F-DF68-498D-A3C7-89B997F38608}.Release-1.39.1|Any CPU.Build.0 = Release-1.39.1|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Vivify/Controllers/CameraPropertyController.cs b/Vivify/Controllers/CameraPropertyController.cs
@@ -2,7 +2,7 @@
 using Vivify.Managers;
 using Vivify.PostProcessing;
 using Vivify.TrackGameObject;
-#if LATEST
+#if !PRE_V1_39_1
 using JetBrains.Annotations;
 using Zenject;
 #elif PRE_V1_37_1
@@ -21,7 +21,7 @@ internal class CameraPropertyController : MonoBehaviour
 
     private CullingCameraController _cullingCameraController = null!;
     private BloomPrePass _bloomPrePass = null!;
-#if LATEST
+#if !PRE_V1_39_1
     private SettingsManager _settingsManager = null!;
 #endif
 #if !PRE_V1_37_1
@@ -39,7 +39,7 @@ internal DepthTextureMode? DepthTextureMode
 #if !PRE_V1_37_1
                 if (_depthTextureController != null)
                 {
-#if LATEST
+#if !PRE_V1_39_1
                     _depthTextureController.Init(_settingsManager);
 #else
                     _depthTextureController.Start();
@@ -108,7 +108,7 @@ internal void Reset()
         MainEffect = null;
     }
 
-#if LATEST
+#if !PRE_V1_39_1
     [UsedImplicitly]
     [Inject]
     private void Construct(

diff --git a/Vivify/ObjectPrefab/Hijackers/MpbControllerHijacker.cs b/Vivify/ObjectPrefab/Hijackers/MpbControllerHijacker.cs
@@ -10,7 +10,7 @@ internal class MpbControllerHijacker : IHijacker<GameObject>
     private readonly Transform _child;
     private readonly MaterialPropertyBlockController _materialPropertyBlockController;
     private readonly Renderer[] _originalRenderers;
-#if !LATEST
+#if PRE_V1_39_1
     private List<int>? _cachedNumberOfMaterialsInRenderers;
 #endif
     private Renderer[]? _cachedRenderers;
@@ -40,7 +40,7 @@ public void Activate(List<GameObject> gameObjects, bool hideOriginal)
             gameObject.transform.SetParent(_child, false);
         }
 
-#if !LATEST
+#if PRE_V1_39_1
         if (_materialPropertyBlockController._isInitialized)
         {
             _cachedNumberOfMaterialsInRenderers =
@@ -72,7 +72,7 @@ public void Activate(List<GameObject> gameObjects, bool hideOriginal)
 
     public void Deactivate()
     {
-#if !LATEST
+#if PRE_V1_39_1
         if (_cachedNumberOfMaterialsInRenderers != null)
         {
             _materialPropertyBlockController._numberOfMaterialsInRenderers =

diff --git a/Vivify/Vivify.csproj b/Vivify/Vivify.csproj
@@ -5,14 +5,14 @@
     <OutputType>Library</OutputType>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
-    <Configurations>Debug-1.29.1;Release-1.29.1;Debug-1.34.2;Release-1.34.2;Debug-1.37.1;Release-1.37.1;Debug-1.40.0;Release-1.40.0</Configurations>
+    <Configurations>Debug-1.29.1;Release-1.29.1;Debug-1.34.2;Release-1.34.2;Debug-1.37.1;Release-1.37.1;Debug-1.39.1;Release-1.39.1;Debug-1.40.0;Release-1.40.0</Configurations>
   </PropertyGroup>
 
   <PropertyGroup>
     <PluginId>Vivify</PluginId>
     <PluginName>Vivify</PluginName>
     <Author>Aeroluna</Author>
-    <Version>0.1.13</Version>
+    <Version>0.1.14</Version>
     <Description>Bring your map to life!</Description>
   </PropertyGroup>
   <ItemGroup>