From 8356a1c3e10457119b9cc30b8e53692c618357af Mon Sep 17 00:00:00 2001 From: NathanKell Date: Fri, 22 Jul 2022 00:14:03 -0700 Subject: [PATCH] TEMP: rolling back RF 15.2 requirement and MECBase/SanitizeName ref so this compiles against RF v13. REVERSE ME when the dll package is updated. --- Source/KerbalConstructionTime/Properties/AssemblyInfo.cs | 2 +- Source/KerbalConstructionTime/Utilities/Utilities.cs | 8 ++++---- Source/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/KerbalConstructionTime/Properties/AssemblyInfo.cs b/Source/KerbalConstructionTime/Properties/AssemblyInfo.cs index afa82cd474e..6fe0fe8708f 100644 --- a/Source/KerbalConstructionTime/Properties/AssemblyInfo.cs +++ b/Source/KerbalConstructionTime/Properties/AssemblyInfo.cs @@ -18,6 +18,6 @@ [assembly: AssemblyFileVersion("2.3.2.0")] [assembly: KSPAssembly("KerbalConstructionTime", 2, 0)] -[assembly: KSPAssemblyDependency("RealFuels", 15, 1)] +[assembly: KSPAssemblyDependency("RealFuels", 12, 7)] [assembly: KSPAssemblyDependency("ClickThroughBlocker", 1, 8)] [assembly: KSPAssemblyDependency("ToolbarController", 1, 0)] diff --git a/Source/KerbalConstructionTime/Utilities/Utilities.cs b/Source/KerbalConstructionTime/Utilities/Utilities.cs index a97d9feafdc..c78ddac7140 100644 --- a/Source/KerbalConstructionTime/Utilities/Utilities.cs +++ b/Source/KerbalConstructionTime/Utilities/Utilities.cs @@ -2144,7 +2144,7 @@ public static Tuple> GetVesselUnlockInfo(ShipConstruct ship) if (rawCost == ecmEstCost) { // this part is managed by the ECM, save its name later for a batch request - string sanitizedName = RealFuels.Utilities.SanitizeName(part.name); + string sanitizedName = RealFuels.Utilities.GetPartName(part.name); if (!ecmPartsList.Contains(sanitizedName)) ecmPartsList.Add(sanitizedName); } @@ -2162,10 +2162,10 @@ public static Tuple> GetVesselUnlockInfo(ShipConstruct ship) // now back through the list looking for upgrades to add to our batch list foreach (Part p in ship.Parts) { - var mecs = p.FindModulesImplementing(); - foreach (RealFuels.ModuleEngineConfigsBase mec in mecs) + var mecs = p.FindModulesImplementing(); + foreach (RealFuels.ModuleEngineConfigs mec in mecs) { - string sanitizedName = RealFuels.Utilities.SanitizeName(mec.configuration); + string sanitizedName = RealFuels.Utilities.GetPartName(mec.configuration); if (ecmPartsList.Contains(sanitizedName)) continue; diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs index 4887c8bdbc0..b8687e2c2f3 100644 --- a/Source/Properties/AssemblyInfo.cs +++ b/Source/Properties/AssemblyInfo.cs @@ -41,6 +41,6 @@ [assembly: KSPAssembly("RP-0", 1, 0)] [assembly: KSPAssemblyDependency("ModularFlightIntegrator", 1, 0)] -[assembly: KSPAssemblyDependency("RealFuels", 15, 1)] +[assembly: KSPAssemblyDependency("RealFuels", 12, 7)] [assembly: KSPAssemblyDependency("ClickThroughBlocker", 1, 8)] [assembly: KSPAssemblyDependency("KerbalConstructionTime", 2, 0)]