From 27bb7a1d123f8d955aed73e70b9bda33160a35e6 Mon Sep 17 00:00:00 2001 From: Ganom Date: Fri, 12 Jul 2019 00:15:35 -0400 Subject: [PATCH] Add getter to class, so it looks nice Also fixes issue where colors weren't being set because updateList was doing .equals instead of ==. --- .../client/plugins/raids/RaidsPlugin.java | 121 ++++++++---------- 1 file changed, 50 insertions(+), 71 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index 64ae7c8661..4866d91b1a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -107,6 +107,7 @@ import static org.apache.commons.lang3.StringUtils.containsIgnoreCase; ) @Singleton @Slf4j +@Getter(AccessLevel.PACKAGE) public class RaidsPlugin extends Plugin { 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 "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+)"); - @Getter(AccessLevel.PACKAGE) - private final List roomWhitelist = new ArrayList<>(); - @Getter(AccessLevel.PACKAGE) - private final List roomBlacklist = new ArrayList<>(); - @Getter(AccessLevel.PACKAGE) - private final List rotationWhitelist = new ArrayList<>(); - @Getter(AccessLevel.PACKAGE) - private final List layoutWhitelist = new ArrayList<>(); - @Getter(AccessLevel.PACKAGE) - private final Map> recommendedItemsList = new HashMap<>(); + @Getter(AccessLevel.NONE) @Inject private ChatMessageManager chatMessageManager; + @Getter(AccessLevel.NONE) @Inject private InfoBoxManager infoBoxManager; + @Getter(AccessLevel.NONE) @Inject private Client client; + @Getter(AccessLevel.NONE) @Inject private RaidsConfig config; + @Getter(AccessLevel.NONE) @Inject private OverlayManager overlayManager; + @Getter(AccessLevel.NONE) @Inject private RaidsOverlay overlay; + @Getter(AccessLevel.NONE) @Inject private RaidsPointsOverlay pointsOverlay; + @Getter(AccessLevel.NONE) @Inject private RaidsPartyOverlay partyOverlay; + @Getter(AccessLevel.NONE) @Inject private LayoutSolver layoutSolver; + @Getter(AccessLevel.NONE) @Inject private SpriteManager spriteManager; + @Getter(AccessLevel.NONE) @Inject private ClientThread clientThread; + @Getter(AccessLevel.NONE) @Inject private TooltipManager tooltipManager; + @Getter(AccessLevel.NONE) @Inject private ClientToolbar clientToolbar; + @Getter(AccessLevel.NONE) @Inject 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 partyMembers = new ArrayList<>(); - @Getter(AccessLevel.PACKAGE) - private List startingPartyMembers = new ArrayList<>(); - @Getter(AccessLevel.PACKAGE) - private Set missingPartyMembers = new HashSet<>(); - @Getter(AccessLevel.PACKAGE) - private String layoutFullCode; - @Getter(AccessLevel.PACKAGE) private boolean raidStarted; - private int upperTime = -1; - 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 inRaidChambers; private boolean enhanceScouterTitle; - @Getter(AccessLevel.PACKAGE) private boolean hideBackground; private boolean raidsTimer; private boolean pointsMessage; private boolean ptsHr; - @Getter(AccessLevel.PACKAGE) private boolean scoutOverlay; private boolean scoutOverlayAtBank; private boolean scoutOverlayInRaid; - @Getter(AccessLevel.PACKAGE) private boolean displayFloorBreak; - @Getter(AccessLevel.PACKAGE) private boolean showRecommendedItems; - private String recommendedItems; - @Getter(AccessLevel.PACKAGE) private boolean alwaysShowWorldAndCC; private boolean layoutMessage; - @Getter(AccessLevel.PACKAGE) private boolean colorTightrope; - @Getter(AccessLevel.PACKAGE) - private Color tightropeColor; - @Getter(AccessLevel.PACKAGE) private boolean crabHandler; - @Getter(AccessLevel.PACKAGE) - private Color goodCrabColor; - @Getter(AccessLevel.PACKAGE) - private Color rareCrabColor; - @Getter(AccessLevel.PACKAGE) private boolean enableRotationWhitelist; - private String whitelistedRotations; - @Getter(AccessLevel.PACKAGE) private boolean enableLayoutWhitelist; - private String whitelistedLayouts; - @Getter(AccessLevel.PACKAGE) private boolean showScavsFarms; - @Getter(AccessLevel.PACKAGE) private boolean scavsBeforeIce; - @Getter(AccessLevel.PACKAGE) private boolean scavsBeforeOlm; - @Getter(AccessLevel.PACKAGE) - private Color scavPrepColor; - private String whitelistedRooms; - private String blacklistedRooms; - @Getter(AccessLevel.PACKAGE) private boolean hideRopeless; - @Getter(AccessLevel.PACKAGE) private boolean hideVanguards; - @Getter(AccessLevel.PACKAGE) private boolean hideUnknownCombat; 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 roomWhitelist = new ArrayList<>(); + private List roomBlacklist = new ArrayList<>(); + private List rotationWhitelist = new ArrayList<>(); + private List layoutWhitelist = new ArrayList<>(); + private List partyMembers = new ArrayList<>(); + private List startingPartyMembers = new ArrayList<>(); + private Map> recommendedItemsList = new HashMap<>(); + private Set missingPartyMembers = new HashSet<>(); @Provides RaidsConfig provideConfig(ConfigManager configManager) @@ -287,7 +266,7 @@ public class RaidsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - + overlayManager.add(overlay); overlayManager.add(pointsOverlay); if (this.partyDisplay) @@ -335,8 +314,9 @@ public class RaidsPlugin extends Plugin { return; } - + updateConfig(); + updateLists(); if (event.getKey().equals("raidsTimer")) { @@ -356,7 +336,6 @@ public class RaidsPlugin extends Plugin } } - updateLists(); clientThread.invokeLater(() -> checkRaidPresence(true)); } @@ -824,7 +803,7 @@ public class RaidsPlugin extends Plugin { list.clear(); - if (list.equals(rotationWhitelist)) + if (list == this.rotationWhitelist) { Matcher m = ROTATION_REGEX.matcher(input); while (m.find()) @@ -1236,7 +1215,7 @@ public class RaidsPlugin extends Plugin { overlay.setScoutOverlayShown(bool); } - + private void updateConfig() { this.enhanceScouterTitle = config.enhanceScouterTitle();