Merge pull request #544 from runelite-extended/justice-for-nibblers

change from player to nibbler
This commit is contained in:
Lucwousin
2019-06-10 16:34:04 +02:00
committed by GitHub
3 changed files with 15 additions and 15 deletions

View File

@@ -33,11 +33,11 @@ public interface InfernoConfig extends Config
{ {
@ConfigItem( @ConfigItem(
position = 0, position = 0,
keyName = "Player Overlay", keyName = "Nibbler Overlay",
name = "Player Overlay", name = "Nibbler Overlay",
description = "Shows if there are any players left" description = "Shows if there are any Nibblers left"
) )
default boolean displayNibbaOverlay() default boolean displayNibblerOverlay()
{ {
return false; return false;
} }

View File

@@ -34,7 +34,7 @@ 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.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.ui.overlay.components.table.TableComponent;
public class InfernoNibberOverlay extends Overlay public class InfernoNibblerOverlay extends Overlay
{ {
private final Client client; private final Client client;
private final InfernoPlugin plugin; private final InfernoPlugin plugin;
@@ -43,7 +43,7 @@ public class InfernoNibberOverlay extends Overlay
private final PanelComponent panelComponent = new PanelComponent(); private final PanelComponent panelComponent = new PanelComponent();
@Inject @Inject
public InfernoNibberOverlay(Client client, InfernoConfig config, InfernoPlugin plugin) public InfernoNibblerOverlay(Client client, InfernoConfig config, InfernoPlugin plugin)
{ {
this.client = client; this.client = client;
this.config = config; this.config = config;
@@ -55,14 +55,14 @@ public class InfernoNibberOverlay extends Overlay
@Override @Override
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
if (!config.displayNibbaOverlay() || plugin.getNibbers().size() == 0 || client.getMapRegions()[0] != 9043) if (!config.displayNibblerOverlay() || plugin.getNibblers().size() == 0 || client.getMapRegions()[0] != 9043)
return null; return null;
panelComponent.getChildren().clear(); panelComponent.getChildren().clear();
TableComponent tableComponent = new TableComponent(); TableComponent tableComponent = new TableComponent();
tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
tableComponent.addRow("Nibblers Left: ", Integer.toString(plugin.getNibbers().size())); tableComponent.addRow("Nibblers Left: ", Integer.toString(plugin.getNibblers().size()));
panelComponent.getChildren().add(tableComponent); panelComponent.getChildren().add(tableComponent);

View File

@@ -67,7 +67,7 @@ public class InfernoPlugin extends Plugin
private InfernoInfobox infernoInfobox; private InfernoInfobox infernoInfobox;
@Inject @Inject
private InfernoNibberOverlay nibberOverlay; private InfernoNibblerOverlay nibblerOverlay;
@Inject @Inject
private InfernoConfig config; private InfernoConfig config;
@@ -79,7 +79,7 @@ public class InfernoPlugin extends Plugin
private Map<Integer, ArrayList<InfernoNPC>> monsterCurrentAttackMap; private Map<Integer, ArrayList<InfernoNPC>> monsterCurrentAttackMap;
@Getter @Getter
private List<NPC> nibbers; private List<NPC> nibblers;
@Getter @Getter
private InfernoNPC[] priorityNPC; private InfernoNPC[] priorityNPC;
@@ -95,14 +95,14 @@ public class InfernoPlugin extends Plugin
{ {
overlayManager.add(infernoOverlay); overlayManager.add(infernoOverlay);
overlayManager.add(infernoInfobox); overlayManager.add(infernoInfobox);
overlayManager.add(nibberOverlay); overlayManager.add(nibblerOverlay);
monsters = new HashMap<>(); monsters = new HashMap<>();
monsterCurrentAttackMap = new HashMap<>(6); monsterCurrentAttackMap = new HashMap<>(6);
for (int i = 1; i <= 6; i++) for (int i = 1; i <= 6; i++)
{ {
monsterCurrentAttackMap.put(i, new ArrayList<>()); monsterCurrentAttackMap.put(i, new ArrayList<>());
} }
nibbers = new ArrayList<>(); nibblers = new ArrayList<>();
priorityNPC = new InfernoNPC[4]; priorityNPC = new InfernoNPC[4];
} }
@@ -111,7 +111,7 @@ public class InfernoPlugin extends Plugin
{ {
overlayManager.remove(infernoInfobox); overlayManager.remove(infernoInfobox);
overlayManager.remove(infernoOverlay); overlayManager.remove(infernoOverlay);
overlayManager.remove(nibberOverlay); overlayManager.remove(nibblerOverlay);
} }
@Subscribe @Subscribe
@@ -127,7 +127,7 @@ public class InfernoPlugin extends Plugin
} }
if (npc.getId() == NpcID.JALNIB) if (npc.getId() == NpcID.JALNIB)
{ {
nibbers.add(npc); nibblers.add(npc);
} }
} }
@@ -145,7 +145,7 @@ public class InfernoPlugin extends Plugin
if (npc.getId() == NpcID.JALNIB) if (npc.getId() == NpcID.JALNIB)
{ {
nibbers.remove(npc); nibblers.remove(npc);
} }
} }