From 4edf646eb4dcaf6bbf4fb70858c947bb556cab0d Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Mon, 10 Jun 2019 14:34:43 +0100 Subject: [PATCH 1/4] change from player to nibbler --- .../client/plugins/inferno/InfernoConfig.java | 8 ++++---- ...bberOverlay.java => InfernoNibblerOverlay.java} | 8 ++++---- .../client/plugins/inferno/InfernoPlugin.java | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) rename runelite-client/src/main/java/net/runelite/client/plugins/inferno/{InfernoNibberOverlay.java => InfernoNibblerOverlay.java} (90%) 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 10869a3301..23cf569782 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,11 +33,11 @@ public interface InfernoConfig extends Config { @ConfigItem( position = 0, - keyName = "Player Overlay", - name = "Player Overlay", - description = "Shows if there are any players left" + keyName = "Nibbler Overlay", + name = "Nibbler Overlay", + description = "Shows if there are any Nibblers left" ) - default boolean displayNibbaOverlay() + default boolean displayNibblersOverlay() { return false; } 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/InfernoNibblerOverlay.java similarity index 90% rename from runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibberOverlay.java rename to runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java index 6e2468eb32..12d88ef2af 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/InfernoNibblerOverlay.java @@ -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.TableComponent; -public class InfernoNibberOverlay extends Overlay +public class InfernoNibblerOverlay extends Overlay { private final Client client; private final InfernoPlugin plugin; @@ -43,7 +43,7 @@ public class InfernoNibberOverlay extends Overlay private final PanelComponent panelComponent = new PanelComponent(); @Inject - public InfernoNibberOverlay(Client client, InfernoConfig config, InfernoPlugin plugin) + public InfernoNibblerOverlay(Client client, InfernoConfig config, InfernoPlugin plugin) { this.client = client; this.config = config; @@ -55,14 +55,14 @@ public class InfernoNibberOverlay extends Overlay @Override 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; panelComponent.getChildren().clear(); TableComponent tableComponent = new TableComponent(); 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); 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 e0d9741aa4..bc34017089 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 @@ -67,7 +67,7 @@ public class InfernoPlugin extends Plugin private InfernoInfobox infernoInfobox; @Inject - private InfernoNibberOverlay nibberOverlay; + private InfernoNibblerOverlay nibblerOverlay; @Inject private InfernoConfig config; @@ -79,7 +79,7 @@ public class InfernoPlugin extends Plugin private Map> monsterCurrentAttackMap; @Getter - private List nibbers; + private List nibblers; @Getter private InfernoNPC[] priorityNPC; @@ -95,14 +95,14 @@ public class InfernoPlugin extends Plugin { overlayManager.add(infernoOverlay); overlayManager.add(infernoInfobox); - overlayManager.add(nibberOverlay); + overlayManager.add(nibblerlOverlay); monsters = new HashMap<>(); monsterCurrentAttackMap = new HashMap<>(6); for (int i = 1; i <= 6; i++) { monsterCurrentAttackMap.put(i, new ArrayList<>()); } - nibbers = new ArrayList<>(); + nibblers = new ArrayList<>(); priorityNPC = new InfernoNPC[4]; } @@ -111,7 +111,7 @@ public class InfernoPlugin extends Plugin { overlayManager.remove(infernoInfobox); overlayManager.remove(infernoOverlay); - overlayManager.remove(nibberOverlay); + overlayManager.remove(nibblerOverlay); } @Subscribe @@ -127,7 +127,7 @@ public class InfernoPlugin extends Plugin } 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) { - nibbers.remove(npc); + nibblers.remove(npc); } } From 37f80184c4fc77180667b27c348488d87c32427e Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Mon, 10 Jun 2019 14:41:27 +0100 Subject: [PATCH 2/4] justice --- .../client/plugins/inferno/InfernoConfig.java | 2 +- .../plugins/inferno/InfernoNibberOverlay.java | 71 +++++++++++++++++++ .../client/plugins/inferno/InfernoPlugin.java | 2 +- 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibberOverlay.java 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 23cf569782..d6cd48ccce 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 @@ -37,7 +37,7 @@ public interface InfernoConfig extends Config name = "Nibbler Overlay", description = "Shows if there are any Nibblers left" ) - default boolean displayNibblersOverlay() + default boolean displayNibblerOverlay() { return false; } 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 new file mode 100644 index 0000000000..12d88ef2af --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibberOverlay.java @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2019, Jacky + * 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.plugins.inferno; + +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.PanelComponent; +import net.runelite.client.ui.overlay.components.table.TableAlignment; +import net.runelite.client.ui.overlay.components.table.TableComponent; + +public class InfernoNibblerOverlay extends Overlay +{ + private final Client client; + private final InfernoPlugin plugin; + private final InfernoConfig config; + + private final PanelComponent panelComponent = new PanelComponent(); + + @Inject + public InfernoNibblerOverlay(Client client, InfernoConfig config, InfernoPlugin plugin) + { + this.client = client; + this.config = config; + this.plugin = plugin; + setPosition(OverlayPosition.TOP_LEFT); + } + + + @Override + public Dimension render(Graphics2D graphics) + { + if (!config.displayNibblerOverlay() || plugin.getNibblers().size() == 0 || client.getMapRegions()[0] != 9043) + return null; + + panelComponent.getChildren().clear(); + TableComponent tableComponent = new TableComponent(); + tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); + + tableComponent.addRow("Nibblers Left: ", Integer.toString(plugin.getNibblers().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 bc34017089..599203359c 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 @@ -95,7 +95,7 @@ public class InfernoPlugin extends Plugin { overlayManager.add(infernoOverlay); overlayManager.add(infernoInfobox); - overlayManager.add(nibblerlOverlay); + overlayManager.add(nibblerOverlay); monsters = new HashMap<>(); monsterCurrentAttackMap = new HashMap<>(6); for (int i = 1; i <= 6; i++) From 658719bdd50deb913a18e997455ce451ccc94b81 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Mon, 10 Jun 2019 14:44:30 +0100 Subject: [PATCH 3/4] Delete InfernoNibberOverlay.java --- .../plugins/inferno/InfernoNibberOverlay.java | 71 ------------------- 1 file changed, 71 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibberOverlay.java 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 deleted file mode 100644 index 12d88ef2af..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibberOverlay.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2019, Jacky - * 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.plugins.inferno; - -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.PanelComponent; -import net.runelite.client.ui.overlay.components.table.TableAlignment; -import net.runelite.client.ui.overlay.components.table.TableComponent; - -public class InfernoNibblerOverlay extends Overlay -{ - private final Client client; - private final InfernoPlugin plugin; - private final InfernoConfig config; - - private final PanelComponent panelComponent = new PanelComponent(); - - @Inject - public InfernoNibblerOverlay(Client client, InfernoConfig config, InfernoPlugin plugin) - { - this.client = client; - this.config = config; - this.plugin = plugin; - setPosition(OverlayPosition.TOP_LEFT); - } - - - @Override - public Dimension render(Graphics2D graphics) - { - if (!config.displayNibblerOverlay() || plugin.getNibblers().size() == 0 || client.getMapRegions()[0] != 9043) - return null; - - panelComponent.getChildren().clear(); - TableComponent tableComponent = new TableComponent(); - tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); - - tableComponent.addRow("Nibblers Left: ", Integer.toString(plugin.getNibblers().size())); - - panelComponent.getChildren().add(tableComponent); - - return panelComponent.render(graphics); - } -} From f4c03f510b352dfa725923f6b722901720037b77 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Mon, 10 Jun 2019 15:22:31 +0100 Subject: [PATCH 4/4] Update InfernoConfig.java