ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Cleanup inferno plugin (functionality should be the same) (#700)

Browse Source 
* Cleanup inferno plugin (functionality should be the same)

* Cleanup inferno plugin (functionality should be the same)
This commit is contained in:
Lucwousin
2019-06-22 23:28:29 +02:00
committed by Kyleeld
parent 1caaae14a8
commit 14e6ff1806
5 changed files with 658 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java
View File

@@ -56,7 +56,7 @@ public interface InfernoConfig extends Config
@ConfigItem(
position = 2,
keyName = "Wave Display",
keyName = "waveDisplay",
name = "Wave display",
description = "Shows monsters that will spawn on the selected wave(s)."
)

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

@@ -34,6 +34,7 @@ import javax.annotation.Nullable;
import javax.inject.Inject;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Actor;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
@@ -43,6 +44,7 @@ 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.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.NpcDespawned;
@@ -61,8 +63,10 @@ import org.apache.commons.lang3.ArrayUtils;
tags = {"combat", "overlay", "pve", "pvm"},
type = PluginType.PVM
)
@Slf4j
public class InfernoPlugin extends Plugin
{
{
private static final int INFERNO_REGION = 9043;
@Inject
private Client client;
@@ -109,16 +113,15 @@ public class InfernoPlugin extends Plugin
private InfernoJadAttack attack;
private NPC jad;
private static final int INFERNO_REGION = 9043;
@Getter(AccessLevel.PACKAGE)
private int currentWaveNumber;
private int nextWaveNumber;
private Map<Integer, String> monster;
private Map<Integer, int[]> waves;
private List<Actor> waveMonsters;
public InfernoPlugin()
{
waveMonsters = new ArrayList<Actor>();
waveMonsters = new ArrayList<>();
}
@Provides
@@ -129,41 +132,77 @@ public class InfernoPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
waveOverlay.setDisplayMode(config.waveDisplay());
if (isInInferno())
{
overlayManager.add(infernoOverlay);
overlayManager.add(infernoInfobox);
overlayManager.add(nibblerOverlay);
overlayManager.add(waveOverlay);
if (config.waveDisplay() != InfernoWaveDisplayMode.NONE)
{
overlayManager.add(waveOverlay);
}
overlayManager.add(jadOverlay);
monster = InfernoWaveMappings.npcNameMapping();
waves = InfernoWaveMappings.waveMapping();
monsters = new HashMap<>();
monsterCurrentAttackMap = new HashMap<>(6);
for (int i = 1; i <= 6; i++)
{
monsterCurrentAttackMap.put(i, new ArrayList<>());
}
nibblers = new ArrayList<>();
priorityNPC = new InfernoNPC[4];
}
waveOverlay.setWaveHeaderColor(config.getWaveOverlayHeaderColor());
waveOverlay.setWaveTextColor(config.getWaveTextColor());
monsters = new HashMap<>();
monsterCurrentAttackMap = new HashMap<>(6);
for (int i = 1; i <= 6; i++)
{
monsterCurrentAttackMap.put(i, new ArrayList<>());
}
nibblers = new ArrayList<>();
priorityNPC = new InfernoNPC[4];
}
@Override
protected void shutDown() throws Exception
{
overlayManager.remove(infernoInfobox);
overlayManager.remove(infernoOverlay);
overlayManager.remove(nibblerOverlay);
overlayManager.remove(waveOverlay);
overlayManager.remove(jadOverlay);
jad = null;
attack = null;
monsters = null;
currentWaveNumber = -1;
}
@Subscribe
private void onConfigChanged(ConfigChanged event)
{
if (!"inferno".equals(event.getGroup()))
{
overlayManager.remove(infernoInfobox);
overlayManager.remove(infernoOverlay);
overlayManager.remove(nibblerOverlay);
overlayManager.remove(waveOverlay);
overlayManager.remove(jadOverlay);
jad = null;
attack = null;
monster = null;
monsters = null;
waves = null;
currentWaveNumber = -1;
nextWaveNumber = -1;
return;
}
if (event.getKey().endsWith("color"))
{
waveOverlay.setWaveHeaderColor(config.getWaveOverlayHeaderColor());
waveOverlay.setWaveTextColor(config.getWaveTextColor());
}
else if ("waveDisplay".equals(event.getKey()))
{
overlayManager.remove(waveOverlay);
waveOverlay.setDisplayMode(config.waveDisplay());
if (isInInferno() && config.waveDisplay() != InfernoWaveDisplayMode.NONE)
{
overlayManager.add(waveOverlay);
}
}
}
@Subscribe
public void onNpcSpawned(NpcSpawned event)
{
@@ -171,269 +210,268 @@ public class InfernoPlugin extends Plugin
NPC npc = event.getNpc();
if (isValidInfernoMob(npc))
{
{
monsters.put(npc, new InfernoNPC(npc));
System.out.println(monsters.size());
}
log.debug(String.valueOf(monsters.size()));
}
if (npc.getId() == NpcID.JALNIB)
{
{
nibblers.add(npc);
}
}
final int id = event.getNpc().getId();
if (id == NpcID.JALTOKJAD || id == NpcID.JALTOKJAD_7704)
{
{
jad = event.getNpc();
}
}
final Actor actor = event.getActor();
if (actor != null)
{
{
waveMonsters.add(actor);
}
}
}
@Subscribe
public void onNpcDespawned(NpcDespawned event)
{
if (client.getMapRegions()[0] != 9043) return;
NPC npc = event.getNpc();
if (monsters.containsKey(npc))
{
if (client.getMapRegions()[0] != 9043) return;
NPC npc = event.getNpc();
if (monsters.containsKey(npc))
{
monsters.remove(npc);
System.out.println(monsters.size());
}
if (npc.getId() == NpcID.JALNIB)
{
nibblers.remove(npc);
}
if (jad == event.getNpc())
{
jad = null;
attack = null;
}
final Actor actor = event.getActor();
if (actor != null)
{
waveMonsters.remove(actor);
}
monsters.remove(npc);
log.debug(String.valueOf(monsters.size()));
}
if (npc.getId() == NpcID.JALNIB)
{
nibblers.remove(npc);
}
if (jad == event.getNpc())
{
jad = null;
attack = null;
}
final Actor actor = event.getActor();
if (actor != null)
{
waveMonsters.remove(actor);
}
}
@Subscribe
public void onGameStateChanged(GameStateChanged event)
{
if (event.getGameState() != GameState.LOGGED_IN)
{
if (event.getGameState() != GameState.LOGGED_IN)
{
return;
}
if (!inInferno())
{
currentWave = -1;
}
return;
}
if (!isInInferno())
{
currentWaveNumber = -1;
overlayManager.remove(infernoInfobox);
overlayManager.remove(infernoOverlay);
overlayManager.remove(nibblerOverlay);
overlayManager.remove(waveOverlay);
overlayManager.remove(jadOverlay);
}
else if (currentWaveNumber == -1)
{
currentWaveNumber = 1;
overlayManager.add(infernoOverlay);
overlayManager.add(infernoInfobox);
overlayManager.add(nibblerOverlay);
if (config.waveDisplay() != InfernoWaveDisplayMode.NONE)
{
overlayManager.add(waveOverlay);
}
overlayManager.add(jadOverlay);
}
}
@Subscribe
public void onChatMessage(ChatMessage event)
{
if (!isInInferno() || event.getType() != ChatMessageType.GAMEMESSAGE)
{
if (event.getType() != ChatMessageType.GAMEMESSAGE || !inInferno())
{
return;
}
String message = event.getMessage();
if (event.getMessage().contains("Wave:"))
{
message = message.substring(message.indexOf(": ") + 2);
currentWaveNumber = Integer.parseInt(message.substring(0, message.indexOf("<")));
nextWaveNumber = ((currentWaveNumber < 69) ? (currentWaveNumber + 1) : -1);
}
return;
}
String message = event.getMessage();
if (event.getMessage().contains("Wave:"))
{
message = message.substring(message.indexOf(": ") + 2);
currentWaveNumber = Integer.parseInt(message.substring(0, message.indexOf("<")));
}
}
@Subscribe
public void onGameTick(GameTick event)
{
if (client.getMapRegions()[0] != 9043) return;
clearMapAndPriority();
for (InfernoNPC monster : monsters.values())
{
if (client.getMapRegions()[0] != 9043) return;
calculateDistanceToPlayer(monster);
clearMapAndPriority();
NPC npc = monster.getNpc();
for (InfernoNPC monster : monsters.values())
// if they are not attacking but are still attacking
if (monster.isAttacking())
{
monster.setTicksTillAttack(monster.getTicksTillAttack() - 1);
// sets the blobs attack style
if (monster.getName().equals("blob") && monster.getTicksTillAttack() == 3 && monster.getDistanceToPlayer() <= 15)
{
calculateDistanceToPlayer(monster);
NPC npc = monster.getNpc();
// if they are not attacking but are still attacking
if (monster.isAttacking())
if (client.getLocalPlayer().getOverheadIcon() == null)
{
monster.setTicksTillAttack(monster.getTicksTillAttack() - 1);
// sets the blobs attack style
if (monster.getName().equals("blob") && monster.getTicksTillAttack() == 3 && monster.getDistanceToPlayer() <= 15)
{
if (client.getLocalPlayer().getOverheadIcon() == null)
{
monster.setAttackstyle(InfernoNPC.Attackstyle.RANDOM);
}
else if (client.getLocalPlayer().getOverheadIcon().equals(HeadIcon.MAGIC))
{
monster.setAttackstyle(InfernoNPC.Attackstyle.RANGE);
}
else if (client.getLocalPlayer().getOverheadIcon().equals(HeadIcon.RANGED))
{
monster.setAttackstyle(InfernoNPC.Attackstyle.MAGE);
}
}
// we know the monster is not attacking because it should have attacked and is idling
if (monster.getTicksTillAttack() == 0)
{
if (npc.getAnimation() == -1)
{
monster.setAttacking(false);
}
else
{
// want to reset the monsters attack back to attacking
monster.attacked();
}
}
monster.setAttackstyle(InfernoNPC.Attackstyle.RANDOM);
}
else
else if (client.getLocalPlayer().getOverheadIcon().equals(HeadIcon.MAGIC))
{
// they've just attacked
if (npc.getAnimation() == monster.getAttackAnimation() || npc.getAnimation() == 7581) // special case for blob
{
monster.attacked();
}
monster.setAttackstyle(InfernoNPC.Attackstyle.RANGE);
}
if (monster.getTicksTillAttack() >= 1)
else if (client.getLocalPlayer().getOverheadIcon().equals(HeadIcon.RANGED))
{
monsterCurrentAttackMap.get(monster.getTicksTillAttack()).add(monster);
monster.setAttackstyle(InfernoNPC.Attackstyle.MAGE);
}
}
calculatePriorityNPC();
// we know the monster is not attacking because it should have attacked and is idling
if (monster.getTicksTillAttack() == 0)
{
if (npc.getAnimation() == -1)
{
monster.setAttacking(false);
}
else
{
// want to reset the monsters attack back to attacking
monster.attacked();
}
}
}
else
{
// they've just attacked
if (npc.getAnimation() == monster.getAttackAnimation() || npc.getAnimation() == 7581) // special case for blob
{
monster.attacked();
}
}
if (monster.getTicksTillAttack() >= 1)
{
monsterCurrentAttackMap.get(monster.getTicksTillAttack()).add(monster);
}
}
calculatePriorityNPC();
}
@Subscribe
public void onAnimationChanged(final AnimationChanged event)
{
if (event.getActor() != jad)
{
if (event.getActor() != jad)
{
return;
}
if (jad.getAnimation() == InfernoJadAttack.MAGIC.getAnimation())
{
attack = InfernoJadAttack.MAGIC;
}
else if (jad.getAnimation() == InfernoJadAttack.RANGE.getAnimation())
{
attack = InfernoJadAttack.RANGE;
}
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++)
{
for (int i = 0; i < priorityNPC.length; i++)
ArrayList<InfernoNPC> monsters = monsterCurrentAttackMap.get(i + 1);
if (monsters.size() == 0) continue;
int priority = monsters.get(0).getPriority();
InfernoNPC infernoNPC = monsters.get(0);
for (InfernoNPC npc : monsters)
{
if (npc.getPriority() < priority)
{
ArrayList<InfernoNPC> monsters = monsterCurrentAttackMap.get(i + 1);
if (monsters.size() == 0) continue;
int priority = monsters.get(0).getPriority();
InfernoNPC infernoNPC = monsters.get(0);
for (InfernoNPC npc : monsters)
{
if (npc.getPriority() < priority)
{
priority = npc.getPriority();
infernoNPC = npc;
}
}
priorityNPC[i] = infernoNPC;
System.out.println("i: " + i + " " + infernoNPC.getName());
priority = npc.getPriority();
infernoNPC = npc;
}
}
priorityNPC[i] = infernoNPC;
log.debug("i: " + i + " " + infernoNPC.getName());
}
}
// TODO: blob calculator
private void calculateDistanceToPlayer(InfernoNPC monster)
{
monster.setDistanceToPlayer(client.getLocalPlayer().getWorldLocation().distanceTo(monster.getNpc().getWorldArea()));
}
{
monster.setDistanceToPlayer(client.getLocalPlayer().getWorldLocation().distanceTo(monster.getNpc().getWorldArea()));
}
private void clearMapAndPriority()
{
for (List<InfernoNPC> l : monsterCurrentAttackMap.values())
{
for (List<InfernoNPC> l : monsterCurrentAttackMap.values())
{
l.clear();
}
for (int i = 0; i < priorityNPC.length; i++)
{
priorityNPC[i] = null;
}
l.clear();
}
public boolean isValidInfernoMob(NPC npc)
for (int i = 0; i < priorityNPC.length; i++)
{
// we only want the bat, blob, melee, ranger and mager
if (npc.getId() == NpcID.JALMEJRAH ||
npc.getId() == NpcID.JALAK ||
npc.getId() == NpcID.JALIMKOT ||
npc.getId() == NpcID.JALXIL ||
npc.getId() == NpcID.JALZEK) return true;
return false;
priorityNPC[i] = null;
}
}
boolean inInferno()
{
return ArrayUtils.contains(client.getMapRegions(), INFERNO_REGION);
}
private boolean isValidInfernoMob(NPC npc)
{
// we only want the bat, blob, melee, ranger and mager
return npc.getId() == NpcID.JALMEJRAH ||
npc.getId() == NpcID.JALAK ||
npc.getId() == NpcID.JALIMKOT ||
npc.getId() == NpcID.JALXIL ||
npc.getId() == NpcID.JALZEK;
}
public boolean isNotFinalWave()
{
return currentWaveNumber <= 68;
}
private boolean isInInferno()
{
return ArrayUtils.contains(client.getMapRegions(), INFERNO_REGION);
}
@Nullable
InfernoJadAttack getAttack()
{
return attack;
}
int getCurrentWaveNumber()
{
return currentWaveNumber;
}
int getNextWaveNumber()
{
return nextWaveNumber;
}
Map<Integer, String> getMonster()
{
return monster;
}
Map<Integer, int[]> getWaves()
{
return waves;
}
boolean isNotFinalWave()
{
return currentWaveNumber <= 68;
}
List<Actor> getWaveMonsters()
{
return waveMonsters;
}
{
return waveMonsters;
}
int getNextWaveNumber()
{
return currentWaveNumber == -1 || currentWaveNumber == 69 ? -1 : currentWaveNumber + 1;
}
}

