Merge pull request #29 from Sigma88/Development

Sigma88 · web-flow · commit cfa27a1460ed · 2016-12-08T01:37:39.000+01:00
v1.6.2
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,8 @@
+**v1.6.2**
+
+- Updated to KSP 1.2.2 and Kopernicus 1.2.2-1
+
+
 **v1.6.1**
 
 - Fixed Kopernicus compatibility (again)
diff --git a/GameData/Sigma/Binary/Plugins/SigmaBinary.dll b/GameData/Sigma/Binary/Plugins/SigmaBinary.dll
diff --git a/GameData/Sigma/Binary/SigmaBinary.version b/GameData/Sigma/Binary/SigmaBinary.version
@@ -13,7 +13,7 @@
 	{
 		"MAJOR": 1,
 		"MINOR": 6,
-		"PATCH": 1,
+		"PATCH": 2,
 		"BUILD": 0
 	},
 	"KSP_VERSION":
diff --git a/[Source]/Distribution/SigmaBinary.dll b/[Source]/Distribution/SigmaBinary.dll
diff --git a/[Source]/SigmaBinary/ArchivesFixer.cs b/[Source]/SigmaBinary/ArchivesFixer.cs
@@ -1,12 +1,9 @@
 using System.Collections.Generic;
-using UnityEngine;
-using System;
-using System.Threading;
-using System.Reflection;
 using System.Linq;
+using System.Reflection;
+using UnityEngine;
 using KSP.UI.Screens;
-using KSP.UI;
-using Kopernicus.Components;
+
 
 namespace SigmaBinaryPlugin
 {
@@ -22,7 +19,7 @@ void Update()
             }
         }
     }
-    
+
     public class ArchivesFixer : MonoBehaviour
     {
         void Start()
diff --git a/[Source]/SigmaBinary/KerbinFixer.cs b/[Source]/SigmaBinary/KerbinFixer.cs
@@ -1,13 +1,6 @@
-﻿using System;
-using System.Linq;
-using System.Collections.Generic;
-
+﻿using System.Collections.Generic;
 using UnityEngine;
 
-using Kopernicus.Components;
-using Kopernicus.Configuration;
-
-
 
 namespace SigmaBinaryPlugin
 {
@@ -29,9 +22,8 @@ void Start()
             {
                 List<MapObject> trackingstation = new List<MapObject>();
                 List<string> children = new List<string>();
-                
-                children.Add("Kerbin");
 
+                children.Add("Kerbin");
 
                 for (int count = 1; count > 0;)
                 {
@@ -46,7 +38,6 @@ void Start()
                     }
                 }
 
-
                 foreach (MapObject m in PlanetariumCamera.fetch.targets)
                 {
                     if (m != null)
@@ -66,10 +57,9 @@ void Start()
                     }
                 }
 
-
                 PlanetariumCamera.fetch.targets.Clear();
                 PlanetariumCamera.fetch.targets.AddRange(trackingstation);
             }
         }
     }
-}
+}
diff --git a/[Source]/SigmaBinary/LateFixes.cs b/[Source]/SigmaBinary/LateFixes.cs
@@ -1,17 +1,13 @@
 ﻿using System;
 using System.Linq;
 using System.Collections.Generic;
-
 using UnityEngine;
-
+using KSP.UI.Screens;
 using Kopernicus;
 using Kopernicus.Components;
 using Kopernicus.Configuration;
 using Kopernicus.OnDemand;
 
