yad supp0rt

runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2017, Devin French <https://github.com/devinfrench>
+ * 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 net.runelite.api.AnimationID;
+import net.runelite.api.Prayer;
+
+public enum InfernoJadAttack
+{
+    MAGIC(AnimationID.JALTOK_JAD_MAGE_ATTACK, Prayer.PROTECT_FROM_MAGIC),
+    RANGE(AnimationID.JALTOK_JAD_RANGE_ATTACK, Prayer.PROTECT_FROM_MISSILES);
+
+    private final int animation;
+    private final Prayer prayer;
+
+    InfernoJadAttack(int animation, Prayer prayer)
+    {
+        this.animation = animation;
+        this.prayer = prayer;
+    }
+
+    public int getAnimation()
+    {
+        return animation;
+    }
+
+    public Prayer getPrayer()
+    {
+        return prayer;
+    }
+}

runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2017, Devin French <https://github.com/devinfrench>
+ * 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.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import javax.inject.Inject;
+import net.runelite.api.Client;
+import net.runelite.api.SpriteID;
+import net.runelite.client.game.SpriteManager;
+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.ComponentConstants;
+import net.runelite.client.ui.overlay.components.ImageComponent;
+import net.runelite.client.ui.overlay.components.PanelComponent;
+
+public class InfernoJadOverlay extends Overlay
+{
+    private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150);
+
+    private final Client client;
+    private final InfernoPlugin plugin;
+    private final SpriteManager spriteManager;
+    private final PanelComponent imagePanelComponent = new PanelComponent();
+
+    @Inject
+    private InfernoJadOverlay(Client client, InfernoPlugin plugin, SpriteManager spriteManager)
+    {
+        setPosition(OverlayPosition.BOTTOM_RIGHT);
+        setPriority(OverlayPriority.HIGH);
+        this.client = client;
+        this.plugin = plugin;
+        this.spriteManager = spriteManager;
+    }
+
+    @Override
+    public Dimension render(Graphics2D graphics)
+    {
+        final InfernoJadAttack attack = plugin.getAttack();
+
+        if (attack == null)
+        {
+            return null;
+        }
+
+        final BufferedImage prayerImage = getPrayerImage(attack);
+
+        imagePanelComponent.getChildren().clear();
+        imagePanelComponent.getChildren().add(new ImageComponent(prayerImage));
+        imagePanelComponent.setBackgroundColor(client.isPrayerActive(attack.getPrayer())
+                ? ComponentConstants.STANDARD_BACKGROUND_COLOR
+                : NOT_ACTIVATED_BACKGROUND_COLOR);
+
+        return imagePanelComponent.render(graphics);
+    }
+
+    private BufferedImage getPrayerImage(InfernoJadAttack attack)
+    {
+        final int prayerSpriteID = attack == InfernoJadAttack.MAGIC ? SpriteID.PRAYER_PROTECT_FROM_MAGIC : SpriteID.PRAYER_PROTECT_FROM_MISSILES;
+        return spriteManager.getSprite(prayerSpriteID, 0);
+    }
+}

runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java

@@ -32,7 +32,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import javax.annotation.Nullable;
 import javax.inject.Inject;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
@@ -40,6 +42,7 @@ import net.runelite.api.GameState;
 import net.runelite.api.HeadIcon;
 import net.runelite.api.NPC;
 import net.runelite.api.NpcID;
+import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
@@ -79,6 +82,9 @@ public class InfernoPlugin extends Plugin
 	@Inject
 	private InfernoWaveOverlay waveOverlay;
 
+	@Inject
+	private InfernoJadOverlay jadOverlay;
+
 	@Inject
 	private InfernoInfobox infernoInfobox;
 
@@ -106,6 +112,14 @@ public class InfernoPlugin extends Plugin
 	@Getter
 	private InfernoNPC[] priorityNPC;
 
+
+	@Getter(AccessLevel.PACKAGE)
+	@Nullable
+	private InfernoJadAttack attack;
+
+	private NPC jad;
+
+	
 	static
 	{
 		final InfernoWaveMonster[] waveMonsters = InfernoWaveMonster.values();
@@ -159,6 +173,7 @@ public class InfernoPlugin extends Plugin
 		overlayManager.add(infernoInfobox);
 		overlayManager.add(nibblerOverlay);
 		overlayManager.add(waveOverlay);
+		overlayManager.add(jadOverlay);
 		monsters = new HashMap<>();
 		monsterCurrentAttackMap = new HashMap<>(6);
 		for (int i = 1; i <= 6; i++)
@@ -176,6 +191,9 @@ public class InfernoPlugin extends Plugin
 		overlayManager.remove(infernoOverlay);
 		overlayManager.remove(nibblerOverlay);
 		overlayManager.remove(waveOverlay);
+		overlayManager.remove(jadOverlay);
+		jad = null;
+		attack = null;
 	}
 
 	@Subscribe
@@ -193,6 +211,13 @@ public class InfernoPlugin extends Plugin
 		{
 			nibblers.add(npc);
 		}
+
+		final int id = event.getNpc().getId();
+
+		if (id == NpcID.JALTOKJAD || id == NpcID.JALTOKJAD_7704)
+		{
+			jad = event.getNpc();
+		}
 	}
 
 	@Subscribe
@@ -211,6 +236,12 @@ public class InfernoPlugin extends Plugin
 		{
 			nibblers.remove(npc);
 		}
+
+		if (jad == event.getNpc())
+		{
+			jad = null;
+			attack = null;
+		}
 	}
 	
 	@Subscribe
@@ -309,6 +340,24 @@ public class InfernoPlugin extends Plugin
 		calculatePriorityNPC();
 	}
 
+	@Subscribe
+	public void onAnimationChanged(final AnimationChanged event)
+	{
+		if (event.getActor() != jad)
+		{
+			return;
+		}
+
+		if (jad.getAnimation() == InfernoJadAttack.MAGIC.getAnimation())
+		{
+			attack = InfernoJadAttack.MAGIC;
+		}
+		else if (jad.getAnimation() == InfernoJadAttack.RANGE.getAnimation())
+		{
+			attack = InfernoJadAttack.RANGE;
+		}
+	}
+
 	private void calculatePriorityNPC()
 	{
 		for (int i = 0; i < priorityNPC.length; i++)