diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java index 7b0c039e44..7f97d6ab42 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java @@ -38,6 +38,7 @@ import net.runelite.client.ui.overlay.OverlayMenuEntry; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; +import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; @@ -66,8 +67,6 @@ class CombatOverlay extends Overlay getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Tick Counter")); } - - @Override public Dimension render(Graphics2D graphics) { @@ -77,12 +76,15 @@ class CombatOverlay extends Overlay Player local = client.getLocalPlayer(); if (local == null || local.getName() == null) + { return null; + } panelComponent.setBackgroundColor(config.bgColor()); panelComponent.getChildren().add(TitleComponent.builder().text("Tick Counter").color(config.titleColor()).build()); int total = 0; TableComponent tableComponent = new TableComponent(); + tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); if (plugin.getCounter().isEmpty()) { @@ -92,7 +94,9 @@ class CombatOverlay extends Overlay { Map map = this.plugin.getCounter(); if (map == null) + { return null; + } for (String name : map.keySet()) { @@ -127,4 +131,4 @@ class CombatOverlay extends Overlay return null; } } -} \ No newline at end of file +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java index 47f5839a59..998246ccf2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java @@ -37,6 +37,7 @@ import net.runelite.client.ui.overlay.OverlayMenuEntry; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; +import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; @@ -76,11 +77,14 @@ class DamageOverlay extends Overlay Player local = client.getLocalPlayer(); if (local == null || local.getName() == null) + { return null; + } panelComponent.setBackgroundColor(config.bgColor()); panelComponent.getChildren().add(TitleComponent.builder().text("Damage Counter").color(config.titleColor()).build()); TableComponent tableComponent = new TableComponent(); + tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); if (plugin.getCounter().isEmpty()) { @@ -90,7 +94,9 @@ class DamageOverlay extends Overlay { Map map = this.plugin.playerDamage; if (map == null) + { return null; + } for (String name : map.keySet()) { @@ -123,4 +129,4 @@ class DamageOverlay extends Overlay return null; } } -} \ No newline at end of file +}