[slothsoft#68] fix new recipe configuration

Mikeliro · Nov 19, 2022 · 6d4d2a8 · 6d4d2a8
1 parent d01af95
commit 6d4d2a8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Informant/Implementation/NewRecipeDisplayable.cs b/Informant/Implementation/NewRecipeDisplayable.cs
@@ -12,6 +12,7 @@ namespace Slothsoft.Informant.Implementation;
 
 internal class NewRecipeDisplayable : IDisplayable {
 
+    private static string DisplayableId => "new-recipe";
     private static readonly Rectangle NewSourceRectangle = new(144, 440, 16, 7);
 
     private readonly IModHelper _modHelper;
@@ -49,7 +50,7 @@ public NewRecipeDisplayable(IModHelper modHelper, string? uniqueId = null) {
         );
     }
 
-    public string Id => "new-recipe";
+    public string Id => DisplayableId;
     public string DisplayName => _modHelper.Translation.Get("NewRecipeDisplayable");
     public string Description => _modHelper.Translation.Get("NewRecipeDisplayable.Description");
 
@@ -64,6 +65,11 @@ private static void DrawOverlayIfNecessary(ClickableTextureComponent __instance,
             // we are on the recipe page, but have no recipe? ignore!
             return;
         }
+
+        var config = InformantMod.Instance?.Config ?? new InformantConfig();
+        if (!config.DisplayIds.GetValueOrDefault(DisplayableId, true)) {
+            return; // this "decorator" is deactivated
+        }
 
         // recipe.timesCrafted is not updated it seems
         var timesCrafted = recipe.isCookingRecipe 

diff --git a/Informant/Implementation/SellPriceDisplayable.cs b/Informant/Implementation/SellPriceDisplayable.cs
@@ -10,6 +10,8 @@
 namespace Slothsoft.Informant.Implementation;
 
 internal class SellPriceDisplayable : IDisplayable {
+
+    private static string DisplayableId => "sell-price";
     private static readonly Rectangle CoinSourceBounds = new(5, 69, 6, 6);
 
     private record MoneyToDisplay(int One, int? Stack);
@@ -51,7 +53,7 @@ public SellPriceDisplayable(IModHelper modHelper, string? uniqueId = null) {
         );
     }
 
-    public string Id => "sell-price";
+    public string Id => DisplayableId;
     public string DisplayName => _modHelper.Translation.Get("SellPriceDisplayable");
     public string Description => _modHelper.Translation.Get("SellPriceDisplayable.Description");
 
@@ -61,9 +63,8 @@ public SellPriceDisplayable(IModHelper modHelper, string? uniqueId = null) {
     private static void ManipulateMoneyValue(Item? hoveredItem, ref int moneyAmountToShowAtBottom, out MoneyToDisplay? __state) {
         __state = null;
 
-
         var config = InformantMod.Instance?.Config ?? new InformantConfig();
-        if (!config.DisplayIds.GetValueOrDefault("sell-price", true)) {
+        if (!config.DisplayIds.GetValueOrDefault(DisplayableId, true)) {
             return; // this "decorator" is deactivated
         }