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

Add ability to highlight rooms

Browse Source
This commit is contained in:
Kamiel
2018-02-28 04:17:37 +01:00
parent d1342f821b
commit 259d3c0eec
3 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java
View File

@@ -81,6 +81,17 @@ public interface RaidsConfig extends Config
@ConfigItem( @ConfigItem(
position = 4, position = 4,
keyName = "whitelistedRooms",
name = "Whitelisted rooms",
description = "Display whitelisted rooms in green on the overlay. Separate with comma (full name)"
)
default String whitelistedRooms()
{
return "";
}
@ConfigItem(
position = 5,
keyName = "blacklistedRooms", keyName = "blacklistedRooms",
name = "Blacklisted rooms", name = "Blacklisted rooms",
description = "Display blacklisted rooms in red on the overlay. Separate with comma (full name)" description = "Display blacklisted rooms in red on the overlay. Separate with comma (full name)"
@@ -91,7 +102,7 @@ public interface RaidsConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 5, position = 6,
keyName = "enableLayoutWhitelist", keyName = "enableLayoutWhitelist",
name = "Enable layout whitelist", name = "Enable layout whitelist",
description = "Enable the layout whitelist" description = "Enable the layout whitelist"
@@ -102,7 +113,7 @@ public interface RaidsConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 6, position = 7,
keyName = "whitelistedLayouts", keyName = "whitelistedLayouts",
name = "Whitelisted layouts", name = "Whitelisted layouts",
description = "Warn when layout doesn't match a whitelisted one. Add layouts like CFSCPPCSCF separated with comma" description = "Warn when layout doesn't match a whitelisted one. Add layouts like CFSCPPCSCF separated with comma"

12
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
View File

@@ -101,7 +101,11 @@ public class RaidsOverlay extends Overlay
switch (room.getType()) switch (room.getType())
{ {
case COMBAT: case COMBAT:
if (plugin.getBlacklist().contains(room.getBoss().getName().toLowerCase())) if (plugin.getRoomWhitelist().contains(room.getBoss().getName().toLowerCase()))
{
color = Color.GREEN;
}
else if (plugin.getRoomBlacklist().contains(room.getBoss().getName().toLowerCase()))
{ {
color = Color.RED; color = Color.RED;
} }
@@ -112,7 +116,11 @@ public class RaidsOverlay extends Overlay
break; break;
case PUZZLE: case PUZZLE:
if (plugin.getBlacklist().contains(room.getPuzzle().getName().toLowerCase())) if (plugin.getRoomWhitelist().contains(room.getPuzzle().getName().toLowerCase()))
{
color = Color.GREEN;
}
else if (plugin.getRoomBlacklist().contains(room.getPuzzle().getName().toLowerCase()))
{ {
color = Color.RED; color = Color.RED;
} }

15
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
View File

@@ -99,7 +99,10 @@ public class RaidsPlugin extends Plugin
private Raid raid; private Raid raid;
@Getter @Getter
private ArrayList<String> blacklist = new ArrayList<>(); private ArrayList<String> roomWhitelist = new ArrayList<>();
@Getter
private ArrayList<String> roomBlacklist = new ArrayList<>();
@Getter @Getter
private ArrayList<String> layoutWhitelist = new ArrayList<>(); private ArrayList<String> layoutWhitelist = new ArrayList<>();
@@ -161,9 +164,14 @@ public class RaidsPlugin extends Plugin
updateInfoBoxState(); updateInfoBoxState();
} }
if (event.getKey().equals("whitelistedRooms"))
{
updateList(roomWhitelist, config.whitelistedRooms());
}
if (event.getKey().equals("blacklistedRooms")) if (event.getKey().equals("blacklistedRooms"))
{ {
updateList(blacklist, config.blacklistedRooms()); updateList(roomBlacklist, config.blacklistedRooms());
} }
if (event.getKey().equals("whitelistedLayouts")) if (event.getKey().equals("whitelistedLayouts"))
@@ -295,7 +303,8 @@ public class RaidsPlugin extends Plugin
private void updateLists() private void updateLists()
{ {
updateList(blacklist, config.blacklistedRooms()); updateList(roomWhitelist, config.blacklistedRooms());
updateList(roomBlacklist, config.blacklistedRooms());
updateList(layoutWhitelist, config.whitelistedLayouts()); updateList(layoutWhitelist, config.whitelistedLayouts());
} }