From 89061a5a42ef2d0f0d682118dfc21a147738092e Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Mon, 10 Aug 2020 12:23:02 +0100 Subject: [PATCH 01/52] mousehighlight: make "drop" not show when interface tooltips are off --- .../client/plugins/mousehighlight/MouseHighlightOverlay.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java index be6001241d..07b11ccf50 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java @@ -61,6 +61,7 @@ class MouseHighlightOverlay extends Overlay MenuAction.ITEM_FOURTH_OPTION, MenuAction.ITEM_FIFTH_OPTION, MenuAction.ITEM_USE, + MenuAction.ITEM_DROP, MenuAction.WIDGET_FIRST_OPTION, MenuAction.WIDGET_SECOND_OPTION, MenuAction.WIDGET_THIRD_OPTION, From 1d62a00596fc9a6dac7a601e5a010ebe1619718b Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 11 Aug 2020 14:32:04 -0400 Subject: [PATCH 02/52] item stats: add duration tooltips to potions Co-authored-by: MMagicala --- .../plugins/itemstats/ItemStatOverlay.java | 41 ++++++ .../itemstats/potions/PotionDuration.java | 120 ++++++++++++++++++ 2 files changed, 161 insertions(+) create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PotionDuration.java diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java index ea115dc148..ff3922fd92 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java @@ -29,6 +29,7 @@ import com.google.inject.Inject; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; +import java.time.Duration; import net.runelite.api.Client; import net.runelite.api.EquipmentInventorySlot; import net.runelite.api.InventoryID; @@ -39,6 +40,7 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.game.ItemManager; +import net.runelite.client.plugins.itemstats.potions.PotionDuration; import net.runelite.client.ui.JagexColors; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.tooltip.Tooltip; @@ -47,6 +49,7 @@ import net.runelite.client.util.ColorUtil; import net.runelite.client.util.QuantityFormatter; import net.runelite.http.api.item.ItemEquipmentStats; import net.runelite.http.api.item.ItemStats; +import org.apache.commons.lang3.time.DurationFormatUtils; public class ItemStatOverlay extends Overlay { @@ -151,6 +154,44 @@ public class ItemStatOverlay extends Overlay tooltipManager.add(new Tooltip(tooltip)); } } + + PotionDuration p = PotionDuration.get(itemId); + if (p != null) + { + PotionDuration.PotionDurationRange[] durationRanges = p.getDurationRanges(); + StringBuilder sb = new StringBuilder(); + if (durationRanges.length == 1) + { + // Only show "Duration: