From 248b238e9d1350e6344521884c8ee43989e5f1f5 Mon Sep 17 00:00:00 2001 From: James Munson Date: Sun, 9 Jun 2019 23:53:03 -0700 Subject: [PATCH] Updated inferno plugin --- .../client/plugins/inferno/InfernoConfig.java | 6 +++--- .../plugins/inferno/InfernoInfobox.java | 19 ++++++++----------- .../plugins/inferno/InfernoNibberOverlay.java | 14 +++++++------- .../client/plugins/inferno/InfernoPlugin.java | 4 ++-- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java index 24132a037a..10869a3301 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java @@ -33,9 +33,9 @@ public interface InfernoConfig extends Config { @ConfigItem( position = 0, - keyName = "Nibber Overlay", - name = "Nibber Overlay", - description = "Shows if there are any nibbas left" + keyName = "Player Overlay", + name = "Player Overlay", + description = "Shows if there are any players left" ) default boolean displayNibbaOverlay() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java index 7edf69cced..5273e719fd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java @@ -6,7 +6,8 @@ import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.components.LineComponent; +import net.runelite.client.ui.overlay.components.table.TableAlignment; +import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.ui.overlay.components.PanelComponent; public class InfernoInfobox extends Overlay @@ -32,26 +33,22 @@ public class InfernoInfobox extends Overlay if (!config.showPrayerHelp() || client.getMapRegions()[0] != 9043) return null; panelComponent.getChildren().clear(); + TableComponent tableComponent = new TableComponent(); + tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); for (int i = plugin.getPriorityNPC().length; i > 0; i--) { - if (plugin.getPriorityNPC()[i-1] == null) + if (plugin.getPriorityNPC()[i - 1] == null) { - panelComponent.getChildren().add(LineComponent.builder() - .left(Integer.toString(i)) - .right("-") - .build()); + tableComponent.addRow(Integer.toString(i), "-"); } else { - panelComponent.getChildren().add(LineComponent.builder() - .left(plugin.getPriorityNPC()[i-1].getName()) - .right(plugin.getPriorityNPC()[i-1].getAttackstyle().getName()) - .rightColor(plugin.getPriorityNPC()[i-1].getAttackstyle().getColor()) - .build()); + tableComponent.addRow(plugin.getPriorityNPC()[i - 1].getName(), plugin.getPriorityNPC()[i - 1 ].getAttackstyle().getName()); } } + panelComponent.getChildren().add(tableComponent); return panelComponent.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibberOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibberOverlay.java index e11dac5bfe..44a615900d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibberOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibberOverlay.java @@ -1,14 +1,14 @@ package net.runelite.client.plugins.inferno; -import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +import net.runelite.client.ui.overlay.components.table.TableAlignment; +import net.runelite.client.ui.overlay.components.table.TableComponent; public class InfernoNibberOverlay extends Overlay { @@ -35,12 +35,12 @@ public class InfernoNibberOverlay extends Overlay return null; panelComponent.getChildren().clear(); + TableComponent tableComponent = new TableComponent(); + tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); - panelComponent.getChildren().add(LineComponent.builder() - .left("Nibbas Left: ") - .right(Integer.toString(plugin.getNibbers().size())) - .leftColor(Color.BLUE) - .build()); + tableComponent.addRow("Players Left: ", Integer.toString(plugin.getNibbers().size())); + + panelComponent.getChildren().add(tableComponent); return panelComponent.render(graphics); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java index 548455749d..c8f4c15bbb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java @@ -194,9 +194,9 @@ public class InfernoPlugin extends Plugin { for (int i = 0; i < priorityNPC.length; i++) { - ArrayList monsters = monsterCurrentAttackMap.get(i+1); + ArrayList monsters = monsterCurrentAttackMap.get(i + 1); - if (monsters.size() == 0) continue; + if ( monsters.size() == 0) continue; int priority = monsters.get(0).getPriority();