From f2e1ab5bfea2b3dba69d11c083a3e2b4f8fbe0aa Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 23 Mar 2018 17:27:27 +0100 Subject: [PATCH] Remove not needed parent point and minimap orb - Remove not needed parent point parameter in RenderableEntity, it's usage has been replaced with getBounds().getLocation() - Remove unused class minimap orb Signed-off-by: Tomas Slusny --- .../plugins/agilityplugin/AgilityOverlay.java | 2 +- .../AttackIndicatorOverlay.java | 5 +- .../BarbarianAssaultOverlay.java | 3 +- .../plugins/barrows/BarrowsOverlay.java | 3 +- .../BlastFurnaceCofferOverlay.java | 5 +- .../blastfurnace/BlastFurnaceOverlay.java | 5 +- .../blastfurnace/ConveyorBeltOverlay.java | 2 +- .../client/plugins/boosts/BoostsOverlay.java | 5 +- .../client/plugins/cannon/CannonOverlay.java | 4 +- .../plugins/cannon/CannonSpotOverlay.java | 2 +- .../cluescrolls/ClueScrollOverlay.java | 5 +- .../plugins/devtools/DevToolsOverlay.java | 3 +- .../plugins/devtools/LocationOverlay.java | 4 +- .../plugins/fightcave/FightCaveOverlay.java | 5 +- .../plugins/fishing/FishingOverlay.java | 5 +- .../fishing/FishingSpotMinimapOverlay.java | 3 +- .../plugins/fishing/FishingSpotOverlay.java | 3 +- .../grounditems/GroundItemsOverlay.java | 2 +- .../plugins/herbiboars/HerbiboarOverlay.java | 2 +- .../client/plugins/hunter/TrapOverlay.java | 3 +- .../plugins/implings/ImplingsOverlay.java | 2 +- .../instancemap/InstanceMapOverlay.java | 4 +- .../plugins/itemprices/ItemPricesOverlay.java | 3 +- .../plugins/itemstats/ItemStatOverlay.java | 2 +- .../jewellerycount/JewelleryCountOverlay.java | 4 +- .../kourendlibrary/KourendLibraryOverlay.java | 2 +- .../plugins/motherlode/MotherlodeOverlay.java | 5 +- .../motherlode/MotherlodeRocksOverlay.java | 2 +- .../motherlode/MotherlodeSackOverlay.java | 5 +- .../mousehighlight/MouseHighlightOverlay.java | 3 +- .../nightmarezone/NightmareZoneOverlay.java | 5 +- .../npchighlight/NpcClickboxOverlay.java | 3 +- .../npchighlight/NpcMinimapOverlay.java | 3 +- .../opponentinfo/OpponentInfoOverlay.java | 10 +- .../pestcontrol/PestControlOverlay.java | 3 +- .../PlayerIndicatorsMinimapOverlay.java | 3 +- .../PlayerIndicatorsOverlay.java | 3 +- .../client/plugins/poh/BurnerOverlay.java | 10 +- .../client/plugins/poh/PohOverlay.java | 2 +- .../plugins/prayflick/PrayerFlickOverlay.java | 3 +- .../puzzlesolver/PuzzleSolverOverlay.java | 6 +- .../pyramidplunder/PyramidPlunderOverlay.java | 5 +- .../client/plugins/raids/RaidsOverlay.java | 7 +- .../plugins/regenmeter/RegenMeterOverlay.java | 3 +- .../plugins/roguesden/RoguesDenOverlay.java | 2 +- .../plugins/runecraft/AbyssOverlay.java | 2 +- .../plugins/runecraft/BindNeckOverlay.java | 4 +- .../plugins/runecraft/RunecraftOverlay.java | 4 +- .../plugins/runepouch/RunepouchOverlay.java | 2 +- .../client/plugins/slayer/SlayerOverlay.java | 4 +- .../plugins/teamcapes/TeamCapesOverlay.java | 5 +- .../tileindicators/TileIndicatorsOverlay.java | 2 +- .../woodcutting/WoodcuttingOverlay.java | 5 +- .../plugins/xpglobes/XpGlobesOverlay.java | 12 +- .../client/ui/overlay/OverlayRenderer.java | 2 +- .../client/ui/overlay/RenderableEntity.java | 3 +- .../components/BackgroundComponent.java | 3 +- .../components/ImagePanelComponent.java | 8 +- .../overlay/components/InfoBoxComponent.java | 6 +- .../ui/overlay/components/MinimapOrb.java | 264 ------------------ .../ui/overlay/components/PanelComponent.java | 12 +- .../components/ProgressBarComponent.java | 4 +- .../ui/overlay/components/TextComponent.java | 2 +- .../overlay/components/TooltipComponent.java | 10 +- .../ui/overlay/infobox/InfoBoxOverlay.java | 6 +- .../ui/overlay/tooltip/TooltipOverlay.java | 4 +- .../ui/overlay/OverlayRendererTest.java | 3 +- .../overlay/components/TextComponentTest.java | 6 +- 68 files changed, 124 insertions(+), 420 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/ui/overlay/components/MinimapOrb.java diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java index f71d697cee..039aa4df8f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java @@ -58,7 +58,7 @@ public class AgilityOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { LocalPoint playerLocation = client.getLocalPlayer().getLocalLocation(); Point mousePosition = client.getMouseCanvasPosition(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorOverlay.java index 31f5a35728..3a3752c744 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.attackindicator; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import javax.inject.Inject; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; @@ -48,7 +47,7 @@ public class AttackIndicatorOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { final String attackStyleString = plugin.getAttackStyle().getName(); @@ -56,6 +55,6 @@ public class AttackIndicatorOverlay extends Overlay panelComponent.setTitle(attackStyleString); panelComponent.setWidth(COMPONENT_WIDTH); - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultOverlay.java index 7654032475..0d409963f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultOverlay.java @@ -26,7 +26,6 @@ package net.runelite.client.plugins.barbarianassault; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.Rectangle; import javax.inject.Inject; import lombok.Getter; @@ -60,7 +59,7 @@ public class BarbarianAssaultOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { if (client.getGameState() != GameState.LOGGED_IN || currentRound == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java index fe72be4ed2..3c4b147fb5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.barrows; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.util.List; import javax.inject.Inject; import net.runelite.api.Client; @@ -61,7 +60,7 @@ class BarrowsOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { Player local = client.getLocalPlayer(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java index 3dfee32b69..5afdec8f2d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java @@ -26,7 +26,6 @@ package net.runelite.client.plugins.blastfurnace; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import javax.inject.Inject; import net.runelite.api.Client; import static net.runelite.api.Varbits.BLAST_FURNACE_COFFER; @@ -52,7 +51,7 @@ class BlastFurnaceCofferOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { if (plugin.getConveyorBelt() == null) { @@ -72,6 +71,6 @@ class BlastFurnaceCofferOverlay extends Overlay StackFormatter.quantityToStackSize(client.getSetting(BLAST_FURNACE_COFFER)) + " gp" )); } - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java index 02dc109761..e0ce3cf8ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java @@ -26,7 +26,6 @@ package net.runelite.client.plugins.blastfurnace; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.image.BufferedImage; import javax.inject.Inject; import net.runelite.api.Client; @@ -53,7 +52,7 @@ class BlastFurnaceOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { if (plugin.getConveyorBelt() == null) { @@ -74,7 +73,7 @@ class BlastFurnaceOverlay extends Overlay imagePanelComponent.getImages().add(getImage(varbit.getItemID(), amount)); } - return imagePanelComponent.render(graphics, parent); + return imagePanelComponent.render(graphics); } private BufferedImage getImage(int itemID, int amount) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/ConveyorBeltOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/ConveyorBeltOverlay.java index 135cf9d719..9ca7ade911 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/ConveyorBeltOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/ConveyorBeltOverlay.java @@ -54,7 +54,7 @@ class ConveyorBeltOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { if (!config.showConveyorBelt() || plugin.getConveyorBelt() == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java index 4d2f99f637..5cb96ede2b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.boosts; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; @@ -69,7 +68,7 @@ class BoostsOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { panelComponent = new PanelComponent(); boolean overlayActive = false; @@ -153,7 +152,7 @@ class BoostsOverlay extends Overlay } } - return panelComponent.getLines().isEmpty() ? null : panelComponent.render(graphics, parent); + return panelComponent.getLines().isEmpty() ? null : panelComponent.render(graphics); } private Color getTextColor(int boost) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java index 89b1554a26..7eace888d7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java @@ -60,7 +60,7 @@ class CannonOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { if (!plugin.isCannonPlaced() || plugin.getCannonPosition() == null) { @@ -88,7 +88,7 @@ class CannonOverlay extends Overlay textComponent.setText(String.valueOf(plugin.getCballsLeft())); textComponent.setPosition(new java.awt.Point(cannonLoc.getX(), cannonLoc.getY())); textComponent.setColor(plugin.getStateColor()); - textComponent.render(graphics, parent); + textComponent.render(graphics); } if (config.showDoubleHitSpot()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java index d23e013320..a7f3975b23 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java @@ -62,7 +62,7 @@ public class CannonSpotOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { if (!config.showCannonSpots() || plugin.isCannonPlaced()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java index d95c3a49f4..76ff14f312 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java @@ -28,7 +28,6 @@ package net.runelite.client.plugins.cluescrolls; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; @@ -56,7 +55,7 @@ public class ClueScrollOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { if (clue == null) { @@ -90,6 +89,6 @@ public class ClueScrollOverlay extends Overlay } } - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java index 8073ea296f..799ff0b35e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java @@ -30,7 +30,6 @@ import java.awt.Dimension; import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.Polygon; import java.awt.Rectangle; import java.awt.geom.Rectangle2D; @@ -92,7 +91,7 @@ public class DevToolsOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { Font font = plugin.getFont(); if (font != null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/LocationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/LocationOverlay.java index eb04edffd0..15dee2af06 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/LocationOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/LocationOverlay.java @@ -49,7 +49,7 @@ public class LocationOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { if (!plugin.isToggleLocation()) { @@ -76,6 +76,6 @@ public class LocationOverlay extends Overlay } - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java index 5fe73a8486..6cb78e2b92 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java @@ -36,7 +36,6 @@ import javax.inject.Inject; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.image.BufferedImage; import java.io.IOException; @@ -61,7 +60,7 @@ public class FightCaveOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { JadAttack attack = plugin.getAttack(); if (attack == null) @@ -76,7 +75,7 @@ public class FightCaveOverlay extends Overlay { imagePanelComponent.setBackgroundColor(NOT_ACTIVATED_BACKGROUND_COLOR); } - return imagePanelComponent.render(graphics, parent); + return imagePanelComponent.render(graphics); } private BufferedImage getPrayerImage(JadAttack attack) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java index fd737cdda5..1b9cd82e40 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.fishing; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; @@ -60,7 +59,7 @@ class FishingOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { FishingSession session = plugin.getSession(); @@ -107,6 +106,6 @@ class FishingOverlay extends Overlay } } - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java index 3c8eeb3a29..2129b493d5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.fishing; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import javax.inject.Inject; import net.runelite.api.GraphicID; import net.runelite.api.NPC; @@ -49,7 +48,7 @@ class FishingSpotMinimapOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { NPC[] fishingSpots = plugin.getFishingSpots(); if (fishingSpots == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java index bdb30af5af..aea35805fa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.fishing; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.image.BufferedImage; import javax.inject.Inject; import net.runelite.api.GraphicID; @@ -56,7 +55,7 @@ class FishingSpotOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { NPC[] fishingSpots = plugin.getFishingSpots(); if (fishingSpots == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index f0eaf076cd..213c445aac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -107,7 +107,7 @@ public class GroundItemsOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { Region region = client.getRegion(); Tile[][][] tiles = region.getTiles(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java index 99fd396b0b..bb284189ba 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java @@ -54,7 +54,7 @@ class HerbiboarOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { if (!plugin.isInHerbiboarArea()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java index 73c5770a48..98d04a031c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.hunter; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.util.Iterator; import java.util.Map; import javax.inject.Inject; @@ -71,7 +70,7 @@ public class TrapOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { drawTraps(graphics); return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java index a7db4ce7b8..f52fe4f433 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java @@ -71,7 +71,7 @@ public class ImplingsOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { NPCQuery implingQuery = new NPCQuery().idEquals(Ints.toArray(ids.keySet())); NPC[] implings = queryRunner.runQuery(implingQuery); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java index 5aad264f52..6b70c03c3e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java @@ -185,7 +185,7 @@ class InstanceMapOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { if (!showMap) { @@ -302,7 +302,7 @@ class InstanceMapOverlay extends Overlay backgroundComponent.setFill(false); backgroundComponent.setRectangle(new Rectangle(0, 0, mapOverlaySize.width, mapOverlaySize.height)); - backgroundComponent.render(graphics, new java.awt.Point()); + backgroundComponent.render(graphics); //These loops are seperated on purpose to prevent layering issues. This is how it's written in the client //Draw the base colors first diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java index da5924807e..77676a8117 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java @@ -26,7 +26,6 @@ package net.runelite.client.plugins.itemprices; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.text.NumberFormat; import javax.inject.Inject; import net.runelite.api.Client; @@ -76,7 +75,7 @@ class ItemPricesOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point point) + public Dimension render(Graphics2D graphics) { if (client.isMenuOpen()) { 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 2a62713daf..0582f78138 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 @@ -54,7 +54,7 @@ public class ItemStatOverlay extends Overlay private ItemStatConfig config; @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { if (client.isMenuOpen() || (!config.relative() && !config.absolute() && !config.theoretical())) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java index 284224eca8..31056ea1b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java @@ -57,7 +57,7 @@ class JewelleryCountOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { graphics.setFont(FontManager.getRunescapeSmallFont()); @@ -74,7 +74,7 @@ class JewelleryCountOverlay extends Overlay final TextComponent textComponent = new TextComponent(); textComponent.setPosition(new Point(bounds.x, bounds.y + 16)); textComponent.setText(String.valueOf(charges.getCharges())); - textComponent.render(graphics, parent); + textComponent.render(graphics); } return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java index cb205574fc..6b1f1a4c6d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java @@ -69,7 +69,7 @@ public class KourendLibraryOverlay extends Overlay } @Override - public Dimension render(Graphics2D g, java.awt.Point parent) + public Dimension render(Graphics2D g) { Player player = client.getLocalPlayer(); if (player == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java index 8ea10e72d9..81047d4642 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java @@ -28,7 +28,6 @@ import com.google.common.collect.Sets; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.time.Duration; import java.time.Instant; import java.util.Set; @@ -72,7 +71,7 @@ class MotherlodeOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { MotherlodeSession session = plugin.getSession(); @@ -114,6 +113,6 @@ class MotherlodeOverlay extends Overlay : "" )); - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java index bc42e45c3a..a1935f24a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java @@ -68,7 +68,7 @@ class MotherlodeRocksOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { if (!config.showRocks()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java index dd7a0ef63a..edc877ab78 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.motherlode; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.Varbits; @@ -52,7 +51,7 @@ class MotherlodeSackOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { Widget sack = client.getWidget(WidgetInfo.MOTHERLODE_MINE); @@ -71,6 +70,6 @@ class MotherlodeSackOverlay extends Overlay } } - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } } 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 2e5ae6f305..f0a02e44f0 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.mousehighlight; import com.google.common.base.Strings; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.MenuEntry; @@ -50,7 +49,7 @@ class MouseHighlightOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point point) + public Dimension render(Graphics2D graphics) { if (client.isMenuOpen()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java index b4a26a5de7..1b79c80bd9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.nightmarezone; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.ItemID; @@ -70,7 +69,7 @@ class NightmareZoneOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { if (!plugin.isInNightmareZone() || !config.moveOverlay()) { @@ -104,7 +103,7 @@ class NightmareZoneOverlay extends Overlay Color.WHITE )); - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } private void renderAbsorptionCounter() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcClickboxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcClickboxOverlay.java index 452b87af91..65cad558b5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcClickboxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcClickboxOverlay.java @@ -29,7 +29,6 @@ import java.awt.BasicStroke; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.Polygon; import java.util.Map; import javax.inject.Inject; @@ -58,7 +57,7 @@ public class NpcClickboxOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { Map npcMap = plugin.getHighlightedNpcs(); for (NPC npc : npcMap.keySet()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java index 29859810d2..7fd4b9487d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java @@ -28,7 +28,6 @@ package net.runelite.client.plugins.npchighlight; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.util.Map; import javax.inject.Inject; import net.runelite.api.NPC; @@ -52,7 +51,7 @@ public class NpcMinimapOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { Map npcMap = plugin.getHighlightedNpcs(); for (NPC npc : npcMap.keySet()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java index d70a952824..1cf8df8c98 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java @@ -94,7 +94,7 @@ class OpponentInfoOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { Actor opponent = getOpponent(); @@ -157,7 +157,7 @@ class OpponentInfoOverlay extends Overlay final BackgroundComponent backgroundComponent = new BackgroundComponent(); backgroundComponent.setRectangle(new Rectangle(0, 0, WIDTH, height)); - backgroundComponent.render(graphics, parent); + backgroundComponent.render(graphics); int y = TOP_BORDER + fm.getHeight(); @@ -166,7 +166,7 @@ class OpponentInfoOverlay extends Overlay final TextComponent textComponent = new TextComponent(); textComponent.setPosition(new Point(x, y)); textComponent.setText(opponentName); - textComponent.render(graphics, parent); + textComponent.render(graphics); y += 3; } @@ -199,7 +199,7 @@ class OpponentInfoOverlay extends Overlay final TextComponent textComponent1 = new TextComponent(); textComponent1.setText(str); textComponent1.setPosition(new Point((WIDTH - fm.stringWidth(str)) / 2, y)); - textComponent1.render(graphics, parent); + textComponent1.render(graphics); y += 3; } @@ -212,7 +212,7 @@ class OpponentInfoOverlay extends Overlay final TextComponent textComponent = new TextComponent(); textComponent.setPosition(new Point(x, y)); textComponent.setText(opponentsOpponentName); - textComponent.render(graphics, parent); + textComponent.render(graphics); } return new Dimension(WIDTH, height); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlOverlay.java index a6ca3c955f..66abc6871c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlOverlay.java @@ -34,7 +34,6 @@ import java.awt.Dimension; import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.geom.Rectangle2D; import java.util.Arrays; import javax.inject.Inject; @@ -71,7 +70,7 @@ public class PestControlOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point point) + public Dimension render(Graphics2D graphics) { // See if we are in a game or not if (client.getWidget(WidgetInfo.PESTCONTROL_BLUE_SHIELD) == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java index 29c8dfc76e..266def094c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.playerindicators; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Player; @@ -54,7 +53,7 @@ public class PlayerIndicatorsMinimapOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { playerIndicatorsService.forEachPlayer((player, color) -> renderPlayerOverlay(graphics, player, color)); return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java index 09eabf6c16..6dce1e04ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.playerindicators; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.Polygon; import javax.inject.Inject; import javax.inject.Singleton; @@ -53,7 +52,7 @@ public class PlayerIndicatorsOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { playerIndicatorsService.forEachPlayer((player, color) -> renderPlayerOverlay(graphics, player, color)); return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java index e539d717b5..5d9dd455ef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java @@ -58,7 +58,7 @@ public class BurnerOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { if (!config.showBurner()) { @@ -71,18 +71,18 @@ public class BurnerOverlay extends Overlay { if (BURNER_UNLIT.contains(object.getId())) { - drawBurner(graphics, "Unlit", object, Color.RED, parent); + drawBurner(graphics, "Unlit", object, Color.RED); } else if (BURNER_LIT.contains(object.getId())) { - drawBurner(graphics, "Lit", object, Color.GREEN, parent); + drawBurner(graphics, "Lit", object, Color.GREEN); } } }); return null; } - private void drawBurner(Graphics2D graphics, String text, TileObject tileObject, Color color, java.awt.Point parent) + private void drawBurner(Graphics2D graphics, String text, TileObject tileObject, Color color) { Point canvasText = Perspective.getCanvasTextLocation(client, graphics, tileObject.getLocalLocation(), text, 200); @@ -94,7 +94,7 @@ public class BurnerOverlay extends Overlay textComponent.setText(text); textComponent.setPosition(new java.awt.Point(canvasText.getX(), canvasText.getY())); textComponent.setColor(color); - textComponent.render(graphics, parent); + textComponent.render(graphics); //render tile OverlayUtil.renderPolygon(graphics, tileObject.getCanvasTilePoly(), color); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java index ee69d10bda..5db0ed5c78 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java @@ -67,7 +67,7 @@ public class PohOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { LocalPoint localLocation = client.getLocalPlayer().getLocalLocation(); plugin.getPohObjects().forEach((object, tile) -> diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickOverlay.java index ff9c61e442..0039daa786 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.prayflick; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.geom.Rectangle2D; import java.time.Duration; import java.time.Instant; @@ -61,7 +60,7 @@ public class PrayerFlickOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point point) + public Dimension render(Graphics2D graphics) { if (!prayersActive) //If there are no prayers active we don't need to be flicking { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java index fa02883b66..33b8aff485 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java @@ -100,7 +100,7 @@ public class PuzzleSolverOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { if ((!config.displaySolution() && !config.displayRemainingMoves()) || client.getGameState() != GameState.LOGGED_IN) @@ -323,7 +323,7 @@ public class PuzzleSolverOverlay extends Overlay BackgroundComponent backgroundComponent = new BackgroundComponent(); backgroundComponent.setRectangle(new Rectangle(x, y, INFO_BOX_WIDTH, height)); - backgroundComponent.render(graphics, parent); + backgroundComponent.render(graphics); int textOffsetX = (INFO_BOX_WIDTH - fm.stringWidth(infoString)) / 2; int textOffsetY = fm.getHeight(); @@ -331,7 +331,7 @@ public class PuzzleSolverOverlay extends Overlay TextComponent textComponent = new TextComponent(); textComponent.setPosition(new Point(x + textOffsetX, y + textOffsetY)); textComponent.setText(infoString); - textComponent.render(graphics, parent); + textComponent.render(graphics); } // Solve the puzzle if we don't have an up to date solution diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java index 4d52a71dcb..15495f0ef7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.pyramidplunder; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.Varbits; @@ -52,7 +51,7 @@ public class PyramidPlunderOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { Widget pyramidPlunderInfo = client.getWidget(WidgetInfo.PYRAMID_PLUNDER_DATA); @@ -79,7 +78,7 @@ public class PyramidPlunderOverlay extends Overlay "Room: ", String.valueOf(client.getSetting(Varbits.PYRAMID_PLUNDER_ROOM)) + "/8" )); - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } public void showWidget() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java index 8dee771f3e..c9b981b2a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.raids; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import javax.inject.Inject; import lombok.Setter; import net.runelite.client.plugins.raids.solver.Room; @@ -55,7 +54,7 @@ public class RaidsOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { if (plugin.isInRaidChambers()) { @@ -73,7 +72,7 @@ public class RaidsOverlay extends Overlay { panelComponent.setTitleColor(Color.RED); panelComponent.setTitle("Unable to scout this raid!"); - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } panelComponent.setTitleColor(Color.WHITE); @@ -147,6 +146,6 @@ public class RaidsOverlay extends Overlay } } - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java index 456c165e5d..8a6ce96147 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java @@ -28,7 +28,6 @@ import java.awt.BasicStroke; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.Rectangle; import java.awt.RenderingHints; import java.awt.Stroke; @@ -68,7 +67,7 @@ public class RegenMeterOverlay extends Overlay } @Override - public Dimension render(Graphics2D g, Point point) + public Dimension render(Graphics2D g) { g.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java index 19f5542fc3..21720c15ef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java @@ -54,7 +54,7 @@ public class RoguesDenOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { if (!plugin.isHasGem()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java index 855f47c24f..8a211ba7c2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java @@ -83,7 +83,7 @@ class AbyssOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { if (!config.showRifts()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/BindNeckOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/BindNeckOverlay.java index 3c18c06914..6e8dbcd24f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/BindNeckOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/BindNeckOverlay.java @@ -63,7 +63,7 @@ public class BindNeckOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { if (!config.showBindNeck()) { @@ -82,7 +82,7 @@ public class BindNeckOverlay extends Overlay textComponent.setPosition(new Point(bounds.x, bounds.y + 16)); textComponent.setText(text); textComponent.setColor(color); - textComponent.render(graphics, parent); + textComponent.render(graphics); } return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java index 396eb2df30..84b193dfdc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java @@ -64,7 +64,7 @@ public class RunecraftOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { if (!config.showPouch()) { @@ -104,7 +104,7 @@ public class RunecraftOverlay extends Overlay final TextComponent textComponent = new TextComponent(); textComponent.setPosition(new Point(bounds.x, bounds.y + 16)); textComponent.setText(String.valueOf(client.getSetting(varbits))); - textComponent.render(graphics, parent); + textComponent.render(graphics); } return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index 6dab8160e1..35f64f3e11 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -79,7 +79,7 @@ public class RunepouchOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point point) + public Dimension render(Graphics2D graphics) { Query query = new InventoryWidgetItemQuery().idEquals(ItemID.RUNE_POUCH); WidgetItem[] items = queryRunner.runQuery(query); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java index e44b838860..13483b28ae 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java @@ -91,7 +91,7 @@ class SlayerOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { if (!config.showItemOverlay()) { @@ -122,7 +122,7 @@ class SlayerOverlay extends Overlay textComponent.setPosition(new Point(bounds.x, bounds.y + (slayerJewelry.contains(itemId) ? bounds.height : graphics.getFontMetrics().getHeight()))); - textComponent.render(graphics, parent); + textComponent.render(graphics); } return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java index 4ecc453984..0cee24c583 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.teamcapes; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.util.Map; import javax.inject.Inject; import net.runelite.client.ui.overlay.Overlay; @@ -51,7 +50,7 @@ public class TeamCapesOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { Map teams = plugin.getTeams(); if (teams.isEmpty()) @@ -72,6 +71,6 @@ public class TeamCapesOverlay extends Overlay )); } } - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java index c0e0f11f91..7a0337b43f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java @@ -51,7 +51,7 @@ public class TileIndicatorsOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point parent) + public Dimension render(Graphics2D graphics) { LocalPoint dest = client.getLocalDestinationLocation(); if (dest == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java index f3807ff365..7848bbc55b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.woodcutting; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.time.Duration; import java.time.Instant; import java.util.stream.IntStream; @@ -74,7 +73,7 @@ class WoodcuttingOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { WoodcuttingSession session = plugin.getSession(); @@ -121,6 +120,6 @@ class WoodcuttingOverlay extends Overlay } } - return panelComponent.render(graphics, parent); + return panelComponent.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java index 880da56886..4af5ed6105 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java @@ -78,7 +78,7 @@ public class XpGlobesOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, java.awt.Point point) + public Dimension render(Graphics2D graphics) { //if this is null there is no reason to draw e.g. switching between resizable and fixed Widget viewportWidget = client.getViewportWidget(); @@ -118,7 +118,7 @@ public class XpGlobesOverlay extends Overlay for (XpGlobe xpGlobe : xpChangedQueue) { - renderProgressCircle(graphics, point, xpGlobe, startDrawX, DEFAULT_START_Y); + renderProgressCircle(graphics, xpGlobe, startDrawX, DEFAULT_START_Y); startDrawX += MINIMUM_STEP + config.xpOrbSize(); } plugin.removeExpiredXpGlobes(); @@ -126,7 +126,7 @@ public class XpGlobesOverlay extends Overlay return null; } - private void renderProgressCircle(Graphics2D graphics, java.awt.Point parent, XpGlobe skillToDraw, int x, int y) + private void renderProgressCircle(Graphics2D graphics, XpGlobe skillToDraw, int x, int y) { double radiusCurrentXp = skillToDraw.getSkillProgressRadius(); double radiusToGoalXp = 360; //draw a circle @@ -158,7 +158,7 @@ public class XpGlobesOverlay extends Overlay if (config.enableTooltips()) { - drawTooltipIfMouseover(graphics, parent, skillToDraw, backgroundCircle); + drawTooltipIfMouseover(graphics, skillToDraw, backgroundCircle); } } @@ -201,7 +201,7 @@ public class XpGlobesOverlay extends Overlay ); } - private void drawTooltipIfMouseover(Graphics2D graphics, java.awt.Point parent, XpGlobe mouseOverSkill, Ellipse2D drawnGlobe) + private void drawTooltipIfMouseover(Graphics2D graphics, XpGlobe mouseOverSkill, Ellipse2D drawnGlobe) { Point mouse = client.getMouseCanvasPosition(); int mouseX = mouse.getX(); @@ -243,6 +243,6 @@ public class XpGlobesOverlay extends Overlay xpTooltip.setProgressBar(progressBar); } - xpTooltip.render(graphics, parent); + xpTooltip.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index 5b0565497a..ef82c64b45 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -490,7 +490,7 @@ public class OverlayRenderer extends MouseListener implements KeyListener { final Graphics2D subGraphics = (Graphics2D) graphics.create(); subGraphics.translate(point.x, point.y); - final Dimension dimension = MoreObjects.firstNonNull(overlay.render(subGraphics, point), new Dimension()); + final Dimension dimension = MoreObjects.firstNonNull(overlay.render(subGraphics), new Dimension()); subGraphics.dispose(); overlay.setBounds(new Rectangle(point, dimension)); } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/RenderableEntity.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/RenderableEntity.java index ddd26829e1..e02db823f1 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/RenderableEntity.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/RenderableEntity.java @@ -26,9 +26,8 @@ package net.runelite.client.ui.overlay; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; public interface RenderableEntity { - Dimension render(Graphics2D graphics, Point parent); + Dimension render(Graphics2D graphics); } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/BackgroundComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/BackgroundComponent.java index 2eff8719a6..e3d5145570 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/BackgroundComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/BackgroundComponent.java @@ -27,7 +27,6 @@ package net.runelite.client.ui.overlay.components; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.Rectangle; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; @@ -62,7 +61,7 @@ public class BackgroundComponent implements RenderableEntity private boolean fill = true; @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { Color outsideStrokeColor = new Color( Math.max(0, backgroundColor.getRed() - OUTSIDE_STROKE_RED_OFFSET), diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ImagePanelComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ImagePanelComponent.java index 2fcfee2b20..cc81463875 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ImagePanelComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ImagePanelComponent.java @@ -63,7 +63,7 @@ public class ImagePanelComponent implements RenderableEntity private Point position = new Point(); @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { final Dimension dimension = new Dimension(); final FontMetrics metrics = graphics.getFontMetrics(); @@ -101,7 +101,7 @@ public class ImagePanelComponent implements RenderableEntity final BackgroundComponent backgroundComponent = new BackgroundComponent(); backgroundComponent.setBackgroundColor(backgroundColor); backgroundComponent.setRectangle(new Rectangle(position.x, position.y, dimension.width, dimension.height)); - backgroundComponent.render(graphics, parent); + backgroundComponent.render(graphics); // Render title if (!Strings.isNullOrEmpty(title)) @@ -110,12 +110,12 @@ public class ImagePanelComponent implements RenderableEntity titleComponent.setText(title); titleComponent.setColor(titleColor); titleComponent.setPosition(new Point(position.x + (width - metrics.stringWidth(title)) / 2, y)); - titleComponent.render(graphics, parent); + titleComponent.render(graphics); y += SEPARATOR; } // Render all images - int imageOffsetX = ((width - imageWidth) / 2) - (SEPARATOR / 2); + int imageOffsetX = ((width - imageWidth) / 2); for (final BufferedImage image : images) { graphics.drawImage(image, imageOffsetX + ((imageWidth / images.size()) - image.getWidth()) / 2, y, null); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/InfoBoxComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/InfoBoxComponent.java index 51befb8c7a..e089c1978d 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/InfoBoxComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/InfoBoxComponent.java @@ -58,14 +58,14 @@ public class InfoBoxComponent implements RenderableEntity private BufferedImage image; @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { final FontMetrics metrics = graphics.getFontMetrics(); final Rectangle bounds = new Rectangle(position.x, position.y, BOX_SIZE, BOX_SIZE); final BackgroundComponent backgroundComponent = new BackgroundComponent(); backgroundComponent.setBackgroundColor(backgroundColor); backgroundComponent.setRectangle(bounds); - backgroundComponent.render(graphics, parent); + backgroundComponent.render(graphics); if (Objects.nonNull(image)) { @@ -80,7 +80,7 @@ public class InfoBoxComponent implements RenderableEntity textComponent.setPosition(new Point( position.x + ((BOX_SIZE - metrics.stringWidth(text)) / 2), BOX_SIZE - SEPARATOR)); - textComponent.render(graphics, parent); + textComponent.render(graphics); return new Dimension(BOX_SIZE, BOX_SIZE); } } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/MinimapOrb.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/MinimapOrb.java deleted file mode 100644 index d6af159ae2..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/MinimapOrb.java +++ /dev/null @@ -1,264 +0,0 @@ -/* - * Copyright (c) 2018 Abex - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.ui.overlay.components; - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.RadialGradientPaint; -import java.awt.Shape; -import java.awt.geom.Point2D; -import java.awt.image.BufferedImage; -import java.io.IOException; -import javax.imageio.ImageIO; -import lombok.Getter; -import lombok.Setter; -import net.runelite.client.ui.FontManager; -import net.runelite.client.ui.overlay.RenderableEntity; - -public class MinimapOrb implements RenderableEntity -{ - private static final int ORB_X = 26; - private static final int ORB_Y = 2; - private static final int ORB_W = 29; - - private static final Color BACKGROUND_COLOR = new Color(20, 20, 20); - private static final Color HIGHLIGHT_COLOR = new Color(255, 255, 255, 50); - - // Frame - private static final BufferedImage FRAME; - - static - { - try - { - synchronized (ImageIO.class) - { - FRAME = ImageIO.read(MinimapOrb.class.getResourceAsStream("minimap_orb_background.png")); - } - } - catch (IOException e) - { - throw new RuntimeException(e); - } - } - - // black background - private static final BufferedImage BACKGROUND = createOval(BACKGROUND_COLOR); - - // Highlight for recharge - private static final BufferedImage HIGHLIGHT = createOval(HIGHLIGHT_COLOR); - - private static BufferedImage createOval(Color color) - { - BufferedImage img = new BufferedImage(ORB_W, ORB_W, BufferedImage.TYPE_INT_ARGB); - Graphics2D g = img.createGraphics(); - - g.setColor(color); - g.fillOval(0, 0, ORB_W, ORB_W); - - // fillOval seems to be slightly different than the circle in the orb - // so we just draw part of the frame ontop so it doesn't overdraw when we don't draw the - // frame in the normal render (for hitpoints, etc.) - g.drawImage(FRAME, -ORB_X, -ORB_Y, null); - - return img; - } - - // Color and reflection highlight - private final BufferedImage fill; - // Shadow for when enabled - private final BufferedImage fillEnabled; - - /** - * icon to draw ontop - */ - @Getter - @Setter - private BufferedImage overlay; - - /** - * how far filled the orb should be - */ - @Getter - @Setter - private double percentFilled; - - /** - * how far through the recharge this stat is - */ - @Getter - @Setter - private double rechargePercentFilled; - - /** - * number to display on the orb - */ - @Getter - @Setter - private int amount; - - /** - * should it look like it pressed down - */ - @Getter - @Setter - private boolean enabled; - - /** - * Creates a minimap orb like the prayer/HP/run orbs including a background and frame - */ - public MinimapOrb(Color color, Color enabledColor, BufferedImage overlay) - { - this.fill = createFill(color, false); - this.fillEnabled = createFill(enabledColor, true); - - this.overlay = overlay; - } - - - /** - * Creates a minimap orb like the prayer/HP/run orbs without the background, frame, etc. - * The only part that is rendered is the icon and the recharge - */ - public MinimapOrb(BufferedImage overlay) - { - this.fill = null; - this.fillEnabled = null; - this.overlay = overlay; - } - - private static BufferedImage createFill(Color color, boolean enabled) - { - BufferedImage bufferedImage = new BufferedImage(ORB_W, ORB_W, BufferedImage.TYPE_INT_ARGB); - Graphics2D graphics = bufferedImage.createGraphics(); - float[] dist = {0.2f, 1f}; - - int r = color.getRed(); - int g = color.getGreen(); - int b = color.getBlue(); - int a = color.getAlpha(); - - float darkenMultiplier = 0.4f; - Point2D center = new Point2D.Float(ORB_W / 2.7f, ORB_W / 2.7f); - - if (enabled) - { - // Darken and move center to make it look like the orb is pressed down - darkenMultiplier = 0.20f; - center = new Point2D.Float((ORB_W / 1.8f), (ORB_W / 1.8f)); - dist = new float[]{0.7f, 1f}; - } - - // Darken the base color to create a shadow effect on the edges of the orb - r *= darkenMultiplier; - g *= darkenMultiplier; - b *= darkenMultiplier; - - Color[] colors = {color, new Color(r, g, b, a)}; - - // Divided by 2.7f for a gradient in the top left of the orb - graphics.setPaint(new RadialGradientPaint(center, ORB_W / 2.0f, dist, colors)); - - graphics.fillOval(0, 0, ORB_W, ORB_W); - - return bufferedImage; - } - - /** - * Draws a minimap orb like the prayer/HP/run orbs. - * - * @param graphics graphics to draw to - * @param pos top left position of the orb - */ - @Override - public Dimension render(Graphics2D graphics, Point pos) - { - int orbX = pos.x + ORB_X; - int orbY = pos.y + ORB_Y; - - percentFilled = Math.max(Math.min(percentFilled, 1), 0); - rechargePercentFilled = Math.max(Math.min(rechargePercentFilled, 1), 0); - - if (fill != null) - { - graphics.drawImage(BACKGROUND, orbX, orbY, null); - } - - Shape clip = graphics.getClip(); - - if (fill != null) - { - int height = (int) (percentFilled * ORB_W); - graphics.setClip(orbX, orbY + (ORB_W - height), ORB_W, height); - graphics.drawImage(enabled ? fillEnabled : fill, orbX, orbY, null); - } - - { - int height = (int) (rechargePercentFilled * ORB_W); - graphics.setClip(orbX, orbY + (ORB_W - height), ORB_W, height); - graphics.drawImage(HIGHLIGHT, orbX, orbY, null); - } - graphics.setClip(clip); - - if (fill != null) - { - graphics.drawImage(FRAME, pos.x, pos.y, null); - } - - graphics.drawImage( - overlay, - orbX + (1 + ORB_W - overlay.getWidth()) / 2, - orbY + (1 + ORB_W - overlay.getHeight()) / 2, - null - ); - - if (fill != null) - { - Font font = FontManager.getRunescapeSmallFont(); - graphics.setFont(font); - - FontMetrics fm = graphics.getFontMetrics(); - - String numberString = Integer.toString(amount); - - int textX = pos.x + (ORB_X - fm.stringWidth(numberString)) / 2; - int textY = pos.y + 27; - - graphics.setColor(Color.black); - graphics.drawString(numberString, textX + 1, textY + 1); - - Color textColor = Color.getHSBColor((float) percentFilled * (120.f / 360.f), 1, 1); - graphics.setColor(textColor); - graphics.drawString(numberString, textX, textY); - } - - return new Dimension(BACKGROUND.getWidth(), BACKGROUND.getHeight()); - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/PanelComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/PanelComponent.java index af6748594d..1936734869 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/PanelComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/PanelComponent.java @@ -82,7 +82,7 @@ public class PanelComponent implements RenderableEntity private int width = 129; @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { final Dimension dimension = new Dimension(); final int elementNumber = (Strings.isNullOrEmpty(title) ? 0 : 1) + lines.size() + (Objects.isNull(progressBar) ? 0 : 1); @@ -106,7 +106,7 @@ public class PanelComponent implements RenderableEntity final BackgroundComponent backgroundComponent = new BackgroundComponent(); backgroundComponent.setBackgroundColor(backgroundColor); backgroundComponent.setRectangle(new Rectangle(position.x, position.y, dimension.width, dimension.height)); - backgroundComponent.render(graphics, parent); + backgroundComponent.render(graphics); // Render title if (!Strings.isNullOrEmpty(title)) @@ -115,7 +115,7 @@ public class PanelComponent implements RenderableEntity titleComponent.setText(title); titleComponent.setColor(titleColor); titleComponent.setPosition(new Point(position.x + (width - metrics.stringWidth(title)) / 2, y)); - titleComponent.render(graphics, parent); + titleComponent.render(graphics); y += metrics.getHeight() + SEPARATOR; } @@ -126,13 +126,13 @@ public class PanelComponent implements RenderableEntity leftLineComponent.setPosition(new Point(position.x + LEFT_BORDER, y)); leftLineComponent.setText(line.getLeft()); leftLineComponent.setColor(line.getLeftColor()); - leftLineComponent.render(graphics, parent); + leftLineComponent.render(graphics); final TextComponent rightLineComponent = new TextComponent(); rightLineComponent.setPosition(new Point(position.x + width - RIGHT_BORDER - metrics.stringWidth(TextComponent.textWithoutColTags(line.getRight())), y)); rightLineComponent.setText(line.getRight()); rightLineComponent.setColor(line.getRightColor()); - rightLineComponent.render(graphics, parent); + rightLineComponent.render(graphics); y += metrics.getHeight() + SEPARATOR; } @@ -141,7 +141,7 @@ public class PanelComponent implements RenderableEntity { progressBar.setWidth(width - LEFT_BORDER - RIGHT_BORDER); progressBar.setPosition(new Point(position.x + LEFT_BORDER, y - (metrics.getHeight() / 2))); - progressBar.render(graphics, parent); + progressBar.render(graphics); } return dimension; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java index 55319e28bb..00b8f624f5 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java @@ -62,7 +62,7 @@ public class ProgressBarComponent @Setter private int height = 16; - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { FontMetrics metrics = graphics.getFontMetrics(); @@ -95,7 +95,7 @@ public class ProgressBarComponent textComponent.setPosition(new Point(progressTextX, progressTextY)); textComponent.setColor(fontColor); textComponent.setText(textToWrite); - textComponent.render(graphics, parent); + textComponent.render(graphics); return new Dimension(width, height); } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java index 39a3568cff..11f3615feb 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java @@ -54,7 +54,7 @@ public class TextComponent implements RenderableEntity } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { final FontMetrics fontMetrics = graphics.getFontMetrics(); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TooltipComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TooltipComponent.java index 25f5036179..f8ede5a7ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TooltipComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TooltipComponent.java @@ -55,7 +55,7 @@ public class TooltipComponent implements RenderableEntity private IndexedSprite[] modIcons; @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { graphics.setFont(FontManager.getRunescapeSmallFont()); @@ -101,7 +101,7 @@ public class TooltipComponent implements RenderableEntity final BackgroundComponent backgroundComponent = new BackgroundComponent(); backgroundComponent.setBackgroundColor(backgroundColor); backgroundComponent.setRectangle(tooltipBackground); - backgroundComponent.render(graphics, parent); + backgroundComponent.render(graphics); graphics.setColor(Color.WHITE); // Render tooltip - text - line by line @@ -125,7 +125,7 @@ public class TooltipComponent implements RenderableEntity String text = line.substring(begin, j); textComponent.setText(text); textComponent.setPosition(new Point(lineX, textY + (i + 1) * textHeight - textDescent)); - textComponent.render(graphics, parent); + textComponent.render(graphics); lineX += metrics.stringWidth(text); @@ -162,7 +162,7 @@ public class TooltipComponent implements RenderableEntity String text = line.substring(begin, j + 1); textComponent.setText(text); textComponent.setPosition(new Point(lineX, textY + (i + 1) * textHeight - textDescent)); - textComponent.render(graphics, parent); + textComponent.render(graphics); lineX += metrics.stringWidth(text); } @@ -176,7 +176,7 @@ public class TooltipComponent implements RenderableEntity textComponent.setColor(nextColor); textComponent.setText(line.substring(begin, line.length())); textComponent.setPosition(new Point(lineX, textY + (i + 1) * textHeight - textDescent)); - textComponent.render(graphics, parent); + textComponent.render(graphics); } return new Dimension(tooltipWidth + OFFSET * 2, tooltipHeight + OFFSET * 2); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxOverlay.java index 788382bfcc..c18b780c75 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxOverlay.java @@ -60,7 +60,7 @@ public class InfoBoxOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { List infoBoxes = infoboxManager.getInfoBoxes(); @@ -85,12 +85,12 @@ public class InfoBoxOverlay extends Overlay infoBoxComponent.setImage(box.getImage()); infoBoxComponent.setText(box.getText()); infoBoxComponent.setPosition(new Point(x, 0)); - final Dimension infoBoxBounds = infoBoxComponent.render(graphics, parent); + final Dimension infoBoxBounds = infoBoxComponent.render(graphics); if (!Strings.isNullOrEmpty(box.getTooltip())) { final Rectangle intersectionRectangle = new Rectangle(infoBoxBounds); - intersectionRectangle.setLocation(parent); + intersectionRectangle.setLocation(getBounds().getLocation()); intersectionRectangle.translate(x, 0); final Point transformed = OverlayUtil.transformPosition(getPosition(), intersectionRectangle.getSize()); intersectionRectangle.translate(transformed.x, transformed.y); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java index d84074e304..91deb3ee56 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java @@ -55,7 +55,7 @@ public class TooltipOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { final List tooltips = tooltipManager.getTooltips(); @@ -97,7 +97,7 @@ public class TooltipOverlay extends Overlay // render tooltip tooltipComponent.setPosition(position); - final Dimension thisSize = tooltipComponent.render(graphics, parent); + final Dimension thisSize = tooltipComponent.render(graphics); // update tooltip bounding rect if (lastLocation == null) diff --git a/runelite-client/src/test/java/net/runelite/client/ui/overlay/OverlayRendererTest.java b/runelite-client/src/test/java/net/runelite/client/ui/overlay/OverlayRendererTest.java index 7a5de1fcb2..da4886f855 100644 --- a/runelite-client/src/test/java/net/runelite/client/ui/overlay/OverlayRendererTest.java +++ b/runelite-client/src/test/java/net/runelite/client/ui/overlay/OverlayRendererTest.java @@ -26,7 +26,6 @@ package net.runelite.client.ui.overlay; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -41,7 +40,7 @@ class TestOverlay extends Overlay } @Override - public Dimension render(Graphics2D graphics, Point parent) + public Dimension render(Graphics2D graphics) { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/runelite-client/src/test/java/net/runelite/client/ui/overlay/components/TextComponentTest.java b/runelite-client/src/test/java/net/runelite/client/ui/overlay/components/TextComponentTest.java index 52e44b90f6..71049e0976 100644 --- a/runelite-client/src/test/java/net/runelite/client/ui/overlay/components/TextComponentTest.java +++ b/runelite-client/src/test/java/net/runelite/client/ui/overlay/components/TextComponentTest.java @@ -59,7 +59,7 @@ public class TextComponentTest TextComponent textComponent = new TextComponent(); textComponent.setText("test"); textComponent.setColor(Color.RED); - textComponent.render(graphics, new Point(0, 0)); + textComponent.render(graphics); verify(graphics, times(2)).drawString(eq("test"), anyInt(), anyInt()); verify(graphics, atLeastOnce()).setColor(Color.RED); } @@ -69,7 +69,7 @@ public class TextComponentTest { TextComponent textComponent = new TextComponent(); textComponent.setText("test"); - textComponent.render(graphics, new Point(0, 0)); + textComponent.render(graphics); verify(graphics, times(2)).drawString(eq("test"), anyInt(), anyInt()); verify(graphics, atLeastOnce()).setColor(Color.BLUE); } @@ -79,7 +79,7 @@ public class TextComponentTest { TextComponent textComponent = new TextComponent(); textComponent.setText("test test"); - textComponent.render(graphics, new Point(0, 0)); + textComponent.render(graphics); verify(graphics, atLeastOnce()).drawString(eq("test"), anyInt(), anyInt()); verify(graphics, atLeastOnce()).drawString(eq(" test"), anyInt(), anyInt()); verify(graphics, atLeastOnce()).setColor(Color.BLUE);