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

Merge pull request #990 from runelite-extended/big-cox-scouter

Browse Source 
raids: Add getter to class, so it looks nice
This commit is contained in:
Tyler Bochard
2019-07-12 16:38:25 -04:00
committed by GitHub
parent 1cb65fb1e0 27bb7a1d12
commit 35d5ac276e
1 changed files with 50 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,6 +107,7 @@ import static org.apache.commons.lang3.StringUtils.containsIgnoreCase;
) )
@Singleton @Singleton
@Slf4j @Slf4j
@Getter(AccessLevel.PACKAGE)
public class RaidsPlugin extends Plugin public class RaidsPlugin extends Plugin
{ {
static final DecimalFormat POINTS_FORMAT = new DecimalFormat("#,###"); static final DecimalFormat POINTS_FORMAT = new DecimalFormat("#,###");
@@ -151,125 +152,103 @@ public class RaidsPlugin extends Plugin
"SFCCP.CSCPF - #WNEESE#NWSWWN", //bad crabs first rare crabs second "SFCCP.CSCPF - #WNEESE#NWSWWN", //bad crabs first rare crabs second
"SCFPC.CSPCF - #WSWWNE#WSEENE" //good crabs first rare crabs second "SCFPC.CSPCF - #WSWWNE#WSEENE" //good crabs first rare crabs second
); );
private static final String TRIPLE_PUZZLE = "SFCCPC.PCSCPF - #WSEENES#WWWNEEE"; //good crabs first rare crabs second rare crabs third
private static final Pattern PUZZLES = Pattern.compile("Puzzle - (\\w+)"); private static final Pattern PUZZLES = Pattern.compile("Puzzle - (\\w+)");
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.NONE)
private final List<String> roomWhitelist = new ArrayList<>();
@Getter(AccessLevel.PACKAGE)
private final List<String> roomBlacklist = new ArrayList<>();
@Getter(AccessLevel.PACKAGE)
private final List<String> rotationWhitelist = new ArrayList<>();
@Getter(AccessLevel.PACKAGE)
private final List<String> layoutWhitelist = new ArrayList<>();
@Getter(AccessLevel.PACKAGE)
private final Map<String, List<Integer>> recommendedItemsList = new HashMap<>();
@Inject @Inject
private ChatMessageManager chatMessageManager; private ChatMessageManager chatMessageManager;
@Getter(AccessLevel.NONE)
@Inject @Inject
private InfoBoxManager infoBoxManager; private InfoBoxManager infoBoxManager;
@Getter(AccessLevel.NONE)
@Inject @Inject
private Client client; private Client client;
@Getter(AccessLevel.NONE)
@Inject @Inject
private RaidsConfig config; private RaidsConfig config;
@Getter(AccessLevel.NONE)
@Inject @Inject
private OverlayManager overlayManager; private OverlayManager overlayManager;
@Getter(AccessLevel.NONE)
@Inject @Inject
private RaidsOverlay overlay; private RaidsOverlay overlay;
@Getter(AccessLevel.NONE)
@Inject @Inject
private RaidsPointsOverlay pointsOverlay; private RaidsPointsOverlay pointsOverlay;
@Getter(AccessLevel.NONE)
@Inject @Inject
private RaidsPartyOverlay partyOverlay; private RaidsPartyOverlay partyOverlay;
@Getter(AccessLevel.NONE)
@Inject @Inject
private LayoutSolver layoutSolver; private LayoutSolver layoutSolver;
@Getter(AccessLevel.NONE)
@Inject @Inject
private SpriteManager spriteManager; private SpriteManager spriteManager;
@Getter(AccessLevel.NONE)
@Inject @Inject
private ClientThread clientThread; private ClientThread clientThread;
@Getter(AccessLevel.NONE)
@Inject @Inject
private TooltipManager tooltipManager; private TooltipManager tooltipManager;
@Getter(AccessLevel.NONE)
@Inject @Inject
private ClientToolbar clientToolbar; private ClientToolbar clientToolbar;
@Getter(AccessLevel.NONE)
@Inject @Inject
private ItemManager itemManager; private ItemManager itemManager;
@Getter(AccessLevel.PACKAGE)
private Raid raid;
@Getter(AccessLevel.PACKAGE)
private boolean inRaidChambers;
@Getter(AccessLevel.PACKAGE)
private String goodCrabs;
@Getter(AccessLevel.PACKAGE)
private int startPlayerCount;
@Getter(AccessLevel.PACKAGE)
private List<String> partyMembers = new ArrayList<>();
@Getter(AccessLevel.PACKAGE)
private List<String> startingPartyMembers = new ArrayList<>();
@Getter(AccessLevel.PACKAGE)
private Set<String> missingPartyMembers = new HashSet<>();
@Getter(AccessLevel.PACKAGE)
private String layoutFullCode;
@Getter(AccessLevel.PACKAGE)
private boolean raidStarted; private boolean raidStarted;
private int upperTime = -1; private boolean inRaidChambers;
private int middleTime = -1;
private int lowerTime = -1;
private int raidTime = -1;
private WidgetOverlay widgetOverlay;
private String tooltip;
private NavigationButton navButton;
private RaidsTimer timer;
@Getter(AccessLevel.PACKAGE)
private boolean enhanceScouterTitle; private boolean enhanceScouterTitle;
@Getter(AccessLevel.PACKAGE)
private boolean hideBackground; private boolean hideBackground;
private boolean raidsTimer; private boolean raidsTimer;
private boolean pointsMessage; private boolean pointsMessage;
private boolean ptsHr; private boolean ptsHr;
@Getter(AccessLevel.PACKAGE)
private boolean scoutOverlay; private boolean scoutOverlay;
private boolean scoutOverlayAtBank; private boolean scoutOverlayAtBank;
private boolean scoutOverlayInRaid; private boolean scoutOverlayInRaid;
@Getter(AccessLevel.PACKAGE)
private boolean displayFloorBreak; private boolean displayFloorBreak;
@Getter(AccessLevel.PACKAGE)
private boolean showRecommendedItems; private boolean showRecommendedItems;
private String recommendedItems;
@Getter(AccessLevel.PACKAGE)
private boolean alwaysShowWorldAndCC; private boolean alwaysShowWorldAndCC;
private boolean layoutMessage; private boolean layoutMessage;
@Getter(AccessLevel.PACKAGE)
private boolean colorTightrope; private boolean colorTightrope;
@Getter(AccessLevel.PACKAGE)
private Color tightropeColor;
@Getter(AccessLevel.PACKAGE)
private boolean crabHandler; private boolean crabHandler;
@Getter(AccessLevel.PACKAGE)
private Color goodCrabColor;
@Getter(AccessLevel.PACKAGE)
private Color rareCrabColor;
@Getter(AccessLevel.PACKAGE)
private boolean enableRotationWhitelist; private boolean enableRotationWhitelist;
private String whitelistedRotations;
@Getter(AccessLevel.PACKAGE)
private boolean enableLayoutWhitelist; private boolean enableLayoutWhitelist;
private String whitelistedLayouts;
@Getter(AccessLevel.PACKAGE)
private boolean showScavsFarms; private boolean showScavsFarms;
@Getter(AccessLevel.PACKAGE)
private boolean scavsBeforeIce; private boolean scavsBeforeIce;
@Getter(AccessLevel.PACKAGE)
private boolean scavsBeforeOlm; private boolean scavsBeforeOlm;
@Getter(AccessLevel.PACKAGE)
private Color scavPrepColor;
private String whitelistedRooms;
private String blacklistedRooms;
@Getter(AccessLevel.PACKAGE)
private boolean hideRopeless; private boolean hideRopeless;
@Getter(AccessLevel.PACKAGE)
private boolean hideVanguards; private boolean hideVanguards;
@Getter(AccessLevel.PACKAGE)
private boolean hideUnknownCombat; private boolean hideUnknownCombat;
private boolean partyDisplay; private boolean partyDisplay;
private int startPlayerCount;
private int upperTime = -1;
private int middleTime = -1;
private int lowerTime = -1;
private int raidTime = -1;
private Color goodCrabColor;
private Color rareCrabColor;
private Color scavPrepColor;
private Color tightropeColor;
private Raid raid;
private RaidsTimer timer;
private WidgetOverlay widgetOverlay;
private NavigationButton navButton;
private String recommendedItems;
private String whitelistedRooms;
private String whitelistedRotations;
private String whitelistedLayouts;
private String blacklistedRooms;
private String tooltip;
private String goodCrabs;
private String layoutFullCode;
private List<String> roomWhitelist = new ArrayList<>();
private List<String> roomBlacklist = new ArrayList<>();
private List<String> rotationWhitelist = new ArrayList<>();
private List<String> layoutWhitelist = new ArrayList<>();
private List<String> partyMembers = new ArrayList<>();
private List<String> startingPartyMembers = new ArrayList<>();
private Map<String, List<Integer>> recommendedItemsList = new HashMap<>();
private Set<String> missingPartyMembers = new HashSet<>();
@Provides @Provides
RaidsConfig provideConfig(ConfigManager configManager) RaidsConfig provideConfig(ConfigManager configManager)
@@ -287,7 +266,7 @@ public class RaidsPlugin extends Plugin
protected void startUp() throws Exception protected void startUp() throws Exception
{ {
updateConfig(); updateConfig();
overlayManager.add(overlay); overlayManager.add(overlay);
overlayManager.add(pointsOverlay); overlayManager.add(pointsOverlay);
if (this.partyDisplay) if (this.partyDisplay)
@@ -335,8 +314,9 @@ public class RaidsPlugin extends Plugin
{ {
return; return;
} }
updateConfig(); updateConfig();
updateLists();
if (event.getKey().equals("raidsTimer")) if (event.getKey().equals("raidsTimer"))
{ {
@@ -356,7 +336,6 @@ public class RaidsPlugin extends Plugin
} }
} }
updateLists();
clientThread.invokeLater(() -> checkRaidPresence(true)); clientThread.invokeLater(() -> checkRaidPresence(true));
} }
@@ -824,7 +803,7 @@ public class RaidsPlugin extends Plugin
{ {
list.clear(); list.clear();
if (list.equals(rotationWhitelist)) if (list == this.rotationWhitelist)
{ {
Matcher m = ROTATION_REGEX.matcher(input); Matcher m = ROTATION_REGEX.matcher(input);
while (m.find()) while (m.find())
@@ -1236,7 +1215,7 @@ public class RaidsPlugin extends Plugin
{ {
overlay.setScoutOverlayShown(bool); overlay.setScoutOverlayShown(bool);
} }
private void updateConfig() private void updateConfig()
{ {
this.enhanceScouterTitle = config.enhanceScouterTitle(); this.enhanceScouterTitle = config.enhanceScouterTitle();