From d211fc87d40ebb183c810e389930bbec0bb6248b Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Sat, 27 Jan 2018 21:17:14 +0100 Subject: [PATCH] Adjust overlay layers and priorities - Adjust overlay layers and priorities to correctly show f.e player names on top, but below ui elements/widget elements. Signed-off-by: Tomas Slusny --- .../plugins/agilityplugin/AgilityOverlay.java | 2 +- .../BarbarianAssaultOverlay.java | 2 ++ .../client/plugins/cannon/CannonOverlay.java | 2 ++ .../plugins/fishing/FishingSpotOverlay.java | 2 ++ .../grounditems/GroundItemsOverlay.java | 8 +++--- .../client/plugins/hunter/TrapOverlay.java | 2 ++ .../plugins/implings/ImplingsOverlay.java | 2 ++ .../motherlode/MotherlodeRocksOverlay.java | 2 +- .../motherlode/MotherlodeSackOverlay.java | 2 ++ .../PlayerIndicatorsOverlay.java | 2 ++ .../plugins/runecraft/AbyssOverlay.java | 28 ++++++++++--------- .../tileindicators/TileIndicatorsOverlay.java | 2 ++ .../plugins/xpglobes/XpGlobesOverlay.java | 2 ++ 13 files changed, 39 insertions(+), 19 deletions(-) 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 87e663d7f1..29fbd58c7c 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 @@ -50,7 +50,7 @@ public class AgilityOverlay extends Overlay public AgilityOverlay(@Nullable Client client, AgilityPlugin plugin, AgilityPluginConfiguration config) { setPosition(OverlayPosition.DYNAMIC); - setLayer(OverlayLayer.UNDER_WIDGETS); + setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; this.plugin = plugin; this.config = config; 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 271e3c6387..d419c785de 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 @@ -35,6 +35,7 @@ import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.widgets.Widget; import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; public class BarbarianAssaultOverlay extends Overlay @@ -52,6 +53,7 @@ public class BarbarianAssaultOverlay extends Overlay BarbarianAssaultOverlay(Client client, BarbarianAssaultPlugin plugin, BarbarianAssaultConfig config) { setPosition(OverlayPosition.DYNAMIC); + setLayer(OverlayLayer.ABOVE_WIDGETS); this.client = client; this.plugin = plugin; this.config = config; 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 740e069e0e..2ee8d67cfd 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 @@ -36,6 +36,7 @@ import net.runelite.api.Perspective; import net.runelite.api.widgets.Widget; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; +import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.TextComponent; class CannonOverlay extends Overlay @@ -49,6 +50,7 @@ class CannonOverlay extends Overlay CannonOverlay(Client client, CannonConfig config, CannonPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); + setPriority(OverlayPriority.MED); this.client = client; this.config = config; this.plugin = plugin; 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 3bc8bd9992..0018f33c73 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 @@ -37,6 +37,7 @@ import net.runelite.api.NPC; import net.runelite.api.queries.NPCQuery; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.util.QueryRunner; @@ -55,6 +56,7 @@ class FishingSpotOverlay extends Overlay public FishingSpotOverlay(QueryRunner queryRunner, FishingConfig config) { setPosition(OverlayPosition.DYNAMIC); + setLayer(OverlayLayer.ABOVE_SCENE); this.queryRunner = queryRunner; this.config = config; } 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 6590ecddb0..2613d1ff03 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 @@ -24,12 +24,12 @@ */ package net.runelite.client.plugins.grounditems; +import static java.lang.Math.max; +import static java.lang.Math.min; import java.awt.Color; import java.awt.Dimension; import java.awt.FontMetrics; import java.awt.Graphics2D; -import static java.lang.Math.max; -import static java.lang.Math.min; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -52,8 +52,8 @@ import net.runelite.api.widgets.Widget; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.http.api.item.ItemPrice; public class GroundItemsOverlay extends Overlay @@ -92,7 +92,7 @@ public class GroundItemsOverlay extends Overlay public GroundItemsOverlay(@Nullable Client client, GroundItemsConfig config) { setPosition(OverlayPosition.DYNAMIC); - setPriority(OverlayPriority.LOW); + setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; this.config = config; } 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 c776dd631a..79ec415fa9 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 @@ -35,6 +35,7 @@ import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.widgets.Widget; import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; /** @@ -71,6 +72,7 @@ public class TrapOverlay extends Overlay TrapOverlay(@Nullable Client client, HunterPlugin plugin, HunterConfig config) { setPosition(OverlayPosition.DYNAMIC); + setLayer(OverlayLayer.ABOVE_SCENE); this.plugin = plugin; this.config = config; this.client = client; 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 159a6dea1c..649378a616 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 @@ -40,6 +40,7 @@ import net.runelite.api.NpcID; import net.runelite.api.Point; import net.runelite.api.queries.NPCQuery; import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.util.QueryRunner; @@ -64,6 +65,7 @@ public class ImplingsOverlay extends Overlay public ImplingsOverlay(QueryRunner queryRunner, ImplingsConfig config) { setPosition(OverlayPosition.DYNAMIC); + setLayer(OverlayLayer.ABOVE_SCENE); this.queryRunner = queryRunner; this.config = config; } 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 8de088d31d..3351d08938 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 @@ -53,7 +53,7 @@ class MotherlodeRocksOverlay extends Overlay MotherlodeRocksOverlay(Client client, MotherlodePlugin plugin, MotherlodeConfig config) { setPosition(OverlayPosition.DYNAMIC); - setLayer(OverlayLayer.UNDER_WIDGETS); + setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; this.plugin = plugin; this.config = config; 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 f16fde8830..375095e127 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 @@ -34,6 +34,7 @@ import net.runelite.api.Varbits; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.PanelComponent; @@ -47,6 +48,7 @@ class MotherlodeSackOverlay extends Overlay MotherlodeSackOverlay(Client client, MotherlodeConfig config) { setPosition(OverlayPosition.TOP_LEFT); + setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; this.config = config; } 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 17623c2fac..af884a6078 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 @@ -34,6 +34,7 @@ import net.runelite.api.Client; import net.runelite.api.Player; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; +import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; @Slf4j @@ -50,6 +51,7 @@ public class PlayerIndicatorsOverlay extends Overlay this.config = config; this.client = client; setPosition(OverlayPosition.DYNAMIC); + setPriority(OverlayPriority.HIGH); } @Override 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 16c089fd72..7278aef5fb 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 @@ -24,19 +24,6 @@ */ package net.runelite.client.plugins.runecraft; -import com.google.inject.Inject; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.image.BufferedImage; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import net.runelite.api.Client; -import net.runelite.api.DecorativeObject; -import net.runelite.api.Perspective; -import net.runelite.api.Point; -import net.runelite.client.game.ItemManager; import static net.runelite.client.plugins.runecraft.AbyssRifts.AIR_RIFT; import static net.runelite.client.plugins.runecraft.AbyssRifts.BLOOD_RIFT; import static net.runelite.client.plugins.runecraft.AbyssRifts.BODY_RIFT; @@ -50,7 +37,21 @@ import static net.runelite.client.plugins.runecraft.AbyssRifts.MIND_RIFT; import static net.runelite.client.plugins.runecraft.AbyssRifts.NATURE_RIFT; import static net.runelite.client.plugins.runecraft.AbyssRifts.SOUL_RIFT; import static net.runelite.client.plugins.runecraft.AbyssRifts.WATER_RIFT; +import com.google.inject.Inject; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import net.runelite.api.Client; +import net.runelite.api.DecorativeObject; +import net.runelite.api.Perspective; +import net.runelite.api.Point; +import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; class AbyssOverlay extends Overlay @@ -72,6 +73,7 @@ class AbyssOverlay extends Overlay AbyssOverlay(Client client, RunecraftPlugin plugin, RunecraftConfig config) { setPosition(OverlayPosition.DYNAMIC); + setLayer(OverlayLayer.ABOVE_WIDGETS); this.client = client; this.plugin = plugin; this.config = config; 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 0a0b407070..2394f04f11 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 @@ -32,6 +32,7 @@ import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; @@ -46,6 +47,7 @@ public class TileIndicatorsOverlay extends Overlay this.client = client; this.config = config; setPosition(OverlayPosition.DYNAMIC); + setLayer(OverlayLayer.ABOVE_SCENE); setPriority(OverlayPriority.LOW); } 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 80d2e5e093..98fe82f249 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 @@ -45,6 +45,7 @@ import net.runelite.api.Point; import net.runelite.api.Skill; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; +import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.ProgressBarComponent; @@ -76,6 +77,7 @@ public class XpGlobesOverlay extends Overlay public XpGlobesOverlay(@Nullable Client client, XpGlobesPlugin plugin, XpGlobesConfig config) { setPosition(OverlayPosition.DYNAMIC); + setPriority(OverlayPriority.HIGH); this.client = client; this.plugin = plugin; this.config = config;