Let SMAPI rewrite broken code instead

cdaragorn · Feb 8, 2020 · 134eb34 · 134eb34
1 parent f3dfcc6
commit 134eb34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/SDVModTest/UIElements/ShopHarvestPrices.cs b/SDVModTest/UIElements/ShopHarvestPrices.cs
@@ -42,8 +42,7 @@ private void OnRenderedActiveMenu(object sender, RenderedActiveMenuEventArgs e)
             // draw shop harvest prices
             if (Game1.activeClickableMenu is ShopMenu menu)
             {
-                object item = _helper.Reflection.GetField<object>(menu, "hoveredItem").GetValue();
-                if (item is Item hoverItem)
+                if (menu.hoveredItem is Item hoverItem)
                 {
                     String text = string.Empty;
                     bool itemHasPriceInfo = Tools.GetTruePrice(hoverItem) > 0;
@@ -68,8 +67,7 @@ private void OnRenderedActiveMenu(object sender, RenderedActiveMenuEventArgs e)
                         text = "    " + temp.Price;
                     }
 
-                    item = _helper.Reflection.GetField<object>(menu, "heldItem").GetValue();
-                    var heldItem = item as Item;
+                    var heldItem = menu.heldItem as Item;
                     if (heldItem == null)
                     {
                         int value = 0;
@@ -164,7 +162,7 @@ private void OnRenderedActiveMenu(object sender, RenderedActiveMenuEventArgs e)
                                 getHoveredItemExtraItemIndex.Invoke<int>(new object[0]),
                                 getHoveredItemExtraItemAmount.Invoke<int>(new object[0]),
                                 null,
-                                _helper.Reflection.GetField<Int32>(menu, "hoverPrice").GetValue());
+                                menu.hoverPrice);
                         }
                     }
                 }

diff --git a/SDVModTest/UIElements/ShowAccurateHearts.cs b/SDVModTest/UIElements/ShowAccurateHearts.cs
@@ -103,7 +103,7 @@ private void OnRenderedActiveMenu(object sender, RenderedActiveMenuEventArgs e)
                             }
                         }
 
-                        String hoverText = (string)gameMenu.GetType().GetField("hoverText", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public)?.GetValue(gameMenu);
+                        String hoverText = gameMenu.hoverText;
                         IClickableMenu.drawHoverText(
                             Game1.spriteBatch,
                             hoverText,