'Release 2.7.887 [nolog]'

FluffierThanThou · FluffierThanThou · commit bc867dd2b78f · 2020-04-11T23:46:07.000+02:00
diff --git a/About/About.xml b/About/About.xml
@@ -97,7 +97,7 @@ Han Yaodong:
 Michaël Marinetti:    
 
 &lt;size=24&gt;Version&lt;/size&gt;
-This is version 2.6.886, for RimWorld 1.1.2598.
+This is version 2.7.887, for RimWorld 1.1.2598.
 
 </description>
   <supportedVersions>
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
-  <version>2.6.886</version>
+  <version>2.7.887</version>
   <manifestUri>https://raw.githubusercontent.com/fluffy-mods/ModManager/1.1/About/Manifest.xml</manifestUri>
-  <downloadUri>https://github.com/fluffy-mods/ModManager/releases/v2.6.886</downloadUri>
+  <downloadUri>https://github.com/fluffy-mods/ModManager/releases/v2.7.887</downloadUri>
 </Manifest>
diff --git a/Assemblies/FluffyUI.dll b/Assemblies/FluffyUI.dll
diff --git a/Assemblies/ModManager.dll b/Assemblies/ModManager.dll
diff --git a/Assemblies/RecursiveProfiler.dll b/Assemblies/RecursiveProfiler.dll
diff --git a/Readme.md b/Readme.md
@@ -101,4 +101,4 @@ Show your appreciation by buying me a coffee (or contribute towards a nice singl
 [![I Have a Black Dog](https://i.ibb.co/ss59Rwy/New-Project-2.png)](https://www.youtube.com/watch?v=XiCrniLQGYc)
 
 # Version
-This is version 2.6.886, for RimWorld 1.1.2598.
+This is version 2.7.887, for RimWorld 1.1.2598.
diff --git a/Source/ModConfig.json b/Source/ModConfig.json
@@ -3,8 +3,8 @@
     "version": {
         "alpha": 18,
         "major": 2,
-        "minor": 6,
-        "build": 886
+        "minor": 7,
+        "build": 887
     },
     "visibility": 0,
     "git_repo": "ModManager",
@@ -23,13 +23,20 @@
         "Han Yaodong": "",
         "Michaël Marinetti": ""
     },
-    "changenote": "2020-04-11 :: Fluffy :: recache target when needed'\n2020-04-11 :: Proxyer :: Pull request: Update Japanese Translation for 2.6.886 v2 (#81)'\n2020-04-11 :: Han Yaodong :: Update Chinese translation for v2.6.886 (#82)'\n2020-04-11 :: Michaël Marinetti :: Update French translations'\n2020-03-25 :: Fluffy :: cache modlist in order, improve error message for remote manifest fetch failure'",
+    "changenote": "2020-04-11 :: Fluffy :: cache dependency targets, add auto-adding hugslib toggle'\n2020-04-11 :: Fluffy :: recache target when needed'\n2020-04-11 :: Proxyer :: Pull request: Update Japanese Translation for 2.6.886 v2 (#81)'\n2020-04-11 :: Han Yaodong :: Update Chinese translation for v2.6.886 (#82)'\n2020-04-11 :: Michaël Marinetti :: Update French translations'\n2020-03-25 :: Fluffy :: cache modlist in order, improve error message for remote manifest fetch failure'",
     "tags": [
         "1.0",
         "1.1"
     ],
     "publishedfileid": "1507748539",
     "changenotes": [
+        {
+            "repo": "ModManager",
+            "hash": "'tformat:08229f64b3b8df824a5feafe7f606d8645aff8f7",
+            "date": "2020-04-11",
+            "author": "Fluffy",
+            "message": "cache dependency targets, add auto-adding hugslib toggle'"
+        },
         {
             "repo": "ModManager",
             "hash": "'tformat:67a7f1a68d43f0fbd59ca3c185dc3d2073d33806",
diff --git a/Source/ModManager/Dependencies/Incompatible.cs b/Source/ModManager/Dependencies/Incompatible.cs
@@ -23,7 +23,10 @@ public override List<FloatMenuOption> Resolvers
             {
                 var options = Utilities.NewOptionsList;
                 var targetButton = Target.GetManifest().Button;
-                options.Add( new FloatMenuOption( I18n.DeactivateMod( targetButton ), () => targetButton.Active = false ) );
+                options.Add( new FloatMenuOption( I18n.DeactivateMod( targetButton ),
+                                                  () => targetButton.Active = false ) );
+                options.Add( new FloatMenuOption( I18n.DeactivateMod( parent.Button ),
+                                                  () => parent.Button.Active = false ) );
                 return options;
             }
         }
diff --git a/Source/ModManager/ModButton/ModButton.cs b/Source/ModManager/ModButton/ModButton.cs
@@ -70,7 +70,7 @@ public virtual int MatchesFilter( string filter )
         internal abstract void DoModDetails( Rect canvas );
         public virtual int LoadOrder => -1;
         public virtual int SortOrder => -1;
-        public abstract IEnumerable<Dependency> Issues { get; }
+        public abstract IEnumerable<Dependency> Requirements { get; }
         internal virtual void HandleInteractions(Rect canvas, Action clickAction, Action doubleClickAction)
         {
             if (Mouse.IsOver(canvas))
@@ -94,11 +94,11 @@ internal virtual void HandleInteractions(Rect canvas, Action clickAction, Action
         internal virtual void DoModIssuesIcon( Rect canvas )
         {
             var severityThreshold = 2;
-            var relevantIssues = Issues.Where( i => i.Severity >= severityThreshold );
+            var relevantIssues = Requirements.Where( i => i.Severity >= severityThreshold );
             if ( !relevantIssues.Any() )
                 return;
 
-            var worst = Issues.MaxBy( d => d.Severity );
+            var worst = Requirements.MaxBy( d => d.Severity );
             GUI.color = worst.Color;
             GUI.DrawTexture( canvas, Resources.Warning );
             GUI.color = Color.white;
@@ -108,8 +108,8 @@ internal virtual void DoModIssuesIcon( Rect canvas )
         internal virtual void DrawRequirements(ref Rect canvas)
         {
             var severityThreshold = ModManager.Settings.ShowSatisfiedRequirements ? 0 : 1;
-            var relevantIssues = Issues.Where( i => i.Severity >= severityThreshold );
-            if ( !Issues.Any( i => i.Severity >= severityThreshold ) )
+            var relevantIssues = Requirements.Where( i => i.Severity >= severityThreshold );
+            if ( !Requirements.Any( i => i.Severity >= severityThreshold ) )
                 return;
 
             Utilities.DoLabel(ref canvas, I18n.Dependencies );
diff --git a/Source/ModManager/ModButton/ModButtonManager.cs b/Source/ModManager/ModButton/ModButtonManager.cs
@@ -153,7 +153,7 @@ public static void Notify_ModListChanged()
         public static IEnumerable<ModButton_Installed> Expansions => AllButtons.Where( b => b.IsExpansion ).Cast<ModButton_Installed>();
         public static void RecacheIssues()
         {
-            _issues = ActiveButtons.SelectMany( b => b.Issues ).ToList();
+            _issues = ActiveButtons.SelectMany( b => b.Requirements ).ToList();
         }
 
         public static void Reorder( int from, int to )
@@ -188,21 +188,21 @@ public static void Insert( ModButton button, int to )
                 Notify_ModListChanged();
         }
 
-        public static void Notify_Activated( ModButton mod, bool active )
+        public static void Notify_ActiveStatusChanged( ModButton_Installed mod, bool active )
         {
             if ( active )
             {
                 _availableButtons.TryRemove( mod );
                 _activeButtons.TryAdd( mod );
-                if ( mod is ModButton_Installed installed )
-                    Notify_ModListChanged();
+                
+                Notify_ModListChanged();
             }
             else
             {
                 _activeButtons.TryRemove( mod );
                 _availableButtons.TryAdd( mod );
-                if ( mod is ModButton_Installed installed )
-                    Notify_ModListChanged();
+                
+                Notify_ModListChanged();
                 SortAvailable();
             }
         }
@@ -268,7 +268,7 @@ public static void Reset( bool addDefaultMods = true )
                     foreach ( var expansion in Expansions )
                         expansion.Active = true;
 
-                if ( ModManager.Settings.AddHugslibToNewModLists )
+                if ( ModManager.Settings.AddHugsLibToNewModLists )
                 {
                     var hugslib = ModLister.GetModWithIdentifier( "unlimitedhugs.hugslib" );
                     if ( hugslib != null )
@@ -281,7 +281,7 @@ public static void Reset( bool addDefaultMods = true )
                 if ( ModManager.Settings.AddModManagerToNewModLists && ModManagerMod != null )
                     ModManagerMod.Active = true;
 
-                if ( ModManager.Settings.AddHugslibToNewModLists || ModManager.Settings.AddModManagerToNewModLists )
+                if ( ModManager.Settings.AddHugsLibToNewModLists || ModManager.Settings.AddModManagerToNewModLists )
                 {
                     // also try to activate harmony
                     var harmony = ModLister.GetModWithIdentifier( "brrainz.harmony" );
diff --git a/Source/ModManager/ModButton/ModButton_Downloading.cs b/Source/ModManager/ModButton/ModButton_Downloading.cs
@@ -83,6 +83,6 @@ internal override void DoModActionButtons( Rect canvas ){}
 
         internal override void DoModDetails( Rect canvas ){}
 
-        public override IEnumerable<Dependency> Issues => Manifest.EmptyRequirementList;
+        public override IEnumerable<Dependency> Requirements => Manifest.EmptyRequirementList;
     }
 }
diff --git a/Source/ModManager/ModButton/ModButton_Installed.cs b/Source/ModManager/ModButton/ModButton_Installed.cs
@@ -81,7 +81,7 @@ public override bool Active
             get => Versions.Any( mod => mod.Active );
             set {
                 Selected.Active = value;
-                ModButtonManager.Notify_Activated( this, value );
+                ModButtonManager.Notify_ActiveStatusChanged( this, value );
             }
         }
 
@@ -522,7 +522,7 @@ internal override void DoModDetails( Rect canvas )
             Widgets.EndScrollView();
         }
 
-        public override IEnumerable<Dependency> Issues => Manifest?.Requirements ?? Manifest.EmptyRequirementList;
+        public override IEnumerable<Dependency> Requirements => Manifest?.Requirements ?? Manifest.EmptyRequirementList;
 
         public void Notify_ResetSelected()
         {
diff --git a/Source/ModManager/ModButton/ModButton_Missing.cs b/Source/ModManager/ModButton/ModButton_Missing.cs
@@ -78,7 +78,7 @@ internal override void DoModDetails( Rect canvas )
             DrawRequirements( ref canvas );
         }
 
-        public override IEnumerable<Dependency> Issues => Manifest.EmptyRequirementList;
+        public override IEnumerable<Dependency> Requirements => Manifest.EmptyRequirementList;
 //        {
 //            get
 //            {
diff --git a/Source/ModManager/ModManagerSettings.cs b/Source/ModManager/ModManagerSettings.cs
@@ -20,7 +20,7 @@ public class ModManagerSettings : ModSettings
         public bool ShowSatisfiedRequirements = false;
         public bool AddExpansionsToNewModLists = true;
         public bool ShowVersionChecksOnSteamMods = false;
-        public bool AddHugslibToNewModLists = false;
+        public bool AddHugsLibToNewModLists = false;
 
         public ModAttributes this[ModMetaData mod]
         {
@@ -69,7 +69,7 @@ public override void ExposeData()
             Scribe_Values.Look( ref ShowPromotions_NotActive, "ShowPromotions_NotActive", false );
             Scribe_Values.Look( ref TrimTags, "TrimTags", true );
             Scribe_Values.Look( ref TrimVersionStrings, "TrimVersionStrings", false );
-            Scribe_Values.Look( ref AddHugslibToNewModLists, "AddHugslibToNewModLists", true );
+            Scribe_Values.Look( ref AddHugsLibToNewModLists, "AddHugsLibToNewModLists", true );
             Scribe_Values.Look( ref AddModManagerToNewModLists, "AddModManagerToNewModLists", true );
             Scribe_Values.Look( ref AddExpansionsToNewModLists, "AddExpansionsToNewModLists", true );
             Scribe_Values.Look( ref ShowSatisfiedRequirements, "ShowSatisfiedRequirements", false );
diff --git a/Source/ModManager/Properties/AssemblyInfo.cs b/Source/ModManager/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("2.0.0")]
-[assembly: AssemblyFileVersion("2.6.886")]
+[assembly: AssemblyFileVersion("2.7.887")]

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,10 @@ public override List<FloatMenuOption> Resolvers`
`23`	`23`	`{`
`24`	`24`	`var options = Utilities.NewOptionsList;`
`25`	`25`	`var targetButton = Target.GetManifest().Button;`
`26`		`- options.Add( new FloatMenuOption( I18n.DeactivateMod( targetButton ), () => targetButton.Active = false ) );`
	`26`	`+ options.Add( new FloatMenuOption( I18n.DeactivateMod( targetButton ),`
	`27`	`+ () => targetButton.Active = false ) );`
	`28`	`+ options.Add( new FloatMenuOption( I18n.DeactivateMod( parent.Button ),`
	`29`	`+ () => parent.Button.Active = false ) );`
`27`	`30`	`return options;`
`28`	`31`	`}`
`29`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public static void Notify_ModListChanged()`
`153`	`153`	`public static IEnumerable<ModButton_Installed> Expansions => AllButtons.Where( b => b.IsExpansion ).Cast<ModButton_Installed>();`
`154`	`154`	`public static void RecacheIssues()`
`155`	`155`	`{`
`156`		`- _issues = ActiveButtons.SelectMany( b => b.Issues ).ToList();`
	`156`	`+ _issues = ActiveButtons.SelectMany( b => b.Requirements ).ToList();`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`public static void Reorder( int from, int to )`
`@@ -188,21 +188,21 @@ public static void Insert( ModButton button, int to )`
`188`	`188`	`Notify_ModListChanged();`
`189`	`189`	`}`
`190`	`190`
`191`		`- public static void Notify_Activated( ModButton mod, bool active )`
	`191`	`+ public static void Notify_ActiveStatusChanged( ModButton_Installed mod, bool active )`
`192`	`192`	`{`
`193`	`193`	`if ( active )`
`194`	`194`	`{`
`195`	`195`	`_availableButtons.TryRemove( mod );`
`196`	`196`	`_activeButtons.TryAdd( mod );`
`197`		`- if ( mod is ModButton_Installed installed )`
`198`		`- Notify_ModListChanged();`
	`197`	`+`
	`198`	`+ Notify_ModListChanged();`
`199`	`199`	`}`
`200`	`200`	`else`
`201`	`201`	`{`
`202`	`202`	`_activeButtons.TryRemove( mod );`
`203`	`203`	`_availableButtons.TryAdd( mod );`
`204`		`- if ( mod is ModButton_Installed installed )`
`205`		`- Notify_ModListChanged();`
	`204`	`+`
	`205`	`+ Notify_ModListChanged();`
`206`	`206`	`SortAvailable();`
`207`	`207`	`}`
`208`	`208`	`}`
`@@ -268,7 +268,7 @@ public static void Reset( bool addDefaultMods = true )`
`268`	`268`	`foreach ( var expansion in Expansions )`
`269`	`269`	`expansion.Active = true;`
`270`	`270`
`271`		`- if ( ModManager.Settings.AddHugslibToNewModLists )`
	`271`	`+ if ( ModManager.Settings.AddHugsLibToNewModLists )`
`272`	`272`	`{`
`273`	`273`	`var hugslib = ModLister.GetModWithIdentifier( "unlimitedhugs.hugslib" );`
`274`	`274`	`if ( hugslib != null )`
`@@ -281,7 +281,7 @@ public static void Reset( bool addDefaultMods = true )`
`281`	`281`	`if ( ModManager.Settings.AddModManagerToNewModLists && ModManagerMod != null )`
`282`	`282`	`ModManagerMod.Active = true;`
`283`	`283`
`284`		`- if ( ModManager.Settings.AddHugslibToNewModLists \|\| ModManager.Settings.AddModManagerToNewModLists )`
	`284`	`+ if ( ModManager.Settings.AddHugsLibToNewModLists \|\| ModManager.Settings.AddModManagerToNewModLists )`
`285`	`285`	`{`
`286`	`286`	`// also try to activate harmony`
`287`	`287`	`var harmony = ModLister.GetModWithIdentifier( "brrainz.harmony" );`