-using KSP.UI.Screens;
-
-
 
 namespace SigmaBinaryPlugin
 {
diff --git a/[Source]/SigmaBinary/MapViewFixer.cs b/[Source]/SigmaBinary/MapViewFixer.cs
@@ -1,28 +1,23 @@
- 
-using UnityEngine;
-using Kopernicus.Components;
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Linq;
-using JetBrains.Annotations;
-using Kopernicus.Configuration;
-using KSP.UI.Screens;
+using UnityEngine;
 using KSP.UI.Screens.Mapview;
 using KSP.UI.Screens.Mapview.MapContextMenuOptions;
+using Kopernicus.Components;
+
 
 namespace SigmaBinaryPlugin
 {
     [KSPAddon(KSPAddon.Startup.MainMenu, true)]
     public class MapViewFixer : MonoBehaviour
     {
         private FieldInfo[] fields;
-        
+
         void Awake()
         {
             DontDestroyOnLoad(this);
         }
-        
+
         void LateUpdate()
         {
             if (MapView.MapIsEnabled)
@@ -37,8 +32,8 @@ void LateUpdate()
                 if (FlightGlobals.ActiveVessel != null)
                 {
                     OrbitTargeter targeter = FlightGlobals.ActiveVessel.orbitTargeter;
-                    
-                    Int32 mode = (Int32)fields[0].GetValue(targeter);
+
+                    int mode = (int)fields[0].GetValue(targeter);
                     if (mode == 2)
                     {
                         OrbitRenderer.OrbitCastHit cast = (OrbitRenderer.OrbitCastHit)fields[2].GetValue(targeter);
@@ -50,7 +45,7 @@ void LateUpdate()
                             CelestialBody body2 = PSystemManager.Instance.localBodies.Find(b => b.transform.name == SigmaBinary.mapViewFixerList[body.transform.name]);
 
                             ((MapContextMenu)fields[1].GetValue(targeter)).Dismiss();
-                            
+
                             MapContextMenu context =
                                 MapContextMenu.Create
                                 (
diff --git a/[Source]/SigmaBinary/PeriodFixer.cs b/[Source]/SigmaBinary/PeriodFixer.cs
@@ -1,13 +1,6 @@
 ﻿using System;
-using System.Linq;
-using System.Collections.Generic;
-
 using UnityEngine;
 
-using Kopernicus.Components;
-using Kopernicus.Configuration;
-
-
 
 namespace SigmaBinaryPlugin
 {
@@ -32,3 +25,4 @@ void Start()
         }
     }
 }
+
diff --git a/[Source]/SigmaBinary/SigmaBinary.cs b/[Source]/SigmaBinary/SigmaBinary.cs
@@ -1,20 +1,16 @@
 ﻿using System;
 using System.Linq;
 using System.Collections.Generic;
-
 using UnityEngine;
-
 using Kopernicus.Components;
 using Kopernicus.Configuration;
-using Kopernicus.OnDemand;
 using Kopernicus;
 
 
-
 namespace SigmaBinaryPlugin
 {
-    [ExternalParserTarget("Properties")]
-    public class SigmaBinary : ExternalParserTargetLoader, IParserEventSubscriber
+    [ParserTargetExternal("Body", "Properties")]
+    public class SigmaBinary : BaseLoader, IParserEventSubscriber
     {
 
         public static List<Body> ListOfBodies = new List<Body>();
@@ -37,8 +33,6 @@ public class SigmaBinary : ExternalParserTargetLoader, IParserEventSubscriber
         public static Dictionary<Body, EnumParser<OrbitRenderer.DrawIcons>> sigmabinaryIcon = new Dictionary<Body, EnumParser<OrbitRenderer.DrawIcons>>();
 
 
-
-
         void IParserEventSubscriber.Apply(ConfigNode node)
         {
         }
@@ -77,7 +71,6 @@ void IParserEventSubscriber.PostApply(ConfigNode node)
 
 
 
-
                 /// Generating Binary System
 
 
@@ -104,7 +97,6 @@ void IParserEventSubscriber.PostApply(ConfigNode node)
 
 
 
-
                 /// Set Barycenter
 
                 sbBarycenter.generatedBody.orbitDriver.orbit = new Orbit(sbPrimary.generatedBody.orbitDriver.orbit);
@@ -175,7 +167,6 @@ void IParserEventSubscriber.PostApply(ConfigNode node)
 
 
 
-
                 /// Set Primary
 
                 if (!archivesFixerList.ContainsKey(sbPrimary.name))
@@ -214,7 +205,6 @@ void IParserEventSubscriber.PostApply(ConfigNode node)
 
 
 
-
                 /// Set Secondary Orbit
 
                 if (sigmabinaryRedrawOrbit.Contains(sbSecondary))
@@ -247,7 +237,6 @@ void IParserEventSubscriber.PostApply(ConfigNode node)
 
 
 
-
                 /// Set SphereOfInfluence for Barycenter and Primary
 
                 if (!cbPrimary.Has("sphereOfInfluence"))
@@ -273,7 +262,6 @@ void IParserEventSubscriber.PostApply(ConfigNode node)
 
 
 
-
                 /// Binary System Completed
 
                 ListOfBinaries.Remove(ListOfBinaries.First(x => x.Value == sbSecondary).Key);
diff --git a/[Source]/SigmaBinary/SigmaBinary.csproj b/[Source]/SigmaBinary/SigmaBinary.csproj
@@ -31,14 +31,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\KerbalSpaceProgram\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="Assembly-CSharp-firstpass, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\KerbalSpaceProgram\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
-    </Reference>
     <Reference Include="Kopernicus, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Kopernicus\Kopernicus.dll</HintPath>
@@ -51,16 +47,13 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Kopernicus\Kopernicus.OnDemand.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
+    <Reference Include="Kopernicus.Parser">
+      <HintPath>..\Kopernicus\Kopernicus.Parser.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\KerbalSpaceProgram\KSP_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\KerbalSpaceProgram\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MapViewFixer.cs" />
diff --git a/[Source]/SigmaBinary/SigmaBinaryLoader.cs b/[Source]/SigmaBinary/SigmaBinaryLoader.cs
@@ -1,18 +1,11 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-
-using UnityEngine;
-
-using Kopernicus.Components;
+using Kopernicus;
 using Kopernicus.Configuration;
 
 
-
 namespace SigmaBinaryPlugin
 {
-    [ExternalParserTarget("SigmaBinary")]
-    public class SigmaBinaryLoader : ExternalParserTargetLoader, IParserEventSubscriber
+    [ParserTargetExternal("Body", "SigmaBinary")]
+    public class SigmaBinaryLoader : BaseLoader, IParserEventSubscriber
     {
         public PeriodFixer periodFixer { get; set; }
         public KerbinFixer kerbinFixer { get; set; }
@@ -78,6 +71,7 @@ void IParserEventSubscriber.PostApply(ConfigNode node)
                 LoadAfter(Loader.currentBody);
             }
         }
+
         public void LoadAfter(Body currentBody)
         {
             if (SigmaBinary.sigmabinaryLoadAfter.ContainsKey(currentBody.name))
@@ -88,6 +82,7 @@ public void LoadAfter(Body currentBody)
                 LoadAfter(body);
             }
         }
+
         public SigmaBinaryLoader()
         {
         }
@@ -171,5 +166,4 @@ public SigmaBinaryOrbitLoader()
         {
         }
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`{`
`14`	`14`	`"MAJOR": 1,`
`15`	`15`	`"MINOR": 6,`
`16`		`- "PATCH": 1,`
	`16`	`+ "PATCH": 2,`
`17`	`17`	`"BUILD": 0`
`18`	`18`	`},`
`19`	`19`	`"KSP_VERSION":`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,9 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`		`-using UnityEngine;`
`3`		`-using System;`
`4`		`-using System.Threading;`
`5`		`-using System.Reflection;`
`6`	`2`	`using System.Linq;`
	`3`	`+using System.Reflection;`
	`4`	`+using UnityEngine;`
`7`	`5`	`using KSP.UI.Screens;`
`8`		`-using KSP.UI;`
`9`		`-using Kopernicus.Components;`
	`6`	`+`
`10`	`7`
`11`	`8`	`namespace SigmaBinaryPlugin`
`12`	`9`	`{`
`@@ -22,7 +19,7 @@ void Update()`
`22`	`19`	`}`
`23`	`20`	`}`
`24`	`21`	`}`
`25`		`-`
	`22`	`+`
`26`	`23`	`public class ArchivesFixer : MonoBehaviour`
`27`	`24`	`{`
`28`	`25`	`void Start()`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,6 @@`
`1`		`-using System;`
`2`		`-using System.Linq;`
`3`		`-using System.Collections.Generic;`
`4`		`-`
	`1`	`+using System.Collections.Generic;`
`5`	`2`	`using UnityEngine;`
`6`	`3`
`7`		`-using Kopernicus.Components;`
`8`		`-using Kopernicus.Configuration;`
`9`		`-`
`10`		`-`
`11`	`4`
`12`	`5`	`namespace SigmaBinaryPlugin`
`13`	`6`	`{`
`@@ -29,9 +22,8 @@ void Start()`
`29`	`22`	`{`
`30`	`23`	`List<MapObject> trackingstation = new List<MapObject>();`
`31`	`24`	`List<string> children = new List<string>();`
`32`		`-`
`33`		`- children.Add("Kerbin");`
`34`	`25`
	`26`	`+ children.Add("Kerbin");`
`35`	`27`
`36`	`28`	`for (int count = 1; count > 0;)`
`37`	`29`	`{`
`@@ -46,7 +38,6 @@ void Start()`
`46`	`38`	`}`
`47`	`39`	`}`
`48`	`40`
`49`		`-`
`50`	`41`	`foreach (MapObject m in PlanetariumCamera.fetch.targets)`
`51`	`42`	`{`
`52`	`43`	`if (m != null)`
`@@ -66,10 +57,9 @@ void Start()`
`66`	`57`	`}`
`67`	`58`	`}`
`68`	`59`
`69`		`-`
`70`	`60`	`PlanetariumCamera.fetch.targets.Clear();`
`71`	`61`	`PlanetariumCamera.fetch.targets.AddRange(trackingstation);`
`72`	`62`	`}`
`73`	`63`	`}`
`74`	`64`	`}`
`75`		`-}`
	`65`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,6 @@`
`1`	`1`	`using System;`
`2`		`-using System.Linq;`
`3`		`-using System.Collections.Generic;`
`4`		`-`
`5`	`2`	`using UnityEngine;`
`6`	`3`
`7`		`-using Kopernicus.Components;`
`8`		`-using Kopernicus.Configuration;`
`9`		`-`
`10`		`-`
`11`	`4`
`12`	`5`	`namespace SigmaBinaryPlugin`
`13`	`6`	`{`
`@@ -32,3 +25,4 @@ void Start()`
`32`	`25`	`}`
`33`	`26`	`}`
`34`	`27`	`}`
	`28`	`+`