fixes for ModuleManager ordering

henrybauer · henrybauer · commit 3c869506458f · 2017-12-12T20:43:54.000+02:00
diff --git a/GameData/GPOSpeedFuelPump.version b/GameData/GPOSpeedFuelPump.version
@@ -2,6 +2,6 @@
  "NAME":"GPOSpeedFuelPump",
  "URL":"https://raw.githubusercontent.com/henrybauer/GPOSpeedPump/master/GameData/GPOSpeedFuelPump.version",
  "DOWNLOAD":"http://forum.kerbalspaceprogram.com/index.php?/topic/137489-11-gpospeedfuelpump-continued/",
- "VERSION":{"MAJOR":1,"MINOR":8,"PATCH":9,"BUILD":0},
+ "VERSION":{"MAJOR":1,"MINOR":8,"PATCH":10,"BUILD":0},
  "KSP_VERSION":{"MAJOR":1,"MINOR":3,"PATCH":1}
 }
diff --git a/GameData/Patches/FuelSwitch.cfg b/GameData/Patches/FuelSwitch.cfg
@@ -1,7 +1,7 @@
 // This config file REQUIRES ModuleManager to function!  Get it here: http://forum.kerbalspaceprogram.com/threads/55219
 
 // Interstellar Fuel Switch support
