CyberSys
diff --git a/‎ModuleManager/CustomConfigsManager.cs‎
Lines changed: 0 additions & 37 deletions b/‎ModuleManager/CustomConfigsManager.cs‎
Lines changed: 0 additions & 37 deletions
diff --git a/‎Source/ModuleManager/CustomConfigsManager.cs‎
Lines changed: 10 additions & 17 deletions b/‎Source/ModuleManager/CustomConfigsManager.cs‎
Lines changed: 10 additions & 17 deletions
diff --git a/‎ModuleManager/Logging/LogSplitter.cs‎ ‎…rce/ModuleManager/Logging/LogSplitter.cs‎ModuleManager/Logging/LogSplitter.cs renamed to Source/ModuleManager/Logging/LogSplitter.cs b/‎ModuleManager/Logging/LogSplitter.cs‎ ‎…rce/ModuleManager/Logging/LogSplitter.cs‎ModuleManager/Logging/LogSplitter.cs renamed to Source/ModuleManager/Logging/LogSplitter.cs
diff --git a/‎ModuleManager/Logging/QueueLogRunner.cs‎ ‎…/ModuleManager/Logging/QueueLogRunner.cs‎ModuleManager/Logging/QueueLogRunner.cs renamed to Source/ModuleManager/Logging/QueueLogRunner.cs b/‎ModuleManager/Logging/QueueLogRunner.cs‎ ‎…/ModuleManager/Logging/QueueLogRunner.cs‎ModuleManager/Logging/QueueLogRunner.cs renamed to Source/ModuleManager/Logging/QueueLogRunner.cs
diff --git a/‎ModuleManager/MMPatchRunner.cs‎ ‎Source/ModuleManager/MMPatchRunner.cs‎ModuleManager/MMPatchRunner.cs renamed to Source/ModuleManager/MMPatchRunner.cs b/‎ModuleManager/MMPatchRunner.cs‎ ‎Source/ModuleManager/MMPatchRunner.cs‎ModuleManager/MMPatchRunner.cs renamed to Source/ModuleManager/MMPatchRunner.cs
diff --git a/‎ModuleManager/PostPatchLoader.cs‎ ‎Source/ModuleManager/PostPatchLoader.cs‎ModuleManager/PostPatchLoader.cs renamed to Source/ModuleManager/PostPatchLoader.cs b/‎ModuleManager/PostPatchLoader.cs‎ ‎Source/ModuleManager/PostPatchLoader.cs‎ModuleManager/PostPatchLoader.cs renamed to Source/ModuleManager/PostPatchLoader.cs
@@ -2,42 +2,35 @@
 using System.IO;
 using UnityEngine;
 
