Merge pull request #33 from Falki-git/dev

Fix UniversalTime entries for KSP2 0.1.4
Micrologist · Sep 1, 2023 · bf1695f · bf1695f
2 parents d2e8cc2 + ea55437
commit bf1695f
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 19 deletions.
diff --git a/MicroEngineerProject/MicroEngineer.csproj b/MicroEngineerProject/MicroEngineer.csproj
@@ -9,8 +9,8 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="BepInEx.BaseLib" Version="5.4.21" Publicize="true" />
-		<PackageReference Include="SpaceWarp" Version="1.4.0"/>
-		<PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.1.3" PrivateAssets="all"/>
+		<PackageReference Include="SpaceWarp" Version="1.4.0" />
+		<PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.1.4" PrivateAssets="all" />
 	</ItemGroup>
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
 		<Exec Command="echo Killing task KSP2_x64.exe&#xD;&#xA;taskkill /f /fi &quot;pid gt 0&quot; /im KSP2_x64.exe&#xD;&#xA;&#xD;&#xA;echo Copying output .dll&#xD;&#xA;xcopy /y &quot;$(TargetDir)$(ProjectName).dll&quot; &quot;$(KSP2DIR)\BepInEx\plugins\micro_engineer\&quot;&#xD;&#xA;&#xD;&#xA;echo Copying output .pdb&#xD;&#xA;xcopy /y &quot;$(TargetDir)$(ProjectName).pdb&quot; &quot;$(KSP2DIR)\BepInEx\plugins\micro_engineer\&quot;&#xD;&#xA;&#xD;&#xA;echo Starting KSP2_x64.exe&#xD;&#xA;powershell &quot;start-process &quot;&quot;$(KSP2DIR)\KSP2_x64.exe&quot;&quot;&quot;" />

diff --git a/MicroEngineerProject/MicroEngineer/Entries/BaseEntry.cs b/MicroEngineerProject/MicroEngineer/Entries/BaseEntry.cs
@@ -182,15 +182,5 @@ public virtual string UnitDisplay
         }
 
         public virtual void RefreshData() { }
-    }
-
-    public class AltUnit
-    {
-        [JsonProperty]
-        public bool IsActive;
-        [JsonProperty]
-        public string Unit;
-        [JsonProperty]
-        public float Factor;
-    }
+    }    
 }
diff --git a/MicroEngineerProject/MicroEngineer/Entries/ManeuverEntries.cs b/MicroEngineerProject/MicroEngineer/Entries/ManeuverEntries.cs
@@ -133,7 +133,7 @@ public TimeToNode()
         public override void RefreshData()
         {
             List<ManeuverNodeData> nodes = Utility.ActiveVessel?.SimulationObject?.FindComponent<ManeuverPlanComponent>()?.GetNodes();
-            EntryValue = nodes?.ElementAtOrDefault(base.SelectedNodeIndex)?.Time - GameManager.Instance.Game.UniverseModel.UniversalTime;
+            EntryValue = nodes?.ElementAtOrDefault(base.SelectedNodeIndex)?.Time - Utility.UniversalTime;
         }
     }
 

diff --git a/MicroEngineerProject/MicroEngineer/Entries/OrbitalEntries.cs b/MicroEngineerProject/MicroEngineer/Entries/OrbitalEntries.cs
@@ -490,6 +490,7 @@ public SoiTransition()
         {
             Name = "SOI trans.";
             Description = "Shows the amount of time it will take to transition to another Sphere Of Influence.";
+            EntryType = EntryType.Time;
             Category = MicroEntryCategory.Orbital;
             IsDefault = false;
             BaseUnit = "s";
@@ -498,7 +499,7 @@ public SoiTransition()
 
         public override void RefreshData()
         {
-            EntryValue = Utility.ActiveVessel.Orbit.UniversalTimeAtSoiEncounter - GameManager.Instance.Game.UniverseModel.UniversalTime;
+            EntryValue = Utility.ActiveVessel.Orbit.UniversalTimeAtSoiEncounter - Utility.UniversalTime;
         }
     }  
 }
diff --git a/MicroEngineerProject/MicroEngineer/MicroEngineerMod.cs b/MicroEngineerProject/MicroEngineer/MicroEngineerMod.cs
@@ -9,7 +9,7 @@
 
 namespace MicroMod
 {
-    [BepInPlugin("com.micrologist.microengineer", "MicroEngineer", "1.3.0")]
+    [BepInPlugin("com.micrologist.microengineer", "MicroEngineer", "1.3.1")]
     [BepInDependency(SpaceWarpPlugin.ModGuid, SpaceWarpPlugin.ModVer)]
     public class MicroEngineerMod : BaseSpaceWarpPlugin
 	{

diff --git a/MicroEngineerProject/MicroEngineer/Utilities/AltUnit.cs b/MicroEngineerProject/MicroEngineer/Utilities/AltUnit.cs
@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+
+namespace MicroMod
+{
+    /// <summary>
+    /// An alternative unit, activated by double-clicking the entry
+    /// </summary>
+    public class AltUnit
+    {
+        [JsonProperty]
+        public bool IsActive;
+        [JsonProperty]
+        public string Unit;
+        [JsonProperty]
+        public float Factor;
+    }
+}
diff --git a/MicroEngineerProject/MicroEngineer/Utilities/Utility.cs b/MicroEngineerProject/MicroEngineer/Utilities/Utility.cs
@@ -23,7 +23,7 @@ public static class Utility
         public static GameStateConfiguration GameState;
         public static MessageCenter MessageCenter;
         public static VesselDeltaVComponent VesselDeltaVComponentOAB;
-        public static double UniversalTime => GameManager.Instance.Game.UniverseModel.UniversalTime;
+        public static double UniversalTime => GameManager.Instance.Game.UniverseModel.UniverseTime;
 
         /// <summary>
         /// Refreshes the ActiveVessel and CurrentManeuver

diff --git a/Staging/BepInEx/plugins/micro_engineer/swinfo.json b/Staging/BepInEx/plugins/micro_engineer/swinfo.json
@@ -5,7 +5,7 @@
     "name": "Micro Engineer",
     "description": "Get in-flight and VAB information about your current vessel",
     "source": "https://github.com/Micrologist/MicroEngineer",
-    "version": "1.3.0",
+    "version": "1.3.1",
 	"version_check": "https://raw.githubusercontent.com/Micrologist/MicroEngineer/main/Staging/BepInEx/plugins/micro_engineer/swinfo.json",
     "dependencies": [
 		{
@@ -24,7 +24,7 @@
 		}
 	],
     "ksp2_version": {
-        "min": "0.1.0",
+        "min": "0.1.4",
         "max": "*"
     }
 }