3
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveDisplayMode.java
View File

@@ -31,7 +31,8 @@ public enum InfernoWaveDisplayMode
{
CURRENT("Current wave"),
NEXT("Next wave"),
BOTH("Both");
BOTH("Both"),
NONE("None");
private final String name;

240
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java
View File

@@ -26,121 +26,143 @@
*/
package net.runelite.client.plugins.inferno;
import java.util.HashMap;
import java.util.Map;
import com.google.common.collect.ImmutableMap;
import java.awt.Color;
import lombok.Getter;
import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent;
public class InfernoWaveMappings
class InfernoWaveMappings
{
@Getter
private static final ImmutableMap<Integer, int[]> waveMapping;
@Getter
private static final ImmutableMap<Integer, String> npcNameMapping;
static
{
static Map<Integer, int[]> waveMapping()
{
return new HashMap<Integer, int[]>()
{
{
put(1, new int[]{32, 32, 32, 85});
put(2, new int[]{32, 32, 32, 85, 85});
put(3, new int[]{32, 32, 32, 32, 32, 32});
put(4, new int[]{32, 32, 32, 165});
put(5, new int[]{32, 32, 32, 85, 165});
put(6, new int[]{32, 32, 32, 85, 85, 165});
put(7, new int[]{32, 32, 32, 165, 165});
put(8, new int[]{32, 32, 32, 32, 32, 32});
put(9, new int[]{32, 32, 32, 240});
put(10, new int[]{32, 32, 32, 85, 240});
put(11, new int[]{32, 32, 32, 85, 85, 240});
put(12, new int[]{32, 32, 32, 165, 240});
put(13, new int[]{32, 32, 32, 85, 165, 240});
put(14, new int[]{32, 32, 32, 85, 85, 165, 240});
put(15, new int[]{32, 32, 32, 165, 165, 240});
put(16, new int[]{32, 32, 32, 240, 240});
put(17, new int[]{32, 32, 32, 32, 32, 32});
put(18, new int[]{32, 32, 32, 370});
put(19, new int[]{32, 32, 32, 85, 370});
put(20, new int[]{32, 32, 32, 85, 85, 370});
put(21, new int[]{32, 32, 32, 165, 370});
put(22, new int[]{32, 32, 32, 85, 165, 370});
put(23, new int[]{32, 32, 32, 85, 85, 165, 370});
put(24, new int[]{32, 32, 32, 165, 165, 370});
put(25, new int[]{32, 32, 32, 240, 370});
put(26, new int[]{32, 32, 32, 85, 240, 370});
put(27, new int[]{32, 32, 32, 85, 85, 240, 370});
put(28, new int[]{32, 32, 32, 165, 240, 370});
put(29, new int[]{32, 32, 32, 85, 165, 240, 370});
put(30, new int[]{32, 32, 32, 85, 85, 165, 240, 370});
put(31, new int[]{32, 32, 32, 165, 165, 240, 370});
put(32, new int[]{32, 32, 32, 240, 240, 370});
put(33, new int[]{32, 32, 32, 370, 370});
put(34, new int[]{32, 32, 32, 32, 32, 32});
put(35, new int[]{32, 32, 32, 490});
put(36, new int[]{32, 32, 32, 85, 490});
put(37, new int[]{32, 32, 32, 85, 85, 490});
put(38, new int[]{32, 32, 32, 165, 490});
put(39, new int[]{32, 32, 32, 85, 165, 490});
put(40, new int[]{32, 32, 32, 85, 85, 165, 490});
put(41, new int[]{32, 32, 32, 165, 165, 490});
put(42, new int[]{32, 32, 32, 240, 490});
put(43, new int[]{32, 32, 32, 85, 240, 490});
put(44, new int[]{32, 32, 32, 85, 85, 240, 490});
put(45, new int[]{32, 32, 32, 165, 240, 490 });
put(46, new int[]{32, 32, 32, 85, 165, 240, 490});
put(47, new int[]{32, 32, 32, 85, 85, 165, 240, 490});
put(48, new int[]{32, 32, 32, 165, 165, 240, 490});
put(49, new int[]{32, 32, 32, 240, 240, 490});
put(50, new int[]{32, 32, 32, 370, 490});
put(51, new int[]{32, 32, 32, 85, 370, 490});
put(52, new int[]{32, 32, 32, 85, 85, 370, 490});
put(53, new int[]{32, 32, 32, 165, 370, 490});
put(54, new int[]{32, 32, 32, 85, 165, 370, 490});
put(55, new int[]{32, 32, 32, 85, 85, 165, 370, 490});
put(56, new int[]{32, 32, 32, 165, 165, 370, 490});
put(57, new int[]{32, 32, 32, 240, 370, 490});
put(58, new int[]{32, 32, 32, 85, 240, 370, 490});
put(59, new int[]{32, 32, 32, 85, 85, 240, 370, 490});
put(60, new int[]{32, 32, 32, 165, 240, 370, 490});
put(61, new int[]{32, 32, 32, 85, 165, 240, 370, 490});
put(62, new int[]{32, 32, 32, 85, 85, 165, 240, 370, 490});
put(63, new int[]{32, 32, 32, 165, 165, 240, 370, 490});
put(64, new int[]{32, 32, 32, 85, 240, 240, 370, 490});
put(65, new int[]{32, 32, 32, 85, 370, 370, 490});
put(66, new int[]{32, 32, 32, 85, 490, 490});
put(67, new int[]{900});
put(68, new int[]{900, 900, 900});
put(69, new int[]{1400});
ImmutableMap.Builder<Integer, int[]> waveMapBuilder = new ImmutableMap.Builder<>();
}
};
waveMapBuilder.put(1, new int[]{32, 32, 32, 85});
waveMapBuilder.put(2, new int[]{32, 32, 32, 85, 85});
waveMapBuilder.put(3, new int[]{32, 32, 32, 32, 32, 32});
waveMapBuilder.put(4, new int[]{32, 32, 32, 165});
waveMapBuilder.put(5, new int[]{32, 32, 32, 85, 165});
waveMapBuilder.put(6, new int[]{32, 32, 32, 85, 85, 165});
waveMapBuilder.put(7, new int[]{32, 32, 32, 165, 165});
waveMapBuilder.put(8, new int[]{32, 32, 32, 32, 32, 32});
waveMapBuilder.put(9, new int[]{32, 32, 32, 240});
waveMapBuilder.put(10, new int[]{32, 32, 32, 85, 240});
waveMapBuilder.put(11, new int[]{32, 32, 32, 85, 85, 240});
waveMapBuilder.put(12, new int[]{32, 32, 32, 165, 240});
waveMapBuilder.put(13, new int[]{32, 32, 32, 85, 165, 240});
waveMapBuilder.put(14, new int[]{32, 32, 32, 85, 85, 165, 240});
waveMapBuilder.put(15, new int[]{32, 32, 32, 165, 165, 240});
waveMapBuilder.put(16, new int[]{32, 32, 32, 240, 240});
waveMapBuilder.put(17, new int[]{32, 32, 32, 32, 32, 32});
waveMapBuilder.put(18, new int[]{32, 32, 32, 370});
waveMapBuilder.put(19, new int[]{32, 32, 32, 85, 370});
waveMapBuilder.put(20, new int[]{32, 32, 32, 85, 85, 370});
waveMapBuilder.put(21, new int[]{32, 32, 32, 165, 370});
waveMapBuilder.put(22, new int[]{32, 32, 32, 85, 165, 370});
waveMapBuilder.put(23, new int[]{32, 32, 32, 85, 85, 165, 370});
waveMapBuilder.put(24, new int[]{32, 32, 32, 165, 165, 370});
waveMapBuilder.put(25, new int[]{32, 32, 32, 240, 370});
waveMapBuilder.put(26, new int[]{32, 32, 32, 85, 240, 370});
waveMapBuilder.put(27, new int[]{32, 32, 32, 85, 85, 240, 370});
waveMapBuilder.put(28, new int[]{32, 32, 32, 165, 240, 370});
waveMapBuilder.put(29, new int[]{32, 32, 32, 85, 165, 240, 370});
waveMapBuilder.put(30, new int[]{32, 32, 32, 85, 85, 165, 240, 370});
waveMapBuilder.put(31, new int[]{32, 32, 32, 165, 165, 240, 370});
waveMapBuilder.put(32, new int[]{32, 32, 32, 240, 240, 370});
waveMapBuilder.put(33, new int[]{32, 32, 32, 370, 370});
waveMapBuilder.put(34, new int[]{32, 32, 32, 32, 32, 32});
waveMapBuilder.put(35, new int[]{32, 32, 32, 490});
waveMapBuilder.put(36, new int[]{32, 32, 32, 85, 490});
waveMapBuilder.put(37, new int[]{32, 32, 32, 85, 85, 490});
waveMapBuilder.put(38, new int[]{32, 32, 32, 165, 490});
waveMapBuilder.put(39, new int[]{32, 32, 32, 85, 165, 490});
waveMapBuilder.put(40, new int[]{32, 32, 32, 85, 85, 165, 490});
waveMapBuilder.put(41, new int[]{32, 32, 32, 165, 165, 490});
waveMapBuilder.put(42, new int[]{32, 32, 32, 240, 490});
waveMapBuilder.put(43, new int[]{32, 32, 32, 85, 240, 490});
waveMapBuilder.put(44, new int[]{32, 32, 32, 85, 85, 240, 490});
waveMapBuilder.put(45, new int[]{32, 32, 32, 165, 240, 490 });
waveMapBuilder.put(46, new int[]{32, 32, 32, 85, 165, 240, 490});
waveMapBuilder.put(47, new int[]{32, 32, 32, 85, 85, 165, 240, 490});
waveMapBuilder.put(48, new int[]{32, 32, 32, 165, 165, 240, 490});
waveMapBuilder.put(49, new int[]{32, 32, 32, 240, 240, 490});
waveMapBuilder.put(50, new int[]{32, 32, 32, 370, 490});
waveMapBuilder.put(51, new int[]{32, 32, 32, 85, 370, 490});
waveMapBuilder.put(52, new int[]{32, 32, 32, 85, 85, 370, 490});
waveMapBuilder.put(53, new int[]{32, 32, 32, 165, 370, 490});
waveMapBuilder.put(54, new int[]{32, 32, 32, 85, 165, 370, 490});
waveMapBuilder.put(55, new int[]{32, 32, 32, 85, 85, 165, 370, 490});
waveMapBuilder.put(56, new int[]{32, 32, 32, 165, 165, 370, 490});
waveMapBuilder.put(57, new int[]{32, 32, 32, 240, 370, 490});
waveMapBuilder.put(58, new int[]{32, 32, 32, 85, 240, 370, 490});
waveMapBuilder.put(59, new int[]{32, 32, 32, 85, 85, 240, 370, 490});
waveMapBuilder.put(60, new int[]{32, 32, 32, 165, 240, 370, 490});
waveMapBuilder.put(61, new int[]{32, 32, 32, 85, 165, 240, 370, 490});
waveMapBuilder.put(62, new int[]{32, 32, 32, 85, 85, 165, 240, 370, 490});
waveMapBuilder.put(63, new int[]{32, 32, 32, 165, 165, 240, 370, 490});
waveMapBuilder.put(64, new int[]{32, 32, 32, 85, 240, 240, 370, 490});
waveMapBuilder.put(65, new int[]{32, 32, 32, 85, 370, 370, 490});
waveMapBuilder.put(66, new int[]{32, 32, 32, 85, 490, 490});
waveMapBuilder.put(67, new int[]{900});
waveMapBuilder.put(68, new int[]{900, 900, 900});
waveMapBuilder.put(69, new int[]{1400});
waveMapping = waveMapBuilder.build();
ImmutableMap.Builder<Integer, String> nameMapBuilder = new ImmutableMap.Builder<>();
nameMapBuilder.put(32, "Jal-Nib - Level 32");
nameMapBuilder.put(85, "Jal-MejRah - Level 85");
nameMapBuilder.put(165, "Jal-Ak - Level 165");
nameMapBuilder.put(240, "Jal-ImKot - Level 240");
nameMapBuilder.put(370, "Jal-Xil - Level 370");
nameMapBuilder.put(490, "Jal-Zek - Level 490");
nameMapBuilder.put(900, "JalTok-Jad - Level 900");
nameMapBuilder.put(1400, "TzKal-Zuk - Level 1400");
npcNameMapping = nameMapBuilder.build();
}
static void addWaveComponent(PanelComponent panelComponent, String header, int wave, Color titleColor, Color color)
{
int[] monsters = waveMapping.get(wave);
if (monsters == null)
{
return;
}
static Map<Integer, String> npcNameMapping()
{
return new HashMap<Integer, String>()
{
{
put(32, "Jal-Nib - Level 32");
put(85, " Jal-MejRah - Level 85");
put(165, "Jal-Ak - Level 165");
put(240, "Jal-ImKot - Level 240");
put(370, "Jal-Xil - Level 370");
put(490, "Jal-Zek - Level 490");
put(900, "JalTok-Jad - Level 900");
put(1400, "TzKal-Zuk - Level 1400");
}
};
}
panelComponent.getChildren()
.add(TitleComponent.builder()
.text(header)
.color(titleColor)
.build()
);
static HashMap intArrayToHashmap(int inputArray[])
for (int i = 0; i < monsters.length; i++)
{
HashMap<Integer, Integer> elementCountMap = new HashMap<Integer, Integer>();
for (int i : inputArray)
{
if (elementCountMap.containsKey(i))
{
elementCountMap.put(i, elementCountMap.get(i) + 1);
}
else
{
elementCountMap.put(i, 1);
}
}
return elementCountMap;
int monsterType = monsters[i];
int count = 1;
for (; i < monsters.length - 1 && monsters[i + 1] == monsterType; i++)
{
count++;
}
TitleComponent.TitleComponentBuilder builder = TitleComponent.builder();
builder.text(count + "x " + npcNameMapping.get(monsterType));
builder.color(color);
panelComponent.getChildren().add(builder.build());
}
}
}

92
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java
View File

@@ -1,69 +1,69 @@
package net.runelite.client.plugins.inferno;
import java.util.HashMap;
import java.util.Map;
import java.awt.Color;
import com.google.inject.Inject;
import net.runelite.client.ui.overlay.components.TitleComponent;
import lombok.Setter;
import static net.runelite.client.plugins.inferno.InfernoWaveMappings.addWaveComponent;
import java.awt.Graphics2D;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayPosition;
import java.awt.Dimension;
import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.api.Client;
import net.runelite.client.ui.overlay.Overlay;
public class InfernoWaveOverlay extends Overlay
{
private final Client client;
private final InfernoPlugin plugin;
private final InfernoConfig config;
private PanelComponent panelComponent;
private final PanelComponent panelComponent;
@Setter
private Color waveHeaderColor;
@Setter
private Color waveTextColor;
@Setter
private InfernoWaveDisplayMode displayMode;
@Inject
InfernoWaveOverlay(final Client client, final InfernoPlugin plugin, final InfernoConfig config)
{
(this.panelComponent = new PanelComponent()).setPreferredSize(new Dimension(150, 0));
this.setPosition(OverlayPosition.TOP_RIGHT);
this.setPriority(OverlayPriority.HIGH);
this.client = client;
this.plugin = plugin;
this.config = config;
}
InfernoWaveOverlay(final InfernoPlugin plugin)
{
this.panelComponent = new PanelComponent();
this.setPosition(OverlayPosition.TOP_RIGHT);
this.setPriority(OverlayPriority.HIGH);
this.plugin = plugin;
panelComponent.setPreferredSize(new Dimension(160, 0));
}
public Dimension render(final Graphics2D graphics)
{
panelComponent.getChildren().clear();
if (displayMode == InfernoWaveDisplayMode.CURRENT ||
displayMode == InfernoWaveDisplayMode.BOTH)
{
if (!plugin.inInferno() || plugin.getCurrentWaveNumber() == 0)
{
return null;
}
panelComponent.getChildren().clear();
if (config.waveDisplay() == InfernoWaveDisplayMode.CURRENT
|| config.waveDisplay() == InfernoWaveDisplayMode.BOTH)
{
renderWave("Current Wave (Wave " + plugin.getCurrentWaveNumber() + ")", plugin.getCurrentWaveNumber());
}
if ((config.waveDisplay() == InfernoWaveDisplayMode.NEXT
|| config.waveDisplay() == InfernoWaveDisplayMode.BOTH)
&& plugin.isNotFinalWave())
{
renderWave("Next Wave (Wave " + plugin.getNextWaveNumber() + ")", plugin.getCurrentWaveNumber());
}
return panelComponent.render(graphics);
addWaveComponent(
panelComponent,
"Current Wave (Wave " + plugin.getCurrentWaveNumber() + ")",
plugin.getCurrentWaveNumber(),
waveHeaderColor,
waveTextColor
);
}
private void renderWave(final String header, final int waveNumber)
if (displayMode == InfernoWaveDisplayMode.NEXT ||
displayMode == InfernoWaveDisplayMode.BOTH)
{
panelComponent.getChildren().add(TitleComponent.builder().text(header).color(config.getWaveOverlayHeaderColor()).build());
final HashMap<Integer, Integer> waveMap = (HashMap<Integer, Integer>) InfernoWaveMappings.intArrayToHashmap(plugin.getWaves().get(waveNumber));
for (final Map.Entry<Integer, Integer> entry : waveMap.entrySet())
{
final int monsterID = entry.getKey();
final int quantity = entry.getValue();
if (quantity <= 0)
{
continue;
}
panelComponent.getChildren().add(TitleComponent.builder().text(quantity + "x " + plugin.getMonster().get(monsterID)).color(config.getWaveTextColor()).build());
}
addWaveComponent(
panelComponent,
"Next Wave (Wave " + plugin.getNextWaveNumber() + ")",
plugin.getNextWaveNumber(),
waveHeaderColor,
waveTextColor
);
}
return panelComponent.render(graphics);
}
}