+using static ModuleManager.FilePathRepository;
+
 namespace ModuleManager
 {
     [KSPAddon(KSPAddon.Startup.SpaceCentre, false)]
     public class CustomConfigsManager : MonoBehaviour
     {
-		static bool start_techtree_loaded = false;
-		static bool start_physics_loaded = false;
         internal void Start()
         {
-#if false
-			Log("Blah");
-            Log(HighLogic.CurrentGame.Parameters.Career.TechTreeUrl);
-			Log(MMPatchLoader.TECHTREE_CONFIG.Path);
-			Log(MMPatchLoader.TECHTREE_CONFIG.IsLoadable.ToString());
-#endif            
-			if (!start_techtree_loaded && MMPatchLoader.TECHTREE_CONFIG.IsLoadable)
+            if (HighLogic.CurrentGame.Parameters.Career.TechTreeUrl != techTreeFile &&  File.Exists(techTreePath))
             {
                 Log("Setting modded tech tree as the active one");
-                HighLogic.CurrentGame.Parameters.Career.TechTreeUrl = MMPatchLoader.TECHTREE_CONFIG.KspPath;
-				start_techtree_loaded = true;
+                HighLogic.CurrentGame.Parameters.Career.TechTreeUrl = techTreeFile;
             }
 
-			if (!start_physics_loaded && MMPatchLoader.PHYSICS_CONFIG.IsLoadable)
+            if (PhysicsGlobals.PhysicsDatabaseFilename != physicsFile && File.Exists(physicsPath))
             {
                 Log("Setting modded physics as the active one");
-                PhysicsGlobals.PhysicsDatabaseFilename = MMPatchLoader.PHYSICS_CONFIG.Path;
+
+                PhysicsGlobals.PhysicsDatabaseFilename = physicsFile;
+
                 if (!PhysicsGlobals.Instance.LoadDatabase())
                     Log("Something went wrong while setting the active physics config.");
-                start_physics_loaded = true;
             }
         }
 
-		private static readonly KSPe.Util.Log.Logger log = KSPe.Util.Log.Logger.CreateForType<CustomConfigsManager>();
-        private static void Log(String s)
+        public static void Log(String s)
         {
-            log.info(s);
+            print("[CustomConfigsManager] " + s);
         }
 
     }
Original file line number	Diff line number	Diff line change
`@@ -2,42 +2,35 @@`
`2`	`2`	`using System.IO;`
`3`	`3`	`using UnityEngine;`
`4`	`4`
	`5`	`+using static ModuleManager.FilePathRepository;`
	`6`	`+`
`5`	`7`	`namespace ModuleManager`
`6`	`8`	`{`
`7`	`9`	`[KSPAddon(KSPAddon.Startup.SpaceCentre, false)]`
`8`	`10`	`public class CustomConfigsManager : MonoBehaviour`
`9`	`11`	`{`
`10`		`- static bool start_techtree_loaded = false;`
`11`		`- static bool start_physics_loaded = false;`
`12`	`12`	`internal void Start()`
`13`	`13`	`{`
`14`		`-#if false`
`15`		`- Log("Blah");`
`16`		`- Log(HighLogic.CurrentGame.Parameters.Career.TechTreeUrl);`
`17`		`- Log(MMPatchLoader.TECHTREE_CONFIG.Path);`
`18`		`- Log(MMPatchLoader.TECHTREE_CONFIG.IsLoadable.ToString());`
`19`		`-#endif`
`20`		`- if (!start_techtree_loaded && MMPatchLoader.TECHTREE_CONFIG.IsLoadable)`
	`14`	`+ if (HighLogic.CurrentGame.Parameters.Career.TechTreeUrl != techTreeFile && File.Exists(techTreePath))`
`21`	`15`	`{`
`22`	`16`	`Log("Setting modded tech tree as the active one");`
`23`		`- HighLogic.CurrentGame.Parameters.Career.TechTreeUrl = MMPatchLoader.TECHTREE_CONFIG.KspPath;`
`24`		`- start_techtree_loaded = true;`
	`17`	`+ HighLogic.CurrentGame.Parameters.Career.TechTreeUrl = techTreeFile;`
`25`	`18`	`}`
`26`	`19`
`27`		`- if (!start_physics_loaded && MMPatchLoader.PHYSICS_CONFIG.IsLoadable)`
	`20`	`+ if (PhysicsGlobals.PhysicsDatabaseFilename != physicsFile && File.Exists(physicsPath))`
`28`	`21`	`{`
`29`	`22`	`Log("Setting modded physics as the active one");`
`30`		`- PhysicsGlobals.PhysicsDatabaseFilename = MMPatchLoader.PHYSICS_CONFIG.Path;`
	`23`	`+`
	`24`	`+ PhysicsGlobals.PhysicsDatabaseFilename = physicsFile;`
	`25`	`+`
`31`	`26`	`if (!PhysicsGlobals.Instance.LoadDatabase())`
`32`	`27`	`Log("Something went wrong while setting the active physics config.");`
`33`		`- start_physics_loaded = true;`
`34`	`28`	`}`
`35`	`29`	`}`
`36`	`30`
`37`		`- private static readonly KSPe.Util.Log.Logger log = KSPe.Util.Log.Logger.CreateForType<CustomConfigsManager>();`
`38`		`- private static void Log(String s)`
	`31`	`+ public static void Log(String s)`
`39`	`32`	`{`
`40`		`- log.info(s);`
	`33`	`+ print("[CustomConfigsManager] " + s);`
`41`	`34`	`}`
`42`	`35`
`43`	`36`	`}`