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

menu swapper: add option to remove dead npc menu options

Browse Source
This commit is contained in:
Adam
2022-06-08 11:42:53 -04:00
parent ef6df76d7b
commit 0a1a10cf11
2 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
View File

@@ -878,4 +878,15 @@ public interface MenuEntrySwapperConfig extends Config
{ {
return false; return false;
} }
@ConfigItem(
keyName = "removeDeadNpcMenus",
name = "Remove dead npc menus",
description = "Remove menu options such as Attack and Talk-to from dead npcs",
section = npcSection
)
default boolean removeDeadNpcMenus()
{
return false;
}
} }

48
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
View File

@@ -54,6 +54,7 @@ import net.runelite.api.MenuAction;
import net.runelite.api.MenuEntry; import net.runelite.api.MenuEntry;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.NPCComposition; import net.runelite.api.NPCComposition;
import net.runelite.api.NpcID;
import net.runelite.api.ObjectComposition; import net.runelite.api.ObjectComposition;
import net.runelite.api.events.ClientTick; import net.runelite.api.events.ClientTick;
import net.runelite.api.events.MenuOpened; import net.runelite.api.events.MenuOpened;
@@ -1038,6 +1039,53 @@ public class MenuEntrySwapperPlugin extends Plugin
{ {
swapMenuEntry(menuEntries, idx++, entry); swapMenuEntry(menuEntries, idx++, entry);
} }
if (config.removeDeadNpcMenus())
{
removeDeadNpcs();
}
}
private void removeDeadNpcs()
{
MenuEntry[] oldEntries = client.getMenuEntries();
MenuEntry[] newEntries = Arrays.stream(oldEntries)
.filter(e ->
{
final NPC npc = e.getNpc();
if (npc == null)
{
return true;
}
final int id = npc.getId();
switch (id)
{
// These NPCs hit 0hp but don't actually die
case NpcID.GARGOYLE:
case NpcID.GARGOYLE_413:
case NpcID.GARGOYLE_1543:
case NpcID.ZYGOMITE:
case NpcID.ZYGOMITE_1024:
case NpcID.ANCIENT_ZYGOMITE:
case NpcID.ROCKSLUG:
case NpcID.ROCKSLUG_422:
case NpcID.DESERT_LIZARD:
case NpcID.DESERT_LIZARD_460:
case NpcID.DESERT_LIZARD_461:
case NpcID.ICE_DEMON:
case NpcID.ICE_DEMON_7585:
return true;
default:
return !npc.isDead();
}
})
.toArray(MenuEntry[]::new);
if (oldEntries.length != newEntries.length)
{
client.setMenuEntries(newEntries);
}
} }
@Subscribe @Subscribe