-@PART[*]:HAS[@MODULE[InterstellarFuelSwitch],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:FINAL
+@PART[*]:HAS[@MODULE[InterstellarFuelSwitch],!MODULE[GPOSpeedPump]]:NEEDS[InterstellarFuelSwitch]:FINAL
 {
 	MODULE
 	{
@@ -10,7 +10,7 @@
 }
 
 // Firespitter fuel switch support
-@PART[*]:HAS[@MODULE[FSfuelSwitch],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:FINAL
+@PART[*]:HAS[@MODULE[FSfuelSwitch],!MODULE[GPOSpeedPump]]:NEEDS[Firespitter]:FINAL
 {
 	MODULE
 	{
@@ -19,7 +19,7 @@
 }
 
 // B9 fuel switch support
-@PART[*]:HAS[@MODULE[ModuleB9PartSwitch],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:AFTER[zzz_CryoTanks]:FINAL
+@PART[*]:HAS[@MODULE[ModuleB9PartSwitch],!MODULE[GPOSpeedPump]]:NEEDS[B9PartSwitch]:FINAL
 {
 	MODULE
 	{
diff --git a/GameData/Patches/ModularFuelTanks.cfg b/GameData/Patches/ModularFuelTanks.cfg
@@ -1,7 +1,7 @@
 // This config file REQUIRES ModuleManager to function!  Get it here: http://forum.kerbalspaceprogram.com/threads/55219
 
 // Modular Fuel Tanks
-@PART[*]:HAS[@MODULE[ModuleFuelTanks],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:NEEDS[ModularFuelTanks]:FINAL
+@PART[*]:HAS[@MODULE[ModuleFuelTanks],!MODULE[GPOSpeedPump]]:NEEDS[ModularFuelTanks]:FINAL
 {
 	MODULE
 	{
@@ -10,7 +10,7 @@
 }
 
 // Modular Fuel Tanks
-@PART[*]:HAS[@MODULE[ModuleFuelTanks],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:NEEDS[RealFuels]:FINAL
+@PART[*]:HAS[@MODULE[ModuleFuelTanks],!MODULE[GPOSpeedPump]]:NEEDS[RealFuels]:FINAL
 {
 	MODULE
 	{
diff --git a/GameData/Patches/ProceduralTanks.cfg b/GameData/Patches/ProceduralTanks.cfg
@@ -1,7 +1,7 @@
 // This config file REQUIRES ModuleManager to function!  Get it here: http://forum.kerbalspaceprogram.com/threads/55219
 
 // Procedural tank support
-@PART[proceduralTank*]:HAS[!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:FINAL
+@PART[proceduralTank*]:HAS[!MODULE[GPOSpeedPump]]:NEEDS[ProceduralParts]:FINAL
 {
 	MODULE
 	{
diff --git a/GameData/Patches/StationScience.cfg b/GameData/Patches/StationScience.cfg
@@ -3,7 +3,7 @@
 // Resources from Station Science
 // http://forum.kerbalspaceprogram.com/index.php?/topic/50145-104-station-science-v15/
 
-@PART[*]:HAS[@RESOURCE[Kibbal],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:FINAL
+@PART[*]:HAS[@RESOURCE[Kibbal],!MODULE[GPOSpeedPump]]:NEEDS[StationScience]:AFTER[StationScience]
 {
   MODULE {
     name=GPOSpeedPump
diff --git a/GameData/Patches/everything.cfg.disabled.txt b/GameData/Patches/everything.cfg.disabled.txt
@@ -14,7 +14,7 @@
 	}
 }
 
-//@PART[*]:HAS[!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:FINAL
+//@PART[*]:HAS[!MODULE[GPOSpeedPump]]:FINAL
 //{
 //	MODULE
 //	{
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.8.9")]
-[assembly: AssemblyFileVersion("1.8.9")]
+[assembly: AssemblyVersion("1.8.10")]
+[assembly: AssemblyFileVersion("1.8.10")]

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"NAME":"GPOSpeedFuelPump",`
`3`	`3`	`"URL":"https://raw.githubusercontent.com/henrybauer/GPOSpeedPump/master/GameData/GPOSpeedFuelPump.version",`
`4`	`4`	`"DOWNLOAD":"http://forum.kerbalspaceprogram.com/index.php?/topic/137489-11-gpospeedfuelpump-continued/",`
`5`		`- "VERSION":{"MAJOR":1,"MINOR":8,"PATCH":9,"BUILD":0},`
	`5`	`+ "VERSION":{"MAJOR":1,"MINOR":8,"PATCH":10,"BUILD":0},`
`6`	`6`	`"KSP_VERSION":{"MAJOR":1,"MINOR":3,"PATCH":1}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// This config file REQUIRES ModuleManager to function! Get it here: http://forum.kerbalspaceprogram.com/threads/55219`
`2`	`2`
`3`	`3`	`// Interstellar Fuel Switch support`
`4`		`-@PART[*]:HAS[@MODULE[InterstellarFuelSwitch],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:FINAL`
	`4`	`+@PART[*]:HAS[@MODULE[InterstellarFuelSwitch],!MODULE[GPOSpeedPump]]:NEEDS[InterstellarFuelSwitch]:FINAL`
`5`	`5`	`{`
`6`	`6`	`MODULE`
`7`	`7`	`{`
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`// Firespitter fuel switch support`
`13`		`-@PART[*]:HAS[@MODULE[FSfuelSwitch],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:FINAL`
	`13`	`+@PART[*]:HAS[@MODULE[FSfuelSwitch],!MODULE[GPOSpeedPump]]:NEEDS[Firespitter]:FINAL`
`14`	`14`	`{`
`15`	`15`	`MODULE`
`16`	`16`	`{`
`@@ -19,7 +19,7 @@`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`// B9 fuel switch support`
`22`		`-@PART[*]:HAS[@MODULE[ModuleB9PartSwitch],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:AFTER[zzz_CryoTanks]:FINAL`
	`22`	`+@PART[*]:HAS[@MODULE[ModuleB9PartSwitch],!MODULE[GPOSpeedPump]]:NEEDS[B9PartSwitch]:FINAL`
`23`	`23`	`{`
`24`	`24`	`MODULE`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// This config file REQUIRES ModuleManager to function! Get it here: http://forum.kerbalspaceprogram.com/threads/55219`
`2`	`2`
`3`	`3`	`// Modular Fuel Tanks`
`4`		`-@PART[*]:HAS[@MODULE[ModuleFuelTanks],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:NEEDS[ModularFuelTanks]:FINAL`
	`4`	`+@PART[*]:HAS[@MODULE[ModuleFuelTanks],!MODULE[GPOSpeedPump]]:NEEDS[ModularFuelTanks]:FINAL`
`5`	`5`	`{`
`6`	`6`	`MODULE`
`7`	`7`	`{`
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`// Modular Fuel Tanks`
`13`		`-@PART[*]:HAS[@MODULE[ModuleFuelTanks],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:NEEDS[RealFuels]:FINAL`
	`13`	`+@PART[*]:HAS[@MODULE[ModuleFuelTanks],!MODULE[GPOSpeedPump]]:NEEDS[RealFuels]:FINAL`
`14`	`14`	`{`
`15`	`15`	`MODULE`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// This config file REQUIRES ModuleManager to function! Get it here: http://forum.kerbalspaceprogram.com/threads/55219`
`2`	`2`
`3`	`3`	`// Procedural tank support`
`4`		`-@PART[proceduralTank*]:HAS[!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:FINAL`
	`4`	`+@PART[proceduralTank*]:HAS[!MODULE[GPOSpeedPump]]:NEEDS[ProceduralParts]:FINAL`
`5`	`5`	`{`
`6`	`6`	`MODULE`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`// Resources from Station Science`
`4`	`4`	`// http://forum.kerbalspaceprogram.com/index.php?/topic/50145-104-station-science-v15/`
`5`	`5`
`6`		`-@PART[*]:HAS[@RESOURCE[Kibbal],!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:FINAL`
	`6`	`+@PART[*]:HAS[@RESOURCE[Kibbal],!MODULE[GPOSpeedPump]]:NEEDS[StationScience]:AFTER[StationScience]`
`7`	`7`	`{`
`8`	`8`	`MODULE {`
`9`	`9`	`name=GPOSpeedPump`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-//@PART[*]:HAS[!MODULE[GPOSpeedPump]]:FOR[GPOSpeedFuelPump]:FINAL`
	`17`	`+//@PART[*]:HAS[!MODULE[GPOSpeedPump]]:FINAL`
`18`	`18`	`//{`
`19`	`19`	`// MODULE`
`20`	`20`	`// {`