diff --git a/deobfuscator/pom.xml b/deobfuscator/pom.xml
index c711697622..babd26ed24 100644
--- a/deobfuscator/pom.xml
+++ b/deobfuscator/pom.xml
@@ -65,6 +65,7 @@
org.slf4j
slf4j-simple
1.7.12
+ runtime
com.google.code.gson
diff --git a/deobfuscator/src/main/java/net/runelite/asm/Type.java b/deobfuscator/src/main/java/net/runelite/asm/Type.java
index 68ba6960d4..89eb3b3023 100644
--- a/deobfuscator/src/main/java/net/runelite/asm/Type.java
+++ b/deobfuscator/src/main/java/net/runelite/asm/Type.java
@@ -110,7 +110,7 @@ public class Type
{
s = s.substring(1);
}
- if (s.startsWith("L"))
+ if (s.startsWith("L") && s.endsWith(";"))
{
return s.substring(1, s.length() - 1);
}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java
index 7e341b1a55..eb75795d49 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java
@@ -31,6 +31,7 @@ import net.runelite.asm.Field;
import net.runelite.asm.Method;
import net.runelite.asm.signature.util.VirtualMethods;
import net.runelite.deob.Deob;
+import net.runelite.deob.DeobAnnotations;
import net.runelite.deob.Deobfuscator;
import net.runelite.deob.util.NameMappings;
@@ -60,7 +61,7 @@ public class RenameUnique implements Deobfuscator
for (ClassFile cf : group.getClasses())
for (Field field : cf.getFields())
{
- if (field.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN)
+ if (field.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN && !field.getName().startsWith("__") || field.getName().equals(DeobAnnotations.getExportedName(field.getAnnotations())))
continue;
map.map(field.getPoolField(), "field" + i++);
@@ -74,7 +75,7 @@ public class RenameUnique implements Deobfuscator
for (ClassFile cf : group.getClasses())
for (Method method : cf.getMethods())
{
- if (method.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN)
+ if (method.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN && !method.getName().startsWith("__") || method.getName().equals(DeobAnnotations.getExportedName(method.getAnnotations())))
continue;
List virtualMethods = VirtualMethods.getVirtualMethods(method);
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java
index cbb38be382..418802ef5a 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java
@@ -216,6 +216,8 @@ public class Renamer implements Deobfuscator
field.getAnnotations().addAnnotation(DeobAnnotations.OBFUSCATED_NAME, "value", field.getName());
}
+ assert DeobAnnotations.getExportedName(field.getAnnotations()) == null || DeobAnnotations.getExportedName(field.getAnnotations()).equals(newName) : "Tried changing field name to something other than the exported name!";
+
field.setName(newName);
++fields;
}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java
index db6ed0ef1c..0201caabb1 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java
@@ -26,24 +26,19 @@ package net.runelite.deob.updater;
import java.io.File;
import java.io.IOException;
-import java.util.Map;
import net.runelite.asm.ClassGroup;
-import net.runelite.asm.Field;
-import net.runelite.asm.Method;
-import net.runelite.deob.deobfuscators.Renamer;
import net.runelite.deob.deobfuscators.mapping.AnnotationIntegrityChecker;
import net.runelite.deob.deobfuscators.mapping.AnnotationMapper;
import net.runelite.deob.deobfuscators.mapping.Mapper;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.deob.util.JarUtil;
-import net.runelite.deob.util.NameMappings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class UpdateMappings
{
private static final Logger logger = LoggerFactory.getLogger(UpdateMappings.class);
- private static boolean renameRL = true;
+
private final ClassGroup group1, group2;
public UpdateMappings(ClassGroup group1, ClassGroup group2)
@@ -79,32 +74,6 @@ public class UpdateMappings
pr.run();
}
- public void updateRL()
- {
- Mapper mapper = new Mapper(group1, group2);
- mapper.run();
- ParallelExecutorMapping mapping = mapper.getMapping();
- NameMappings names = new NameMappings();
-
- for (Map.Entry e : mapping.getMap().entrySet())
- {
- Object k = e.getKey();
- Object v = e.getValue();
-
- if (k instanceof Field)
- {
- names.map(((Field) v).getPoolField(), ((Field) k).getName());
- }
- else if (k instanceof Method)
- {
- names.map(((Method) v).getPoolMethod(), ((Method) k).getName());
- }
- }
-
- Renamer renamer = new Renamer(names);
- renamer.run(group2);
- }
-
public void save(File out) throws IOException
{
JarUtil.saveJar(group2, out);
@@ -121,14 +90,7 @@ public class UpdateMappings
JarUtil.loadJar(new File(args[0])),
JarUtil.loadJar(new File(args[1]))
);
- if (renameRL)
- {
- u.updateRL();
- }
- else
- {
u.update();
- }
u.save(new File(args[2]));
}
}
diff --git a/runelite-api/src/main/java/net/runelite/api/GameState.java b/runelite-api/src/main/java/net/runelite/api/GameState.java
index 5f9083f9ca..6a61fcfe59 100644
--- a/runelite-api/src/main/java/net/runelite/api/GameState.java
+++ b/runelite-api/src/main/java/net/runelite/api/GameState.java
@@ -24,6 +24,11 @@
*/
package net.runelite.api;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
/**
* An enumeration of game states the client is in.
*/
@@ -66,6 +71,10 @@ public enum GameState
*/
HOPPING(45);
+ private static final Map stateValueMap =
+ Arrays.stream(GameState.values())
+ .collect(Collectors.toMap(gs -> gs.state, Function.identity()));
+
/**
* The raw state value.
*/
@@ -85,13 +94,6 @@ public enum GameState
*/
public static GameState of(int state)
{
- for (GameState gs : GameState.values())
- {
- if (gs.state == state)
- {
- return gs;
- }
- }
- return UNKNOWN;
+ return stateValueMap.getOrDefault(state, UNKNOWN);
}
}
diff --git a/runelite-api/src/main/java/net/runelite/api/Perspective.java b/runelite-api/src/main/java/net/runelite/api/Perspective.java
index 4d3f312386..5c1955f249 100644
--- a/runelite-api/src/main/java/net/runelite/api/Perspective.java
+++ b/runelite-api/src/main/java/net/runelite/api/Perspective.java
@@ -24,6 +24,7 @@
*/
package net.runelite.api;
+import java.awt.geom.Path2D;
import static net.runelite.api.Constants.TILE_FLAG_BRIDGE;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
@@ -549,7 +550,7 @@ public class Perspective
)
{
int radius = 5;
- Area geometry = new Area();
+ Path2D.Double geometry = new Path2D.Double();
final int tileHeight = getTileHeight(client, point, client.getPlane());
@@ -607,10 +608,10 @@ public class Perspective
continue;
}
- geometry.add(new Area(clickableRect));
+ geometry.append(clickableRect, false);
}
- return geometry;
+ return new Area(geometry);
}
private static Area getAABB(
diff --git a/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java b/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java
index 741041e1e0..73c004d4b3 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java
@@ -29,4 +29,10 @@ package net.runelite.api.events;
*/
public class BeforeRender
{
+ public static final BeforeRender INSTANCE = new BeforeRender();
+
+ private BeforeRender()
+ {
+ // noop
+ }
}
diff --git a/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java b/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java
index 077a88096d..c44789965a 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java
@@ -29,4 +29,10 @@ package net.runelite.api.events;
*/
public class CannonballFired
{
+ public static final CannonballFired INSTANCE = new CannonballFired();
+
+ private CannonballFired()
+ {
+ // noop
+ }
}
diff --git a/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java b/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java
index e76e82dd6d..0efef18d0d 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java
@@ -29,4 +29,10 @@ package net.runelite.api.events;
*/
public class CanvasSizeChanged
{
+ public static final CanvasSizeChanged INSTANCE = new CanvasSizeChanged();
+
+ private CanvasSizeChanged()
+ {
+ // noop
+ }
}
diff --git a/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java b/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java
index 369ff7982a..6874f4145c 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java
@@ -29,4 +29,10 @@ package net.runelite.api.events;
*/
public class ClientTick
{
+ public static final ClientTick INSTANCE = new ClientTick();
+
+ private ClientTick()
+ {
+ // noop
+ }
}
diff --git a/runelite-api/src/main/java/net/runelite/api/events/GameTick.java b/runelite-api/src/main/java/net/runelite/api/events/GameTick.java
index aefa7fc3e4..2bf035633d 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/GameTick.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/GameTick.java
@@ -24,8 +24,6 @@
*/
package net.runelite.api.events;
-import lombok.Data;
-
// The NPC update event seem to run every server tick,
// but having the game tick event after all packets
// have been processed is typically more useful.
@@ -43,7 +41,12 @@ import lombok.Data;
* Note that occurrences that take place purely on the client, such as right
* click menus, are independent of the game tick.
*/
-@Data
public class GameTick
{
+ public static final GameTick INSTANCE = new GameTick();
+
+ private GameTick()
+ {
+ // noop
+ }
}
diff --git a/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java b/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java
index e46b815f49..0cf8f33c76 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java
@@ -29,4 +29,10 @@ package net.runelite.api.events;
*/
public class LocalPlayerDeath
{
+ public static final LocalPlayerDeath INSTANCE = new LocalPlayerDeath();
+
+ private LocalPlayerDeath()
+ {
+ // noop
+ }
}
diff --git a/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java b/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java
index 91bed8a304..3dea001150 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java
@@ -32,4 +32,10 @@ package net.runelite.api.events;
*/
public class UsernameChanged
{
+ public static final UsernameChanged INSTANCE = new UsernameChanged();
+
+ private UsernameChanged()
+ {
+ // noop
+ }
}
diff --git a/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java b/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
index d5479e3485..6f58e9fe07 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
@@ -24,13 +24,16 @@
*/
package net.runelite.api.events;
-import lombok.Value;
-
/**
* An event where the position of a {@link net.runelite.api.widgets.Widget}
* relative to its parent has changed.
*/
-@Value
public class WidgetPositioned
{
+ public static final WidgetPositioned INSTANCE = new WidgetPositioned();
+
+ private WidgetPositioned()
+ {
+ // noop
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
index ca25fa84a8..5c53677308 100644
--- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
+++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
@@ -87,9 +87,6 @@ public class Hooks implements Callbacks
private static final OverlayRenderer renderer = injector.getInstance(OverlayRenderer.class);
private static final OverlayManager overlayManager = injector.getInstance(OverlayManager.class);
- private static final GameTick GAME_TICK = new GameTick();
- private static final BeforeRender BEFORE_RENDER = new BeforeRender();
-
@Inject
private EventBus eventBus;
@@ -151,13 +148,13 @@ public class Hooks implements Callbacks
deferredEventBus.replay();
- eventBus.post(GAME_TICK);
+ eventBus.post(GameTick.INSTANCE);
int tick = client.getTickCount();
client.setTickCount(tick + 1);
}
- eventBus.post(BEFORE_RENDER);
+ eventBus.post(BeforeRender.INSTANCE);
clientThread.invoke();
diff --git a/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java b/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java
index a5f0f57355..171d299e72 100644
--- a/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java
+++ b/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java
@@ -27,6 +27,7 @@ package net.runelite.client.menus;
import joptsimple.internal.Strings;
import lombok.EqualsAndHashCode;
import lombok.Getter;
+import lombok.Setter;
import net.runelite.api.MenuEntry;
import static net.runelite.client.menus.MenuManager.LEVEL_PATTERN;
import net.runelite.client.util.Text;
@@ -52,6 +53,16 @@ public class ComparableEntry
@Getter
private boolean strictTarget;
+ /**
+ * If two entries are both suppose to be left click,
+ * the entry with the higher priority will be selected.
+ * This only effects left click priority entries.
+ */
+ @Getter
+ @Setter
+ @EqualsAndHashCode.Exclude
+ private int priority;
+
public ComparableEntry(String option, String target)
{
this(option, target, -1, -1, true, true);
@@ -70,6 +81,7 @@ public class ComparableEntry
this.type = type;
this.strictOption = strictOption;
this.strictTarget = strictTarget;
+ this.priority = 0;
}
// This is only used for type checking, which is why it has everything but target
@@ -80,6 +92,7 @@ public class ComparableEntry
this.id = e.getIdentifier();
this.type = e.getType();
this.strictOption = true;
+ this.priority = 0;
}
boolean matches(MenuEntry entry)
diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
index 4e4f9fb847..888e9f032e 100644
--- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
@@ -34,14 +34,16 @@ import com.google.common.collect.Multimap;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -78,7 +80,6 @@ public class MenuManager
private final Client client;
private final EventBus eventBus;
- private final Prioritizer prioritizer;
//Maps the indexes that are being used to the menu option.
private final Map playerMenuIndexMap = new HashMap<>();
@@ -86,24 +87,22 @@ public class MenuManager
private final Multimap managedMenuOptions = HashMultimap.create();
private final Set npcMenuOptions = new HashSet<>();
- private final Set priorityEntries = new HashSet<>();
- private final Set currentPriorityEntries = new HashSet<>();
- private final Set hiddenEntries = new HashSet<>();
- private final Set currentHiddenEntries = new HashSet<>();
- private final Map swaps = new HashMap<>();
- private final Map currentSwaps = new HashMap<>();
+ private final HashSet priorityEntries = new HashSet<>();
+ private HashMap currentPriorityEntries = new HashMap<>();
+ private final ConcurrentHashMap safeCurrentPriorityEntries = new ConcurrentHashMap<>();
+ private final HashSet hiddenEntries = new HashSet<>();
+ private HashSet currentHiddenEntries = new HashSet<>();
+ private final HashMap swaps = new HashMap<>();
private final LinkedHashSet entries = Sets.newLinkedHashSet();
private MenuEntry leftClickEntry = null;
- private int leftClickType = -1;
@Inject
private MenuManager(Client client, EventBus eventBus)
{
this.client = client;
this.eventBus = eventBus;
- this.prioritizer = new Prioritizer();
}
/**
@@ -147,22 +146,11 @@ public class MenuManager
public void onMenuOpened(MenuOpened event)
{
currentPriorityEntries.clear();
- currentHiddenEntries.clear();
// Need to reorder the list to normal, then rebuild with swaps
MenuEntry[] oldEntries = event.getMenuEntries();
- for (MenuEntry entry : oldEntries)
- {
- if (entry == leftClickEntry)
- {
- entry.setType(leftClickType);
- break;
- }
- }
-
leftClickEntry = null;
- leftClickType = -1;
client.sortMenuEntries();
@@ -192,7 +180,7 @@ public class MenuManager
{
shouldDeprioritize = true;
}
- currentPriorityEntries.add(entry);
+ currentPriorityEntries.put(entry, p);
newEntries.remove(entry);
continue prioritizer;
}
@@ -221,8 +209,8 @@ public class MenuManager
}
}
- // Do not need to swap with itself
- if (swapFrom != null && swapFrom != entry)
+ // Do not need to swap with itself or if the swapFrom is already the first entry
+ if (swapFrom != null && swapFrom != entry && swapFrom != Iterables.getLast(newEntries))
{
// Deprioritize entries if the swaps are not in similar type groups
if ((swapFrom.getType() >= 1000 && entry.getType() < 1000) || (entry.getType() >= 1000 && swapFrom.getType() < 1000) && !shouldDeprioritize)
@@ -250,12 +238,19 @@ public class MenuManager
}
}
- if (!priorityEntries.isEmpty())
+ if (!currentPriorityEntries.isEmpty())
{
- newEntries.addAll(currentPriorityEntries);
+ newEntries.addAll(currentPriorityEntries.entrySet().stream()
+ .sorted(Comparator.comparingInt(e -> e.getValue().getPriority()))
+ .map(Map.Entry::getKey)
+ .collect(Collectors.toList()));
}
- event.setMenuEntries(newEntries.toArray(new MenuEntry[0]));
+ MenuEntry[] arrayEntries = newEntries.toArray(new MenuEntry[0]);
+
+ // Need to set the event entries to prevent conflicts
+ event.setMenuEntries(arrayEntries);
+ client.setMenuEntries(arrayEntries);
}
@Subscribe
@@ -282,13 +277,10 @@ public class MenuManager
}
}
-
-
@Subscribe
public void onBeforeRender(BeforeRender event)
{
leftClickEntry = null;
- leftClickType = -1;
if (client.isMenuOpen())
{
@@ -296,7 +288,6 @@ public class MenuManager
}
entries.clear();
-
entries.addAll(Arrays.asList(client.getMenuEntries()));
if (entries.size() < 2)
@@ -304,56 +295,35 @@ public class MenuManager
return;
}
- currentPriorityEntries.clear();
- currentHiddenEntries.clear();
- currentSwaps.clear();
-
- prioritizer.prioritize();
-
- while (prioritizer.isRunning())
+ if (!hiddenEntries.isEmpty())
{
- // wait
- }
+ currentHiddenEntries.clear();
+ indexHiddenEntries(entries);
- entries.removeAll(currentHiddenEntries);
-
-
- for (MenuEntry entry : currentPriorityEntries)
- {
- if (entries.contains(entry))
+ if (!currentHiddenEntries.isEmpty())
{
- leftClickEntry = entry;
- leftClickType = entry.getType();
- entries.remove(leftClickEntry);
- leftClickEntry.setType(MenuAction.WIDGET_DEFAULT.getId());
- entries.add(leftClickEntry);
- break;
+ entries.removeAll(currentHiddenEntries);
}
}
-
- if (leftClickEntry == null)
+ if (!priorityEntries.isEmpty())
{
- MenuEntry first = Iterables.getLast(entries);
-
- for (ComparableEntry swap : currentSwaps.keySet())
- {
- if (swap.matches(first))
- {
- leftClickEntry = currentSwaps.get(swap);
- leftClickType = leftClickEntry.getType();
- entries.remove(leftClickEntry);
- leftClickEntry.setType(MenuAction.WIDGET_DEFAULT.getId());
- entries.add(leftClickEntry);
- break;
- }
- }
+ indexPriorityEntries(entries);
}
- client.setMenuEntries(entries.toArray(new MenuEntry[0]));
+ if (leftClickEntry == null && !swaps.isEmpty())
+ {
+ indexSwapEntries(entries);
+ }
+
+ if (leftClickEntry != null)
+ {
+ entries.remove(leftClickEntry);
+ entries.add(leftClickEntry);
+ client.setMenuEntries(entries.toArray(new MenuEntry[0]));
+ }
}
-
public void addPlayerMenuItem(String menuText)
{
Preconditions.checkNotNull(menuText);
@@ -458,9 +428,8 @@ public class MenuManager
@Subscribe
public void onMenuOptionClicked(MenuOptionClicked event)
{
- if (leftClickEntry != null && leftClickType != -1)
+ if (!client.isMenuOpen() && leftClickEntry != null)
{
- leftClickEntry.setType(leftClickType);
event.setMenuEntry(leftClickEntry);
leftClickEntry = null;
}
@@ -534,7 +503,7 @@ public class MenuManager
/**
* Adds to the set of menu entries which when present, will remove all entries except for this one
*/
- public void addPriorityEntry(String option, String target)
+ public ComparableEntry addPriorityEntry(String option, String target)
{
option = Text.standardize(option);
target = Text.standardize(target);
@@ -542,6 +511,8 @@ public class MenuManager
ComparableEntry entry = new ComparableEntry(option, target);
priorityEntries.add(entry);
+
+ return entry;
}
public void removePriorityEntry(String option, String target)
@@ -559,13 +530,15 @@ public class MenuManager
* Adds to the set of menu entries which when present, will remove all entries except for this one
* This method will add one with strict option, but not-strict target (contains for target, equals for option)
*/
- public void addPriorityEntry(String option)
+ public ComparableEntry addPriorityEntry(String option)
{
option = Text.standardize(option);
ComparableEntry entry = new ComparableEntry(option, "", false);
priorityEntries.add(entry);
+
+ return entry;
}
public void removePriorityEntry(String option)
@@ -789,115 +762,57 @@ public class MenuManager
hiddenEntries.remove(entry);
}
- private class Prioritizer
+ private void indexHiddenEntries(Set entries)
{
- private MenuEntry[] entries;
- private AtomicInteger state = new AtomicInteger(0);
-
- boolean isRunning()
+ currentHiddenEntries = entries.parallelStream().filter(entry ->
{
- return state.get() != 0;
- }
-
- void prioritize()
- {
- if (state.get() != 0)
+ for (ComparableEntry p : hiddenEntries)
{
- return;
- }
-
- entries = client.getMenuEntries();
-
- state.set(3);
-
- if (!hiddenEntries.isEmpty())
- {
- hiddenFinder.run();
- }
- else
- {
- state.decrementAndGet();
- }
-
- if (!priorityEntries.isEmpty())
- {
- priorityFinder.run();
- }
- else
- {
- state.decrementAndGet();
- }
-
- if (!swaps.isEmpty())
- {
- swapFinder.run();
- }
- else
- {
- state.decrementAndGet();
- }
- }
-
- private Thread hiddenFinder = new Thread()
- {
- @Override
- public void run()
- {
- Arrays.stream(entries).parallel().forEach(entry ->
+ if (p.matches(entry))
{
- for (ComparableEntry p : hiddenEntries)
- {
- if (p.matches(entry))
- {
- currentHiddenEntries.add(entry);
- return;
- }
- }
- });
- state.decrementAndGet();
+ return true;
+ }
}
- };
-
- private Thread priorityFinder = new Thread()
- {
- @Override
- public void run()
- {
- Arrays.stream(entries).parallel().forEach(entry ->
- {
- for (ComparableEntry p : priorityEntries)
- {
- if (p.matches(entry))
- {
- currentPriorityEntries.add(entry);
- return;
- }
- }
- });
-
- state.decrementAndGet();
- }
- };
-
- private Thread swapFinder = new Thread()
- {
- @Override
- public void run()
- {
- Arrays.stream(entries).parallel().forEach(entry ->
- {
- for (Map.Entry p : swaps.entrySet())
- {
- if (p.getValue().matches(entry))
- {
- currentSwaps.put(p.getKey(), entry);
- return;
- }
- }
- });
-
- state.decrementAndGet();
- }
- };
+ return false;
+ }).collect(Collectors.toCollection(HashSet::new));
}
-}
+
+ // This could use some optimization
+ private void indexPriorityEntries(Set entries)
+ {
+ safeCurrentPriorityEntries.clear();
+ entries.parallelStream().forEach(entry ->
+ {
+ for (ComparableEntry p : priorityEntries)
+ {
+ if (p.matches(entry))
+ {
+ safeCurrentPriorityEntries.put(entry, p);
+ break;
+ }
+ }
+ });
+
+ leftClickEntry = Iterables.getLast(safeCurrentPriorityEntries.entrySet().stream()
+ .sorted(Comparator.comparingInt(e -> e.getValue().getPriority()))
+ .map(Map.Entry::getKey)
+ .collect(Collectors.toList()));
+ }
+
+ private void indexSwapEntries(Set entries)
+ {
+ MenuEntry first = Iterables.getLast(entries);
+
+ leftClickEntry = entries.parallelStream().filter(entry ->
+ {
+ for (Map.Entry p : swaps.entrySet())
+ {
+ if (p.getKey().matches(first) && p.getValue().matches(entry))
+ {
+ return true;
+ }
+ }
+ return false;
+ }).findFirst().orElse(null);
+ }
+}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
index 805b99005e..52488fb4e3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
@@ -43,11 +43,16 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.stream.Collectors;
import javax.inject.Inject;
@@ -228,7 +233,6 @@ public class PluginManager
.directed()
.build();
- List scannedPlugins = new ArrayList<>();
ClassPath classPath = ClassPath.from(classLoader);
ImmutableSet classes = packageName == null ? classPath.getAllClasses()
@@ -285,24 +289,47 @@ public class PluginManager
throw new RuntimeException("Plugin dependency graph contains a cycle!");
}
- List> sortedPlugins = topologicalSort(graph);
+ List>> sortedPlugins = topologicalGroupSort(graph);
sortedPlugins = Lists.reverse(sortedPlugins);
- for (Class pluginClazz : sortedPlugins)
- {
- Plugin plugin;
- try
- {
- plugin = instantiate(scannedPlugins, (Class) pluginClazz);
- }
- catch (PluginInstantiationException ex)
- {
- log.warn("Error instantiating plugin!", ex);
- continue;
- }
+ final long start = System.currentTimeMillis();
- scannedPlugins.add(plugin);
- }
+ // some plugins get stuck on IO, so add some extra threads
+ ExecutorService exec = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2);
+
+ List scannedPlugins = new CopyOnWriteArrayList<>();
+ sortedPlugins.forEach(group ->
+ {
+ List> curGroup = new ArrayList<>();
+ group.forEach(pluginClazz ->
+ curGroup.add(exec.submit(() ->
+ {
+ Plugin plugin;
+ try
+ {
+ plugin = instantiate(scannedPlugins, (Class) pluginClazz);
+ }
+ catch (PluginInstantiationException e)
+ {
+ log.warn("Error instantiating plugin!", e);
+ return;
+ }
+ scannedPlugins.add(plugin);
+ })));
+ curGroup.forEach(future ->
+ {
+ try
+ {
+ future.get();
+ }
+ catch (InterruptedException | ExecutionException e)
+ {
+ e.printStackTrace();
+ }
+ });
+ });
+
+ log.info("Plugin instantiation took {}ms", System.currentTimeMillis() - start);
return scannedPlugins;
}
@@ -515,40 +542,54 @@ public class PluginManager
}
/**
- * Topologically sort a graph. Uses Kahn's algorithm.
- *
+ * Topologically sort a graph into separate groups.
+ * Each group represents the dependency level of the plugins.
+ * Plugins in group (index) 0 has no dependents.
+ * Plugins in group 1 has dependents in group 0.
+ * Plugins in group 2 has dependents in group 1, etc.
+ * This allows for loading dependent groups serially, starting from the last group,
+ * while loading plugins within each group in parallel.
* @param graph
* @param
* @return
*/
- private List topologicalSort(Graph graph)
+ private List> topologicalGroupSort(Graph graph)
{
- MutableGraph graphCopy = Graphs.copyOf(graph);
- List l = new ArrayList<>();
- Set s = graphCopy.nodes().stream()
- .filter(node -> graphCopy.inDegree(node) == 0)
+ final Set root = graph.nodes().stream()
+ .filter(node -> graph.inDegree(node) == 0)
.collect(Collectors.toSet());
- while (!s.isEmpty())
- {
- Iterator it = s.iterator();
- T n = it.next();
- it.remove();
+ final Map dependencyCount = new HashMap<>();
- l.add(n);
+ root.forEach(n -> dependencyCount.put(n, 0));
+ root.forEach(n -> graph.successors(n)
+ .forEach(m -> incrementChildren(graph, dependencyCount, m, dependencyCount.get(n) + 1)));
- for (T m : graphCopy.successors(n))
+ // create list dependency grouping
+ final List> dependencyGroups = new ArrayList<>();
+ final int[] curGroup = {-1};
+
+ dependencyCount.entrySet().stream()
+ .sorted(Map.Entry.comparingByValue())
+ .forEach(entry ->
{
- graphCopy.removeEdge(n, m);
- if (graphCopy.inDegree(m) == 0)
+ if (entry.getValue() != curGroup[0])
{
- s.add(m);
+ curGroup[0] = entry.getValue();
+ dependencyGroups.add(new ArrayList<>());
}
- }
- }
- if (!graphCopy.edges().isEmpty())
+ dependencyGroups.get(dependencyGroups.size() - 1).add(entry.getKey());
+ });
+
+ return dependencyGroups;
+ }
+
+ private void incrementChildren(Graph graph, Map dependencyCount, T n, int val)
+ {
+ if (!dependencyCount.containsKey(n) || dependencyCount.get(n) < val)
{
- throw new RuntimeException("Graph has at least one cycle");
+ dependencyCount.put(n, val);
+ graph.successors(n).forEach(m ->
+ incrementChildren(graph, dependencyCount, m, val + 1));
}
- return l;
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
index 55ab81fbe3..07bd977a81 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.account;
import java.awt.image.BufferedImage;
import java.util.concurrent.ScheduledExecutorService;
import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.swing.JOptionPane;
import lombok.extern.slf4j.Slf4j;
import net.runelite.client.account.AccountSession;
@@ -47,6 +48,7 @@ import net.runelite.client.util.ImageUtil;
loadWhenOutdated = true
)
@Slf4j
+@Singleton
public class AccountPlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java
index ee77f19ecc..bc67f82a8c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java
@@ -32,6 +32,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.FontTypeFace;
@@ -66,6 +67,7 @@ import net.runelite.client.util.Text;
description = "Display level requirements in Achievement Diary interface",
tags = {"achievements", "tasks"}
)
+@Singleton
public class DiaryRequirementsPlugin extends Plugin
{
private static final String AND_JOINER = ", ";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
index aa88396038..7db0667088 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
@@ -32,45 +32,43 @@ import java.awt.Polygon;
import java.awt.geom.Area;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Point;
import net.runelite.api.Tile;
-import net.runelite.api.coords.LocalPoint;
import net.runelite.client.game.AgilityShortcut;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
class AgilityOverlay extends Overlay
{
private static final Color SHORTCUT_HIGH_LEVEL_COLOR = Color.ORANGE;
private final Client client;
private final AgilityPlugin plugin;
- private final AgilityConfig config;
@Inject
- private AgilityOverlay(Client client, AgilityPlugin plugin, AgilityConfig config)
+ private AgilityOverlay(final Client client, final AgilityPlugin plugin)
{
super(plugin);
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
this.client = client;
this.plugin = plugin;
- this.config = config;
}
@Override
public Dimension render(Graphics2D graphics)
{
- LocalPoint playerLocation = client.getLocalPlayer().getLocalLocation();
Point mousePosition = client.getMouseCanvasPosition();
final List marksOfGrace = plugin.getMarksOfGrace();
plugin.getObstacles().forEach((object, obstacle) ->
{
- if (Obstacles.SHORTCUT_OBSTACLE_IDS.containsKey(object.getId()) && !config.highlightShortcuts() ||
- Obstacles.TRAP_OBSTACLE_IDS.contains(object.getId()) && !config.showTrapOverlay())
+ if (Obstacles.SHORTCUT_OBSTACLE_IDS.containsKey(object.getId()) && !plugin.isHighlightShortcuts() ||
+ Obstacles.TRAP_OBSTACLE_IDS.contains(object.getId()) && !plugin.isShowTrapOverlay())
{
return;
}
@@ -84,7 +82,7 @@ class AgilityOverlay extends Overlay
Polygon polygon = object.getCanvasTilePoly();
if (polygon != null)
{
- OverlayUtil.renderPolygon(graphics, polygon, config.getTrapColor());
+ OverlayUtil.renderPolygon(graphics, polygon, plugin.getTrapColor());
}
return;
}
@@ -92,10 +90,10 @@ class AgilityOverlay extends Overlay
if (objectClickbox != null)
{
AgilityShortcut agilityShortcut = obstacle.getShortcut();
- Color configColor = agilityShortcut == null || agilityShortcut.getLevel() <= plugin.getAgilityLevel() ? config.getOverlayColor() : SHORTCUT_HIGH_LEVEL_COLOR;
- if (config.highlightMarks() && !marksOfGrace.isEmpty())
+ Color configColor = agilityShortcut == null || agilityShortcut.getLevel() <= plugin.getAgilityLevel() ? plugin.getOverlayColor() : SHORTCUT_HIGH_LEVEL_COLOR;
+ if (plugin.isHighlightMarks() && !marksOfGrace.isEmpty())
{
- configColor = config.getMarkColor();
+ configColor = plugin.getMarkColor();
}
if (objectClickbox.contains(mousePosition.getX(), mousePosition.getY()))
@@ -115,7 +113,7 @@ class AgilityOverlay extends Overlay
});
- if (config.highlightMarks() && !marksOfGrace.isEmpty())
+ if (plugin.isHighlightMarks() && !marksOfGrace.isEmpty())
{
for (Tile markOfGraceTile : marksOfGrace)
{
@@ -128,7 +126,7 @@ class AgilityOverlay extends Overlay
continue;
}
- OverlayUtil.renderPolygon(graphics, poly, config.getMarkColor());
+ OverlayUtil.renderPolygon(graphics, poly, plugin.getMarkColor());
}
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java
index abe18393d8..043cc4e23a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java
@@ -32,6 +32,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
@@ -83,14 +85,15 @@ import net.runelite.client.util.ColorUtil;
tags = {"grace", "marks", "overlay", "shortcuts", "skilling", "traps"}
)
@Slf4j
+@Singleton
public class AgilityPlugin extends Plugin
{
private static final int AGILITY_ARENA_REGION_ID = 11157;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final Map obstacles = new HashMap<>();
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final List marksOfGrace = new ArrayList<>();
@Inject
@@ -117,13 +120,13 @@ public class AgilityPlugin extends Plugin
@Inject
private ItemManager itemManager;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private AgilitySession session;
private int lastAgilityXp;
private WorldPoint lastArenaTicketPosition;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int agilityLevel;
@Provides
@@ -132,9 +135,36 @@ public class AgilityPlugin extends Plugin
return configManager.getConfig(AgilityConfig.class);
}
+ // Config values
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showLapCount;
+ @Getter(AccessLevel.PACKAGE)
+ private int lapTimeout;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean lapsToLevel;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean lapsToGoal;
+ @Getter(AccessLevel.PACKAGE)
+ private Color overlayColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean highlightMarks;
+ @Getter(AccessLevel.PACKAGE)
+ private Color markColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean highlightShortcuts;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showTrapOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private Color trapColor;
+ private boolean notifyAgilityArena;
+ private boolean showAgilityArenaTimer;
+ private boolean showShortcutLevel;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(agilityOverlay);
overlayManager.add(lapCounterOverlay);
agilityLevel = client.getBoostedSkillLevel(Skill.AGILITY);
@@ -179,16 +209,40 @@ public class AgilityPlugin extends Plugin
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
- if (!config.showAgilityArenaTimer())
+ if (!event.getGroup().equals("agility"))
+ {
+ return;
+ }
+
+ updateConfig();
+
+ if (!this.showAgilityArenaTimer)
{
removeAgilityArenaTimer();
}
}
+ public void updateConfig()
+ {
+ this.showLapCount = config.showLapCount();
+ this.lapTimeout = config.lapTimeout();
+ this.lapsToLevel = config.lapsToLevel();
+ this.lapsToGoal = config.lapsToGoal();
+ this.overlayColor = config.getOverlayColor();
+ this.highlightMarks = config.highlightMarks();
+ this.markColor = config.getMarkColor();
+ this.highlightShortcuts = config.highlightShortcuts();
+ this.showTrapOverlay = config.showTrapOverlay();
+ this.trapColor = config.getTrapColor();
+ this.notifyAgilityArena = config.notifyAgilityArena();
+ this.showAgilityArenaTimer = config.showAgilityArenaTimer();
+ this.showShortcutLevel = config.showShortcutLevel();
+ }
+
@Subscribe
public void onExperienceChanged(ExperienceChanged event)
{
- if (event.getSkill() != AGILITY || !config.showLapCount())
+ if (event.getSkill() != AGILITY || !this.showLapCount)
{
return;
}
@@ -272,12 +326,12 @@ public class AgilityPlugin extends Plugin
{
log.debug("Ticked position moved from {} to {}", oldTickPosition, newTicketPosition);
- if (config.notifyAgilityArena())
+ if (this.notifyAgilityArena)
{
notifier.notify("Ticket location changed");
}
- if (config.showAgilityArenaTimer())
+ if (this.showAgilityArenaTimer)
{
showNewAgilityArenaTimer();
}
@@ -430,7 +484,7 @@ public class AgilityPlugin extends Plugin
@Subscribe
public void onMenuEntryAdded(MenuEntryAdded event)
{
- if (!config.showShortcutLevel())
+ if (!this.showShortcutLevel)
{
return;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java
index 72e9a0dd07..1c6e413a46 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java
@@ -42,7 +42,7 @@ class AgilitySession
private int lapsTillLevel;
private int lapsTillGoal;
- AgilitySession(Courses course)
+ AgilitySession(final Courses course)
{
this.course = course;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java
index cc732561c0..91812e30f8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.agility;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.coords.WorldPoint;
@@ -50,16 +51,16 @@ enum Courses
private final static Map coursesByRegion;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final double totalXp;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final int lastObstacleXp;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final int regionId;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final WorldPoint[] courseEndWorldPoints;
static
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
index 04c60d4430..e8d0a2771c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Graphics2D;
import java.time.Duration;
import java.time.Instant;
import javax.inject.Inject;
+import javax.inject.Singleton;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.client.ui.overlay.Overlay;
import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
@@ -39,21 +40,20 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
+@Singleton
class LapCounterOverlay extends Overlay
{
private final AgilityPlugin plugin;
- private final AgilityConfig config;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- private LapCounterOverlay(AgilityPlugin plugin, AgilityConfig config)
+ private LapCounterOverlay(final AgilityPlugin plugin)
{
super(plugin);
setPosition(OverlayPosition.TOP_LEFT);
setPriority(OverlayPriority.LOW);
this.plugin = plugin;
- this.config = config;
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Agility overlay"));
}
@@ -62,7 +62,7 @@ class LapCounterOverlay extends Overlay
{
AgilitySession session = plugin.getSession();
- if (!config.showLapCount() ||
+ if (!plugin.isShowLapCount() ||
session == null ||
session.getLastLapCompleted() == null ||
session.getCourse() == null)
@@ -70,7 +70,7 @@ class LapCounterOverlay extends Overlay
return null;
}
- Duration lapTimeout = Duration.ofMinutes(config.lapTimeout());
+ Duration lapTimeout = Duration.ofMinutes(plugin.getLapTimeout());
Duration sinceLap = Duration.between(session.getLastLapCompleted(), Instant.now());
if (sinceLap.compareTo(lapTimeout) >= 0)
@@ -85,12 +85,12 @@ class LapCounterOverlay extends Overlay
tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
tableComponent.addRow("Total Laps:", Integer.toString(session.getTotalLaps()));
- if (config.lapsToLevel() && session.getLapsTillLevel() > 0)
+ if (plugin.isLapsToLevel() && session.getLapsTillLevel() > 0)
{
tableComponent.addRow("Laps until level:", Integer.toString(session.getLapsTillLevel()));
}
- if (config.lapsToGoal() && session.getLapsTillGoal() > 0)
+ if (plugin.isLapsToGoal() && session.getLapsTillGoal() > 0)
{
tableComponent.addRow("Laps until goal:", Integer.toString(session.getLapsTillGoal()));
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java
index e5860abcd0..a84ec94887 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java
@@ -54,7 +54,7 @@ class HydraOverlay extends Overlay
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- HydraOverlay(HydraPlugin plugin, Client client, SpriteManager spriteManager)
+ HydraOverlay(final HydraPlugin plugin, final Client client, final SpriteManager spriteManager)
{
this.plugin = plugin;
this.client = client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java
index b92b6f3875..fe94944427 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java
@@ -30,6 +30,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@@ -59,6 +60,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
enabledByDefault = false
)
@Slf4j
+@Singleton
public class HydraPlugin extends Plugin
{
@Getter(AccessLevel.PACKAGE)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java
index 52e02fadca..a38fa4ecfc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java
@@ -55,7 +55,7 @@ class HydraSceneOverlay extends Overlay
private final Client client;
@Inject
- public HydraSceneOverlay(Client client, HydraPlugin plugin)
+ public HydraSceneOverlay(final Client client, final HydraPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.UNDER_WIDGETS);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java
index a9a25512a4..4350c80699 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java
@@ -29,6 +29,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.Duration;
import java.time.Instant;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.overlay.infobox.Counter;
@@ -36,7 +37,7 @@ import net.runelite.client.util.StackFormatter;
class AmmoCounter extends Counter
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int itemID;
private String name;
private int total;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java
index 5336fccd66..ee2b31666b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.ammo;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.EquipmentInventorySlot;
import net.runelite.api.InventoryID;
@@ -45,6 +46,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
description = "Shows the current ammo the player has equipped",
tags = {"bolts", "darts", "chinchompa", "equipment"}
)
+@Singleton
public class AmmoPlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java
index 40cc9fc1b9..6a23856217 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.animsmoothing;
import com.google.inject.Provides;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.events.ConfigChanged;
import net.runelite.client.config.ConfigManager;
@@ -39,6 +40,7 @@ import net.runelite.client.plugins.PluginDescriptor;
tags = {"npcs", "objects", "players"},
enabledByDefault = false
)
+@Singleton
public class AnimationSmoothingPlugin extends Plugin
{
static final String CONFIG_GROUP = "animationSmoothing";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
index 69a54cc971..bd3de31419 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
@@ -37,7 +37,6 @@ import net.runelite.client.config.ModifierlessKeybind;
@ConfigGroup("antiDrag")
public interface AntiDragConfig extends Config
{
-
@ConfigItem(
position = 0,
keyName = "alwaysOn",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java
index c35d9ac0b9..e1550efe33 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java
@@ -42,13 +42,13 @@ public class AntiDragOverlay extends Overlay
{
private static final int RADIUS = 20;
- private Client client;
- private AntiDragConfig config;
+ private final Client client;
+ private final AntiDragPlugin plugin;
@Inject
- private AntiDragOverlay(Client client, AntiDragConfig config)
+ private AntiDragOverlay(final Client client, final AntiDragPlugin plugin)
{
- this.config = config;
+ this.plugin = plugin;
this.client = client;
setPosition(OverlayPosition.TOOLTIP);
setPriority(OverlayPriority.HIGHEST);
@@ -58,7 +58,7 @@ public class AntiDragOverlay extends Overlay
@Override
public Dimension render(Graphics2D g)
{
- final Color color = config.color();
+ final Color color = plugin.getColor();
g.setColor(color);
final net.runelite.api.Point mouseCanvasPosition = client.getMouseCanvasPosition();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
index 687ee9bc20..3a1eddfd4c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
@@ -26,11 +26,16 @@
package net.runelite.client.plugins.antidrag;
import com.google.inject.Provides;
+import java.awt.Color;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.FocusChanged;
import net.runelite.client.config.ConfigManager;
+import net.runelite.client.config.Keybind;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.input.KeyManager;
import net.runelite.client.plugins.Plugin;
@@ -48,11 +53,11 @@ import net.runelite.client.util.HotkeyListener;
type = PluginType.UTILITY,
enabledByDefault = false
)
-
+@Singleton
public class AntiDragPlugin extends Plugin
{
private static final int DEFAULT_DELAY = 5;
-
+
private boolean toggleDrag;
@Inject
@@ -82,14 +87,27 @@ public class AntiDragPlugin extends Plugin
return configManager.getConfig(AntiDragConfig.class);
}
+ private boolean alwaysOn;
+ private boolean keybind;
+ private Keybind key;
+ private int dragDelay;
+ private boolean reqfocus;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean configOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private Color color;
+ private boolean changeCursor;
+ private CustomCursor selectedCursor;
+
@Override
protected void startUp() throws Exception
{
- if (config.keybind())
+ updateConfig();
+ if (this.keybind)
{
keyManager.registerKeyListener(hotkeyListener);
}
- client.setInventoryDragDelay(config.alwaysOn() ? config.dragDelay() : DEFAULT_DELAY);
+ client.setInventoryDragDelay(this.alwaysOn ? this.dragDelay : DEFAULT_DELAY);
}
@Override
@@ -106,9 +124,11 @@ public class AntiDragPlugin extends Plugin
{
if (event.getGroup().equals("antiDrag"))
{
+ updateConfig();
+
if (event.getKey().equals("keybind"))
{
- if (config.keybind())
+ if (this.keybind)
{
keyManager.registerKeyListener(hotkeyListener);
}
@@ -119,17 +139,30 @@ public class AntiDragPlugin extends Plugin
}
if (event.getKey().equals("alwaysOn"))
{
- client.setInventoryDragDelay(config.alwaysOn() ? config.dragDelay() : DEFAULT_DELAY);
+ client.setInventoryDragDelay(this.alwaysOn ? this.dragDelay : DEFAULT_DELAY);
}
}
}
+ public void updateConfig()
+ {
+ this.alwaysOn = config.alwaysOn();
+ this.keybind = config.keybind();
+ this.key = config.key();
+ this.dragDelay = config.dragDelay();
+ this.reqfocus = config.reqfocus();
+ this.configOverlay = config.overlay();
+ this.color = config.color();
+ this.changeCursor = config.changeCursor();
+ this.selectedCursor = config.selectedCursor();
+ }
+
@Subscribe
public void onFocusChanged(FocusChanged focusChanged)
{
- if (!config.alwaysOn())
+ if (!this.alwaysOn)
{
- if (!focusChanged.isFocused() && config.reqfocus())
+ if (!focusChanged.isFocused() && this.reqfocus)
{
client.setInventoryDragDelay(DEFAULT_DELAY);
overlayManager.remove(overlay);
@@ -137,33 +170,32 @@ public class AntiDragPlugin extends Plugin
}
}
- private final HotkeyListener hotkeyListener = new HotkeyListener(() -> config.key())
+ private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.key)
{
@Override
public void hotkeyPressed()
{
- if (!config.alwaysOn())
+ if (!alwaysOn)
{
toggleDrag = !toggleDrag;
if (toggleDrag)
{
- if (config.overlay())
+ if (configOverlay)
{
overlayManager.add(overlay);
}
- if (config.changeCursor())
+ if (changeCursor)
{
- CustomCursor selectedCursor = config.selectedCursor();
clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString());
}
- client.setInventoryDragDelay(config.dragDelay());
+ client.setInventoryDragDelay(dragDelay);
}
else
{
overlayManager.remove(overlay);
client.setInventoryDragDelay(DEFAULT_DELAY);
- if (config.changeCursor())
+ if (changeCursor)
{
net.runelite.client.plugins.customcursor.CustomCursor selectedCursor = configManager.getConfig(CustomCursorConfig.class).selectedCursor();
clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString());
@@ -172,4 +204,4 @@ public class AntiDragPlugin extends Plugin
}
}
};
-}
+}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java
index 27b3706c78..e6e3b5da8e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.antidrag;
import java.awt.image.BufferedImage;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.client.plugins.customcursor.CustomCursorPlugin;
import net.runelite.client.util.ImageUtil;
@@ -43,7 +44,8 @@ public enum CustomCursor
ZAMORAK_GODSWORD("Zamorak Godsword", "cursor-zamorak-godsword.png");
private final String name;
- @Getter
+
+ @Getter(AccessLevel.PACKAGE)
private final BufferedImage cursorImage;
CustomCursor(String name, String icon)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java
index a00d79e403..f875cae629 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java
@@ -28,11 +28,12 @@
package net.runelite.client.plugins.aoewarnings;
import java.time.Instant;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.runelite.api.coords.LocalPoint;
-@Getter
+@Getter(AccessLevel.PACKAGE)
@AllArgsConstructor
class AoeProjectile
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java
index 48491da688..d70d63c4be 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java
@@ -37,6 +37,7 @@ import java.time.Instant;
import java.util.Iterator;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.Point;
@@ -48,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
import static net.runelite.client.util.ColorUtil.setAlphaComponent;
+@Singleton
public class AoeWarningOverlay extends Overlay
{
private static final int FILL_START_ALPHA = 25;
@@ -55,16 +57,14 @@ public class AoeWarningOverlay extends Overlay
private final Client client;
private final AoeWarningPlugin plugin;
- private final AoeWarningConfig config;
@Inject
- public AoeWarningOverlay(Client client, AoeWarningPlugin plugin, AoeWarningConfig config)
+ public AoeWarningOverlay(final Client client, final AoeWarningPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.UNDER_WIDGETS);
this.client = client;
this.plugin = plugin;
- this.config = config;
}
@Override
@@ -115,7 +115,7 @@ public class AoeWarningOverlay extends Overlay
int tickProgress = aoeProjectile.getFinalTick() - client.getTickCount();
int fillAlpha, outlineAlpha;
- if (config.isFadeEnabled())
+ if (plugin.isConfigFadeEnabled())
{
fillAlpha = (int) ((1 - progress) * FILL_START_ALPHA);//alpha drop off over lifetime
outlineAlpha = (int) ((1 - progress) * OUTLINE_START_ALPHA);
@@ -152,12 +152,12 @@ public class AoeWarningOverlay extends Overlay
outlineAlpha = 255;
}
- if (config.isOutlineEnabled())
+ if (plugin.isConfigOutlineEnabled())
{
- graphics.setColor(new Color(setAlphaComponent(config.overlayColor().getRGB(), outlineAlpha), true));
+ graphics.setColor(new Color(setAlphaComponent(plugin.getOverlayColor().getRGB(), outlineAlpha), true));
graphics.drawPolygon(tilePoly);
}
- if (config.tickTimers())
+ if (plugin.isTickTimers())
{
if (tickProgress >= 0)
{
@@ -165,7 +165,7 @@ public class AoeWarningOverlay extends Overlay
plugin.getFontStyle(), color, centerPoint(tilePoly.getBounds()), plugin.isShadows(), 0);
}
}
- graphics.setColor(new Color(setAlphaComponent(config.overlayColor().getRGB(), fillAlpha), true));
+ graphics.setColor(new Color(setAlphaComponent(plugin.getOverlayColor().getRGB(), fillAlpha), true));
graphics.fillPolygon(tilePoly);
}
return null;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java
index 00ed024a44..730e36b204 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.aoewarnings;
import com.google.inject.Provides;
+import java.awt.Color;
import java.time.Instant;
import java.util.ArrayList;
import java.util.HashMap;
@@ -35,6 +36,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@@ -70,12 +72,13 @@ import net.runelite.client.ui.overlay.OverlayManager;
type = PluginType.PVM,
enabledByDefault = false
)
-
+@Singleton
@Slf4j
public class AoeWarningPlugin extends Plugin
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final Map bombs = new HashMap<>();
+ @Getter(AccessLevel.PACKAGE)
private final Map projectiles = new HashMap<>();
@Inject
public AoeWarningConfig config;
@@ -97,12 +100,6 @@ public class AoeWarningPlugin extends Plugin
private List CrystalSpike = new ArrayList<>();
@Getter(AccessLevel.PACKAGE)
private List WintertodtSnowFall = new ArrayList<>();
- @Getter(AccessLevel.PACKAGE)
- private boolean shadows;
- @Getter(AccessLevel.PACKAGE)
- private int textSize;
- @Getter(AccessLevel.PACKAGE)
- private int fontStyle;
@Provides
AoeWarningConfig getConfig(ConfigManager configManager)
@@ -110,17 +107,73 @@ public class AoeWarningPlugin extends Plugin
return configManager.getConfig(AoeWarningConfig.class);
}
- Map getProjectiles()
- {
- return projectiles;
- }
+ // Config values
+ private boolean aoeNotifyAll;
+ @Getter(AccessLevel.PACKAGE)
+ private Color overlayColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean configOutlineEnabled;
+ private int delay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean configFadeEnabled;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean tickTimers;
+ @Getter(AccessLevel.PACKAGE)
+ private int fontStyle;
+ @Getter(AccessLevel.PACKAGE)
+ private int textSize;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean shadows;
+ private boolean configShamansEnabled;
+ private boolean configShamansNotifyEnabled;
+ private boolean configArchaeologistEnabled;
+ private boolean configArchaeologistNotifyEnabled;
+ private boolean configIceDemonEnabled;
+ private boolean configIceDemonNotifyEnabled;
+ private boolean configVasaEnabled;
+ private boolean configVasaNotifyEnabled;
+ private boolean configTektonEnabled;
+ private boolean configTektonNotifyEnabled;
+ private boolean configVorkathEnabled;
+ private boolean configVorkathNotifyEnabled;
+ private boolean configGalvekEnabled;
+ private boolean configGalvekNotifyEnabled;
+ private boolean configGargBossEnabled;
+ private boolean configGargBossNotifyEnabled;
+ private boolean configVetionEnabled;
+ private boolean configVetionNotifyEnabled;
+ private boolean configChaosFanaticEnabled;
+ private boolean configChaosFanaticNotifyEnabled;
+ private boolean configOlmEnabled;
+ private boolean configOlmNotifyEnabled;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean configbombDisplay;
+ private boolean configbombDisplayNotifyEnabled;
+ private boolean configLightningTrail;
+ private boolean configLightningTrailNotifyEnabled;
+ private boolean configCorpEnabled;
+ private boolean configCorpNotifyEnabled;
+ private boolean configWintertodtEnabled;
+ private boolean configWintertodtNotifyEnabled;
+ private boolean configXarpusEnabled;
+ private boolean configXarpusNotifyEnabled;
+ private boolean configaddyDrags;
+ private boolean configaddyDragsNotifyEnabled;
+ private boolean configDrakeEnabled;
+ private boolean configDrakeNotifyEnabled;
+ private boolean configCerbFireEnabled;
+ private boolean configCerbFireNotifyEnabled;
+ private boolean configDemonicGorillaEnabled;
+ private boolean configDemonicGorillaNotifyEnabled;
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(coreOverlay);
overlayManager.add(bombOverlay);
- reset(true);
+ reset();
}
@Override
@@ -128,7 +181,7 @@ public class AoeWarningPlugin extends Plugin
{
overlayManager.remove(coreOverlay);
overlayManager.remove(bombOverlay);
- reset(false);
+ reset();
}
@Subscribe
@@ -139,18 +192,7 @@ public class AoeWarningPlugin extends Plugin
return;
}
- switch (event.getKey())
- {
- case "fontStyle":
- fontStyle = config.fontStyle().getFont();
- break;
- case "textSize":
- textSize = config.textSize();
- break;
- case "shadows":
- shadows = config.shadows();
- break;
- }
+ updateConfig();
}
@Subscribe
@@ -159,7 +201,7 @@ public class AoeWarningPlugin extends Plugin
Projectile projectile = event.getProjectile();
int projectileId = projectile.getId();
- int projectileLifetime = config.delay() + (projectile.getRemainingCycles() * 20);
+ int projectileLifetime = this.delay + (projectile.getRemainingCycles() * 20);
int ticksRemaining = projectile.getRemainingCycles() / 30;
if (!isTickTimersEnabledForProjectileID(projectileId))
{
@@ -174,7 +216,7 @@ public class AoeWarningPlugin extends Plugin
AoeProjectile aoeProjectile = new AoeProjectile(Instant.now(), targetPoint, aoeProjectileInfo, projectileLifetime, tickCycle);
projectiles.put(projectile, aoeProjectile);
- if (config.aoeNotifyAll() || isConfigEnabledForProjectileId(projectileId, true))
+ if (this.aoeNotifyAll || isConfigEnabledForProjectileId(projectileId, true))
{
notifier.notify("AoE attack detected!");
}
@@ -192,7 +234,7 @@ public class AoeWarningPlugin extends Plugin
case ObjectID.CRYSTAL_BOMB:
bombs.put(wp, new CrystalBomb(gameObject, client.getTickCount()));
- if (config.aoeNotifyAll() || config.bombDisplayNotifyEnabled())
+ if (this.aoeNotifyAll || this.configbombDisplayNotifyEnabled)
{
notifier.notify("Bomb!");
}
@@ -205,11 +247,11 @@ public class AoeWarningPlugin extends Plugin
break;
case NullObjectID.NULL_26690:
//Wintertodt Snowfall
- if (config.isWintertodtEnabled())
+ if (this.configWintertodtEnabled)
{
WintertodtSnowFall.add(wp);
- if (config.aoeNotifyAll() || config.isWintertodtNotifyEnabled())
+ if (this.aoeNotifyAll || this.configWintertodtNotifyEnabled)
{
notifier.notify("Snow Fall!");
}
@@ -236,7 +278,7 @@ public class AoeWarningPlugin extends Plugin
break;
case NullObjectID.NULL_26690:
//Wintertodt Snowfall
- if (config.isWintertodtEnabled())
+ if (this.configWintertodtEnabled)
{
WintertodtSnowFall.remove(wp);
}
@@ -256,7 +298,7 @@ public class AoeWarningPlugin extends Plugin
@Subscribe
public void onGameTick(GameTick event)
{
- if (config.LightningTrail())
+ if (this.configLightningTrail)
{
LightningTrail.clear();
for (GraphicsObject o : client.getGraphicsObjects())
@@ -265,7 +307,7 @@ public class AoeWarningPlugin extends Plugin
{
LightningTrail.add(WorldPoint.fromLocal(client, o.getLocation()));
- if (config.aoeNotifyAll() || config.LightningTrailNotifyEnabled())
+ if (this.aoeNotifyAll || this.configLightningTrailNotifyEnabled)
{
notifier.notify("Lightning!");
}
@@ -350,7 +392,7 @@ public class AoeWarningPlugin extends Plugin
return false;
}
- if (notify && config.aoeNotifyAll())
+ if (notify && this.aoeNotifyAll)
{
return true;
}
@@ -358,57 +400,110 @@ public class AoeWarningPlugin extends Plugin
switch (projectileInfo)
{
case LIZARDMAN_SHAMAN_AOE:
- return notify ? config.isShamansNotifyEnabled() : config.isShamansEnabled();
+ return notify ? this.configShamansNotifyEnabled : this.configShamansEnabled;
case CRAZY_ARCHAEOLOGIST_AOE:
- return notify ? config.isArchaeologistNotifyEnabled() : config.isArchaeologistEnabled();
+ return notify ? this.configArchaeologistNotifyEnabled : this.configArchaeologistEnabled;
case ICE_DEMON_RANGED_AOE:
case ICE_DEMON_ICE_BARRAGE_AOE:
- return notify ? config.isIceDemonNotifyEnabled() : config.isIceDemonEnabled();
+ return notify ? this.configIceDemonNotifyEnabled : this.configIceDemonEnabled;
case VASA_AWAKEN_AOE:
case VASA_RANGED_AOE:
- return notify ? config.isVasaNotifyEnabled() : config.isVasaEnabled();
+ return notify ? this.configVasaNotifyEnabled : this.configVasaEnabled;
case TEKTON_METEOR_AOE:
- return notify ? config.isTektonNotifyEnabled() : config.isTektonEnabled();
+ return notify ? this.configTektonNotifyEnabled : this.configTektonEnabled;
case VORKATH_BOMB:
case VORKATH_POISON_POOL:
case VORKATH_SPAWN:
case VORKATH_TICK_FIRE:
- return notify ? config.isVorkathNotifyEnabled() : config.isVorkathEnabled();
+ return notify ? this.configVorkathNotifyEnabled : this.configVorkathEnabled;
case VETION_LIGHTNING:
- return notify ? config.isVetionNotifyEnabled() : config.isVetionEnabled();
+ return notify ? this.configVetionNotifyEnabled : this.configVetionEnabled;
case CHAOS_FANATIC:
- return notify ? config.isChaosFanaticNotifyEnabled() : config.isChaosFanaticEnabled();
+ return notify ? this.configChaosFanaticNotifyEnabled : this.configChaosFanaticEnabled;
case GALVEK_BOMB:
case GALVEK_MINE:
- return notify ? config.isGalvekNotifyEnabled() : config.isGalvekEnabled();
+ return notify ? this.configGalvekNotifyEnabled : this.configGalvekEnabled;
case DAWN_FREEZE:
case DUSK_CEILING:
- return notify ? config.isGargBossNotifyEnabled() : config.isGargBossEnabled();
+ return notify ? this.configGargBossNotifyEnabled : this.configGargBossEnabled;
case OLM_FALLING_CRYSTAL:
case OLM_BURNING:
case OLM_FALLING_CRYSTAL_TRAIL:
case OLM_ACID_TRAIL:
case OLM_FIRE_LINE:
- return notify ? config.isOlmNotifyEnabled() : config.isOlmEnabled();
+ return notify ? this.configOlmNotifyEnabled : this.configOlmEnabled;
case CORPOREAL_BEAST:
case CORPOREAL_BEAST_DARK_CORE:
- return notify ? config.isCorpNotifyEnabled() : config.isCorpEnabled();
+ return notify ? this.configCorpNotifyEnabled : this.configCorpEnabled;
case XARPUS_POISON_AOE:
- return notify ? config.isXarpusNotifyEnabled() : config.isXarpusEnabled();
+ return notify ? this.configXarpusNotifyEnabled : this.configXarpusEnabled;
case ADDY_DRAG_POISON:
- return notify ? config.addyDragsNotifyEnabled() : config.addyDrags();
+ return notify ? this.configaddyDragsNotifyEnabled : this.configaddyDrags;
case DRAKE_BREATH:
- return notify ? config.isDrakeNotifyEnabled() : config.isDrakeEnabled();
+ return notify ? this.configDrakeNotifyEnabled : this.configDrakeEnabled;
case CERB_FIRE:
- return notify ? config.isCerbFireNotifyEnabled() : config.isCerbFireEnabled();
+ return notify ? this.configCerbFireNotifyEnabled : this.configCerbFireEnabled;
case DEMONIC_GORILLA_BOULDER:
- return notify ? config.isDemonicGorillaNotifyEnabled() : config.isDemonicGorillaEnabled();
+ return notify ? this.configDemonicGorillaNotifyEnabled : this.configDemonicGorillaEnabled;
}
return false;
}
- private void reset(boolean setConfig)
+ public void updateConfig()
+ {
+ this.aoeNotifyAll = config.aoeNotifyAll();
+ this.overlayColor = config.overlayColor();
+ this.configOutlineEnabled = config.isOutlineEnabled();
+ this.delay = config.delay();
+ this.configFadeEnabled = config.isFadeEnabled();
+ this.tickTimers = config.tickTimers();
+ this.fontStyle = config.fontStyle().getFont();
+ this.textSize = config.textSize();
+ this.shadows = config.shadows();
+ this.configShamansEnabled = config.isShamansEnabled();
+ this.configShamansNotifyEnabled = config.isShamansNotifyEnabled();
+ this.configArchaeologistEnabled = config.isArchaeologistEnabled();
+ this.configArchaeologistNotifyEnabled = config.isArchaeologistNotifyEnabled();
+ this.configIceDemonEnabled = config.isIceDemonEnabled();
+ this.configIceDemonNotifyEnabled = config.isIceDemonNotifyEnabled();
+ this.configVasaEnabled = config.isVasaEnabled();
+ this.configVasaNotifyEnabled = config.isVasaNotifyEnabled();
+ this.configTektonEnabled = config.isTektonEnabled();
+ this.configTektonNotifyEnabled = config.isTektonNotifyEnabled();
+ this.configVorkathEnabled = config.isVorkathEnabled();
+ this.configVorkathNotifyEnabled = config.isVorkathNotifyEnabled();
+ this.configGalvekEnabled = config.isGalvekEnabled();
+ this.configGalvekNotifyEnabled = config.isGalvekNotifyEnabled();
+ this.configGargBossEnabled = config.isGargBossEnabled();
+ this.configGargBossNotifyEnabled = config.isGargBossNotifyEnabled();
+ this.configVetionEnabled = config.isVetionEnabled();
+ this.configVetionNotifyEnabled = config.isVetionNotifyEnabled();
+ this.configChaosFanaticEnabled = config.isChaosFanaticEnabled();
+ this.configChaosFanaticNotifyEnabled = config.isChaosFanaticNotifyEnabled();
+ this.configOlmEnabled = config.isOlmEnabled();
+ this.configOlmNotifyEnabled = config.isOlmNotifyEnabled();
+ this.configbombDisplay = config.bombDisplay();
+ this.configbombDisplayNotifyEnabled = config.bombDisplayNotifyEnabled();
+ this.configLightningTrail = config.LightningTrail();
+ this.configLightningTrailNotifyEnabled = config.LightningTrailNotifyEnabled();
+ this.configCorpEnabled = config.isCorpEnabled();
+ this.configCorpNotifyEnabled = config.isCorpNotifyEnabled();
+ this.configWintertodtEnabled = config.isWintertodtEnabled();
+ this.configWintertodtNotifyEnabled = config.isWintertodtNotifyEnabled();
+ this.configXarpusEnabled = config.isXarpusEnabled();
+ this.configXarpusNotifyEnabled = config.isXarpusNotifyEnabled();
+ this.configaddyDrags = config.addyDrags();
+ this.configaddyDragsNotifyEnabled = config.addyDragsNotifyEnabled();
+ this.configDrakeEnabled = config.isDrakeEnabled();
+ this.configDrakeNotifyEnabled = config.isDrakeNotifyEnabled();
+ this.configCerbFireEnabled = config.isCerbFireEnabled();
+ this.configCerbFireNotifyEnabled = config.isCerbFireNotifyEnabled();
+ this.configDemonicGorillaEnabled = config.isDemonicGorillaEnabled();
+ this.configDemonicGorillaNotifyEnabled = config.isDemonicGorillaNotifyEnabled();
+ }
+
+ private void reset()
{
LightningTrail.clear();
AcidTrail.clear();
@@ -416,11 +511,5 @@ public class AoeWarningPlugin extends Plugin
WintertodtSnowFall.clear();
bombs.clear();
projectiles.clear();
- if (setConfig)
- {
- fontStyle = config.fontStyle().getFont();
- textSize = config.textSize();
- shadows = config.shadows();
- }
}
-}
\ No newline at end of file
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java
index 317f5ad04b..d51b52aee3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java
@@ -32,10 +32,10 @@ import java.awt.Polygon;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.time.Instant;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
@@ -50,6 +50,7 @@ import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
@Slf4j
+@Singleton
public class BombOverlay extends Overlay
{
@@ -81,15 +82,13 @@ public class BombOverlay extends Overlay
}
private final Client client;
- private final AoeWarningConfig config;
private final AoeWarningPlugin plugin;
@Inject
- public BombOverlay(Client client, AoeWarningPlugin plugin, AoeWarningConfig config)
+ public BombOverlay(final Client client, final AoeWarningPlugin plugin)
{
this.client = client;
this.plugin = plugin;
- this.config = config;
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
setPriority(OverlayPriority.MED);
@@ -98,7 +97,7 @@ public class BombOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (config.bombDisplay())
+ if (plugin.isConfigbombDisplay())
{
drawBombs(graphics);
}
@@ -108,10 +107,8 @@ public class BombOverlay extends Overlay
private void drawBombs(Graphics2D graphics)
//I can condense drawDangerZone into this. Ambivalent though.
{
- Iterator> it = plugin.getBombs().entrySet().iterator();
- while (it.hasNext())
+ for (Map.Entry entry : plugin.getBombs().entrySet())
{
- Map.Entry entry = it.next();
CrystalBomb bomb = entry.getValue();
drawDangerZone(graphics, bomb);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java
index 5e871dca12..0a63fa4b97 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.aoewarnings;
import java.time.Instant;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.GameObject;
@@ -33,20 +34,20 @@ import net.runelite.api.coords.WorldPoint;
@Slf4j
class CrystalBomb
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Instant plantedOn;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Instant lastClockUpdate;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int objectId;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int tickStarted;
//
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private WorldPoint worldLocation;
CrystalBomb(GameObject gameObject, int startTick)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java
index 0660c1e659..b2112f1420 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.client.ui.overlay.Overlay;
import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
@@ -36,19 +37,18 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent;
+@Singleton
class AttackStylesOverlay extends Overlay
{
private final AttackStylesPlugin plugin;
- private final AttackStylesConfig config;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- private AttackStylesOverlay(AttackStylesPlugin plugin, AttackStylesConfig config)
+ private AttackStylesOverlay(final AttackStylesPlugin plugin)
{
super(plugin);
setPosition(OverlayPosition.ABOVE_CHATBOX_RIGHT);
this.plugin = plugin;
- this.config = config;
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Attack style overlay"));
}
@@ -58,7 +58,7 @@ class AttackStylesOverlay extends Overlay
panelComponent.getChildren().clear();
boolean warnedSkillSelected = plugin.isWarnedSkillSelected();
- if (warnedSkillSelected || config.alwaysShowStyle())
+ if (warnedSkillSelected || plugin.isAlwaysShowStyle())
{
final String attackStyleString = plugin.getAttackStyle().getName();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
index db7a9ed751..776cc3cd72 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
@@ -31,6 +31,9 @@ import com.google.inject.Provides;
import java.util.HashSet;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Skill;
@@ -60,6 +63,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
description = "Show your current attack style as an overlay",
tags = {"combat", "defence", "magic", "overlay", "ranged", "strength", "warn", "pure"}
)
+@Singleton
public class AttackStylesPlugin extends Plugin
{
private int attackStyleVarbit = -1;
@@ -91,9 +95,22 @@ public class AttackStylesPlugin extends Plugin
return configManager.getConfig(AttackStylesConfig.class);
}
+ // config values
+ @Getter(AccessLevel.PACKAGE)
+ private boolean alwaysShowStyle;
+ private boolean warnForDefence;
+ private boolean warnForAttack;
+ private boolean warnForStrength;
+ private boolean warnForRanged;
+ private boolean warnForMagic;
+ private boolean hideAutoRetaliate;
+ private boolean removeWarnedStyles;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(overlay);
if (client.getGameState() == GameState.LOGGED_IN)
@@ -104,11 +121,11 @@ public class AttackStylesPlugin extends Plugin
private void start()
{
- updateWarnedSkills(config.warnForAttack(), Skill.ATTACK);
- updateWarnedSkills(config.warnForStrength(), Skill.STRENGTH);
- updateWarnedSkills(config.warnForDefence(), Skill.DEFENCE);
- updateWarnedSkills(config.warnForRanged(), Skill.RANGED);
- updateWarnedSkills(config.warnForMagic(), Skill.MAGIC);
+ updateWarnedSkills(warnForAttack, Skill.ATTACK);
+ updateWarnedSkills(warnForStrength, Skill.STRENGTH);
+ updateWarnedSkills(warnForDefence, Skill.DEFENCE);
+ updateWarnedSkills(warnForRanged, Skill.RANGED);
+ updateWarnedSkills(warnForMagic, Skill.MAGIC);
attackStyleVarbit = client.getVar(VarPlayer.ATTACK_STYLE);
equippedWeaponTypeVarbit = client.getVar(Varbits.EQUIPPED_WEAPON_TYPE);
castingModeVarbit = client.getVar(Varbits.DEFENSIVE_CASTING_MODE);
@@ -134,7 +151,7 @@ public class AttackStylesPlugin extends Plugin
return attackStyle;
}
- public boolean isWarnedSkillSelected()
+ boolean isWarnedSkillSelected()
{
return warnedSkillSelected;
}
@@ -175,7 +192,7 @@ public class AttackStylesPlugin extends Plugin
hideWidget(client.getWidget(widgetKey), widgetsToHide.get(equippedWeaponType, widgetKey));
}
}
- hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), config.hideAutoRetaliate());
+ hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), this.hideAutoRetaliate);
}
@Subscribe
@@ -183,11 +200,11 @@ public class AttackStylesPlugin extends Plugin
{
if (event.getGameState() == GameState.LOGGED_IN)
{
- updateWarnedSkills(config.warnForAttack(), Skill.ATTACK);
- updateWarnedSkills(config.warnForStrength(), Skill.STRENGTH);
- updateWarnedSkills(config.warnForDefence(), Skill.DEFENCE);
- updateWarnedSkills(config.warnForRanged(), Skill.RANGED);
- updateWarnedSkills(config.warnForMagic(), Skill.MAGIC);
+ updateWarnedSkills(this.warnForAttack, Skill.ATTACK);
+ updateWarnedSkills(this.warnForStrength, Skill.STRENGTH);
+ updateWarnedSkills(this.warnForDefence, Skill.DEFENCE);
+ updateWarnedSkills(this.warnForRanged, Skill.RANGED);
+ updateWarnedSkills(this.warnForMagic, Skill.MAGIC);
}
}
@@ -224,6 +241,8 @@ public class AttackStylesPlugin extends Plugin
{
if (event.getGroup().equals("attackIndicator"))
{
+ updateConfig();
+
boolean enabled = event.getNewValue().equals("true");
switch (event.getKey())
{
@@ -250,6 +269,18 @@ public class AttackStylesPlugin extends Plugin
}
}
+ public void updateConfig()
+ {
+ this.alwaysShowStyle = config.alwaysShowStyle();
+ this.warnForDefence = config.warnForDefence();
+ this.warnForAttack = config.warnForAttack();
+ this.warnForStrength = config.warnForStrength();
+ this.warnForRanged = config.warnForRanged();
+ this.warnForMagic = config.warnForMagic();
+ this.hideAutoRetaliate = config.hideAutoRetaliate();
+ this.removeWarnedStyles = config.removeWarnedStyles();
+ }
+
private void updateAttackStyle(int equippedWeaponType, int attackStyleIndex, int castingMode)
{
AttackStyle[] attackStyles = WeaponType.getWeaponType(equippedWeaponType).getAttackStyles();
@@ -298,7 +329,7 @@ public class AttackStylesPlugin extends Plugin
}
}
}
- hideWarnedStyles(config.removeWarnedStyles());
+ hideWarnedStyles(this.removeWarnedStyles);
}
private void hideWarnedStyles(boolean enabled)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java
index 13398e22f7..5a9fd695fd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java
@@ -58,7 +58,7 @@ class BankCalculation
Varbits.BANK_TAB_NINE_COUNT
);
- private final BankConfig config;
+ private final BankPlugin plugin;
private final ItemManager itemManager;
private final Client client;
@@ -72,10 +72,10 @@ class BankCalculation
private long haPrice;
@Inject
- BankCalculation(ItemManager itemManager, BankConfig config, Client client)
+ BankCalculation(ItemManager itemManager, BankPlugin plugin, Client client)
{
this.itemManager = itemManager;
- this.config = config;
+ this.plugin = plugin;
this.client = client;
}
@@ -142,12 +142,12 @@ class BankCalculation
continue;
}
- if (config.showGE())
+ if (plugin.isShowGE())
{
itemIds.add(item.getId());
}
- if (config.showHA())
+ if (plugin.isShowHA())
{
long alchValue = itemManager.getAlchValue(item.getId());
@@ -159,7 +159,7 @@ class BankCalculation
}
// Now do the calculations
- if (config.showGE() && !itemIds.isEmpty())
+ if (plugin.isShowGE() && !itemIds.isEmpty())
{
for (Item item : items)
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
index f30ba0115f..2cf7e2b746 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
@@ -28,8 +28,12 @@ package net.runelite.client.plugins.bank;
import com.google.inject.Provides;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.MenuEntry;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.MenuShouldLeftClick;
import net.runelite.api.events.ScriptCallbackEvent;
@@ -46,6 +50,7 @@ import net.runelite.client.util.StackFormatter;
description = "Modifications to the banking interface",
tags = {"grand", "exchange", "high", "alchemy", "prices", "deposit"}
)
+@Singleton
public class BankPlugin extends Plugin
{
private static final String DEPOSIT_WORN = "Deposit worn items";
@@ -75,6 +80,21 @@ public class BankPlugin extends Plugin
return configManager.getConfig(BankConfig.class);
}
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showGE;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showHA;
+ private boolean showExact;
+ private boolean rightClickBankInventory;
+ private boolean rightClickBankEquip;
+ private boolean rightClickBankLoot;
+
+ @Override
+ protected void startUp() throws Exception
+ {
+ updateConfig();
+ }
+
@Override
protected void shutDown()
{
@@ -94,9 +114,9 @@ public class BankPlugin extends Plugin
MenuEntry[] menuEntries = client.getMenuEntries();
for (MenuEntry entry : menuEntries)
{
- if ((entry.getOption().equals(DEPOSIT_WORN) && config.rightClickBankEquip())
- || (entry.getOption().equals(DEPOSIT_INVENTORY) && config.rightClickBankInventory())
- || (entry.getOption().equals(DEPOSIT_LOOT) && config.rightClickBankLoot()))
+ if ((entry.getOption().equals(DEPOSIT_WORN) && this.rightClickBankEquip)
+ || (entry.getOption().equals(DEPOSIT_INVENTORY) && this.rightClickBankInventory)
+ || (entry.getOption().equals(DEPOSIT_LOOT) && this.rightClickBankLoot))
{
event.setForceRightClick(true);
return;
@@ -107,9 +127,9 @@ public class BankPlugin extends Plugin
@Subscribe
public void onMenuEntryAdded(MenuEntryAdded event)
{
- if ((event.getOption().equals(DEPOSIT_WORN) && config.rightClickBankEquip())
- || (event.getOption().equals(DEPOSIT_INVENTORY) && config.rightClickBankInventory())
- || (event.getOption().equals(DEPOSIT_LOOT) && config.rightClickBankLoot()))
+ if ((event.getOption().equals(DEPOSIT_WORN) && this.rightClickBankEquip)
+ || (event.getOption().equals(DEPOSIT_INVENTORY) && this.rightClickBankInventory)
+ || (event.getOption().equals(DEPOSIT_LOOT) && this.rightClickBankLoot))
{
forceRightClickFlag = true;
}
@@ -128,16 +148,16 @@ public class BankPlugin extends Plugin
long gePrice = bankCalculation.getGePrice();
long haPrice = bankCalculation.getHaPrice();
- if (config.showGE() && gePrice != 0)
+ if (this.showGE && gePrice != 0)
{
strCurrentTab += " (";
- if (config.showHA())
+ if (this.showHA)
{
strCurrentTab += "EX: ";
}
- if (config.showExact())
+ if (this.showExact)
{
strCurrentTab += StackFormatter.formatNumber(gePrice) + ")";
}
@@ -147,16 +167,16 @@ public class BankPlugin extends Plugin
}
}
- if (config.showHA() && haPrice != 0)
+ if (this.showHA && haPrice != 0)
{
strCurrentTab += " (";
- if (config.showGE())
+ if (this.showGE)
{
strCurrentTab += "HA: ";
}
- if (config.showExact())
+ if (this.showExact)
{
strCurrentTab += StackFormatter.formatNumber(haPrice) + ")";
}
@@ -171,4 +191,25 @@ public class BankPlugin extends Plugin
stringStack[stringStackSize - 1] += strCurrentTab;
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("bank"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ public void updateConfig()
+ {
+ this.showGE = config.showGE();
+ this.showHA = config.showHA();
+ this.showExact = config.showExact();
+ this.rightClickBankInventory = config.rightClickBankInventory();
+ this.rightClickBankEquip = config.rightClickBankEquip();
+ this.rightClickBankLoot = config.rightClickBankLoot();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
index d593b9f0aa..9b3d72fa53 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
@@ -36,6 +36,7 @@ import java.util.Collection;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.InventoryID;
import net.runelite.api.Item;
@@ -82,6 +83,7 @@ import net.runelite.client.util.Text;
tags = {"searching", "tagging"}
)
@PluginDependency(ClueScrollPlugin.class)
+@Singleton
public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyListener
{
public static final String CONFIG_GROUP = "banktags";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java
index 75c9668cf7..4278c295b4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java
@@ -8,7 +8,6 @@ import net.runelite.client.config.ConfigItem;
public interface BanListConfig extends Config
{
-
@ConfigItem(
keyName = "bannedPlayers",
name = "Manual Scammer List",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java
index 92371331cc..c382e703b7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java
@@ -31,6 +31,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ChatMessageType;
import net.runelite.api.ClanMember;
@@ -67,7 +68,7 @@ import okhttp3.Response;
type = PluginType.UTILITY,
enabledByDefault = false
)
-
+@Singleton
@Slf4j
public class BanListPlugin extends Plugin
{
@@ -94,9 +95,16 @@ public class BanListPlugin extends Plugin
return configManager.getConfig(BanListConfig.class);
}
+ // save config values
+ private boolean enableWDR;
+ private boolean enableRuneWatch;
+ private boolean highlightInClan;
+ private boolean highlightInTrade;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
manualBans.addAll(Text.fromCSV(config.getBannedPlayers()));
fetchFromWebsites();
}
@@ -128,6 +136,14 @@ public class BanListPlugin extends Plugin
}
}
+ public void updateConfig()
+ {
+ this.enableWDR = config.enableWDR();
+ this.enableRuneWatch = config.enableRuneWatch();
+ this.highlightInClan = config.highlightInClan();
+ this.highlightInTrade = config.highlightInTrade();
+ }
+
/**
* Event to keep making sure player names are highlighted red in clan chat, since the red name goes away frequently
*/
@@ -138,7 +154,7 @@ public class BanListPlugin extends Plugin
|| client.getWidget(WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN) != null
|| client.getViewportWidget() == null
|| client.getWidget(WidgetInfo.CLAN_CHAT) == null
- || !config.highlightInClan())
+ || !this.highlightInClan)
{
return;
}
@@ -163,7 +179,7 @@ public class BanListPlugin extends Plugin
if (scamList != null)
{
sendWarning(Text.standardize(member.getUsername()), scamList);
- if (config.highlightInClan())
+ if (this.highlightInClan)
{
highlightRedInCC();
}
@@ -172,7 +188,7 @@ public class BanListPlugin extends Plugin
if (toxicList != null)
{
sendWarning(Text.standardize(member.getUsername()), toxicList);
- if (config.highlightInClan())
+ if (this.highlightInClan)
{
highlightRedInCC();
}
@@ -185,7 +201,7 @@ public class BanListPlugin extends Plugin
@Subscribe
public void onWidgetLoaded(WidgetLoaded widgetLoaded)
{
- if (config.highlightInTrade())
+ if (this.highlightInTrade)
{
if (widgetLoaded.getGroupId() == 335)
{ //if trading window was loaded
@@ -211,7 +227,7 @@ public class BanListPlugin extends Plugin
*/
private ListType checkScamList(String nameToBeChecked)
{
- if (wdrScamArrayList.size() > 0 && config.enableWDR())
+ if (wdrScamArrayList.size() > 0 && this.enableWDR)
{
if (wdrScamArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase))
{
@@ -219,7 +235,7 @@ public class BanListPlugin extends Plugin
}
}
- if (runeWatchArrayList.size() > 0 && config.enableRuneWatch())
+ if (runeWatchArrayList.size() > 0 && this.enableRuneWatch)
{
if (runeWatchArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase))
{
@@ -241,7 +257,7 @@ public class BanListPlugin extends Plugin
private ListType checkToxicList(String nameToBeChecked)
{
- if (wdrToxicArrayList.size() > 0 && config.enableWDR())
+ if (wdrToxicArrayList.size() > 0 && this.enableWDR)
{
if (wdrToxicArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase))
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java
index ecfb8251ce..96aafeef5e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java
@@ -27,6 +27,7 @@
package net.runelite.client.plugins.barbarianassault;
import com.google.common.collect.ImmutableMap;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.Point;
@@ -46,7 +47,7 @@ import java.awt.Stroke;
import java.awt.BasicStroke;
import java.util.Map;
-
+@Singleton
class AboveSceneOverlay extends Overlay
{
private static final int HEALTH_BAR_HEIGHT = 20;
@@ -62,18 +63,16 @@ class AboveSceneOverlay extends Overlay
private final Client client;
private final BarbarianAssaultPlugin game;
- private final BarbarianAssaultConfig config;
@Inject
- private AboveSceneOverlay(Client client, BarbarianAssaultPlugin game, BarbarianAssaultConfig config)
+ private AboveSceneOverlay(final Client client, final BarbarianAssaultPlugin game)
{
super(game);
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
this.client = client;
this.game = game;
- this.config = config;
}
@Override
@@ -88,11 +87,11 @@ class AboveSceneOverlay extends Overlay
{
case HEALER:
- if (config.showTeammateHealthbars())
+ if (game.isShowTeammateHealthbars())
{
renderHealthBars(graphics);
}
- if (config.healerCodes())
+ if (game.isHealerCodes())
{
renderHealerCodes(graphics);
}
@@ -100,7 +99,7 @@ class AboveSceneOverlay extends Overlay
case COLLECTOR:
- if (config.highlightCollectorEggs())
+ if (game.isHighlightCollectorEggs())
{
renderEggs(graphics);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java
index 6c140ef4b3..b89bc86148 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Point;
import net.runelite.api.widgets.Widget;
@@ -43,7 +44,7 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.util.ImageUtil;
-
+@Singleton
class AboveWidgetsOverlay extends Overlay
{
private static final int OFFSET_X_TEXT_QUANTITY = 0;
@@ -51,18 +52,15 @@ class AboveWidgetsOverlay extends Overlay
private final Client client;
private final BarbarianAssaultPlugin game;
- private final BarbarianAssaultConfig config;
-
@Inject
- private AboveWidgetsOverlay(Client client, BarbarianAssaultPlugin game, BarbarianAssaultConfig config)
+ private AboveWidgetsOverlay(final Client client, final BarbarianAssaultPlugin game)
{
super(game);
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_WIDGETS);
this.client = client;
this.game = game;
- this.config = config;
}
@Override
@@ -75,7 +73,7 @@ class AboveWidgetsOverlay extends Overlay
Role role = game.getRole();
- if (config.showTimer())
+ if (game.isShowTimer())
{
renderTimer(graphics, role);
}
@@ -83,23 +81,23 @@ class AboveWidgetsOverlay extends Overlay
switch (role)
{
case ATTACKER:
- if (config.highlightArrows())
+ if (game.isHighlightArrows())
{
- renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), config.highlightArrowColor());
+ renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), game.getHighlightArrowColor());
}
break;
case DEFENDER:
- if (config.highlightBait())
+ if (game.isHighlightBait())
{
- renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), config.highlightBaitColor());
+ renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), game.getHighlightBaitColor());
}
break;
case HEALER:
- if (config.highlightPoison())
+ if (game.isHighlightPoison())
{
- renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), config.highlightPoisonColor());
+ renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), game.getHighlightPoisonColor());
}
}
return null;
@@ -115,11 +113,11 @@ class AboveWidgetsOverlay extends Overlay
return;
}
- if (role == Role.COLLECTOR && config.showEggCountOverlay() && game.getWave() != null)
+ if (role == Role.COLLECTOR && game.isShowEggCountOverlay() && game.getWave() != null)
{
roleText.setText("(" + game.getWave().getCollectedEggCount() + ") " + formatClock());
}
- else if (role == Role.HEALER && config.showHpCountOverlay() && game.getWave() != null)
+ else if (role == Role.HEALER && game.isShowHpCountOverlay() && game.getWave() != null)
{
roleText.setText("(" + game.getWave().getHpHealed() + ") " + formatClock());
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java
index 0f8f843fd8..10e56c8ac8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java
@@ -26,6 +26,7 @@
package net.runelite.client.plugins.barbarianassault;
import com.google.common.collect.Sets;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.client.menus.ComparableEntry;
@@ -40,19 +41,19 @@ class BarbarianAssaultMenu
{
private final MenuManager menuManager;
private final BarbarianAssaultPlugin game;
- private final BarbarianAssaultConfig config;
private final ArrayList tracker = new ArrayList<>();
- @Getter @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private boolean hornUpdated = false;
- @Getter @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private boolean rebuildForced = false;
@Inject
- BarbarianAssaultMenu(MenuManager menuManager, BarbarianAssaultPlugin game, BarbarianAssaultConfig config)
+ BarbarianAssaultMenu(final MenuManager menuManager, final BarbarianAssaultPlugin game)
{
this.menuManager = menuManager;
this.game = game;
- this.config = config;
}
private boolean isHornOptionHidden(String option)
@@ -100,24 +101,24 @@ class BarbarianAssaultMenu
case TELL_BLUE_ATTACKER_HORN:
case TELL_GREEN_ATTACKER_HORN:
case TELL_RED_ATTACKER_HORN:
- return ((role == Role.ATTACKER && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls();
+ return ((role == Role.ATTACKER && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls();
case ATTACK_PENANCE_FIGHTER:
case ATTACK_PENANCE_RANGER:
case GET_SPIKES_PETRIFIED_MUSHROOM:
case TAKE_ATTACKER_ITEM_MACHINE:
- return (role != Role.ATTACKER && role != null) && config.removeUnusedMenus();
+ return (role != Role.ATTACKER && role != null) && game.isRemoveUnusedMenus();
// Defender role Options
case TELL_MEAT_DEFENDER_HORN:
case TELL_TOFU_DEFENDER_HORN:
case TELL_WORMS_DEFENDER_HORN:
- return ((role == Role.DEFENDER && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls();
+ return ((role == Role.DEFENDER && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls();
case BLOCK_PENANCE_CAVE:
- return ((role != Role.DEFENDER && role != null) && config.removeUnusedMenus())
- || (role == Role.DEFENDER && config.removePenanceCave());
+ return ((role != Role.DEFENDER && role != null) && game.isRemoveUnusedMenus())
+ || (role == Role.DEFENDER && game.isRemovePenanceCave());
case DUNK_LAVA_CRATER:
case FIX:
@@ -125,7 +126,7 @@ class BarbarianAssaultMenu
case TAKE_DEFENDER_ITEM_MACHINE:
case TAKE_HAMMER:
case TAKE_LOGS:
- return (role != Role.DEFENDER && role != null) && config.removeUnusedMenus();
+ return (role != Role.DEFENDER && role != null) && game.isRemoveUnusedMenus();
// Collector role options
@@ -133,7 +134,7 @@ class BarbarianAssaultMenu
case TELL_AGGRESSIVE_COLLECTOR_HORN:
case TELL_CONTROLLED_COLLECTOR_HORN:
case TELL_DEFENSIVE_COLLECTOR_HORN:
- return ((role == Role.COLLECTOR && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls();
+ return ((role == Role.COLLECTOR && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls();
case CONVERT_COLLECTOR_CONVERTER:
case LOAD_EGG_HOPPER:
@@ -141,40 +142,40 @@ class BarbarianAssaultMenu
case TAKE_GREEN_EGG:
case TAKE_RED_EGG:
case TAKE_YELLOW_EGG:
- return (role != Role.COLLECTOR && role != null) && config.removeUnusedMenus();
+ return (role != Role.COLLECTOR && role != null) && game.isRemoveUnusedMenus();
// Healer role options
case TELL_CRACKERS_HEALER_HORN:
case TELL_TOFU_HEALER_HORN:
case TELL_WORMS_HEALER_HORN:
- return ((role == Role.HEALER && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls();
+ return ((role == Role.HEALER && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls();
case DUNK_POISON_CRATER:
case STOCK_UP_HEALER_ITEM_MACHINE:
case TAKE_HEALER_ITEM_MACHINE:
case TAKE_FROM_HEALER_SPRING:
case DRINK_FROM_HEALER_SPRING:
- return (role != Role.HEALER && role != null) && config.removeUnusedMenus();
+ return (role != Role.HEALER && role != null) && game.isRemoveUnusedMenus();
case USE_VIAL_GROUND:
case USE_VIAL_ITEM:
case USE_VIAL_NPC:
case USE_VIAL_WIDGET:
- return role == Role.HEALER && config.removeUnusedMenus();
+ return role == Role.HEALER && game.isRemoveUnusedMenus();
// Any role options
case DROP_HORN:
case EXAMINE_HORN:
case USE_HORN:
- return config.removeIncorrectCalls();
+ return game.isRemoveIncorrectCalls();
case MEDIC_HORN:
- return config.removeIncorrectCalls() && !hornUpdated;
+ return game.isRemoveIncorrectCalls() && !hornUpdated;
default:
- return role != null && config.removeUnusedMenus();
+ return role != null && game.isRemoveUnusedMenus();
}
});
@@ -189,15 +190,15 @@ class BarbarianAssaultMenu
void enableSwaps()
{
- if (config.swapLadder())
+ if (game.isSwapLadder())
{
menuManager.addSwap("climb-down", "ladder", "quick-start", "ladder");
}
- if (config.swapCollectorBag())
+ if (game.isSwapCollectorBag())
{
menuManager.addSwap("look-in", "collection bag", "empty", "collection bag");
}
- if (config.swapDestroyEggs())
+ if (game.isSwapDestroyEggs())
{
menuManager.addSwap("use", "blue egg", "destroy", "blue egg");
menuManager.addSwap("use", "green egg", "destroy", "green egg");
@@ -207,17 +208,17 @@ class BarbarianAssaultMenu
void disableSwaps(boolean force)
{
- if (!config.swapLadder() || force)
+ if (!game.isSwapLadder() || force)
{
menuManager.removeSwap("climb-down", "ladder", "quick-start", "ladder");
}
- if (!config.swapCollectorBag() || force)
+ if (!game.isSwapCollectorBag() || force)
{
menuManager.removeSwap("look-in", "collection bag", "empty", "collection bag");
}
- if (!config.swapDestroyEggs() || force)
+ if (!game.isSwapDestroyEggs() || force)
{
menuManager.removeSwap("use", "blue egg", "destroy", "blue egg");
menuManager.removeSwap("use", "green egg", "destroy", "green egg");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
index be97a5755c..241ea3bb0b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
@@ -30,6 +30,7 @@ package net.runelite.client.plugins.barbarianassault;
import com.google.common.collect.ImmutableList;
import com.google.inject.Provides;
+import java.awt.Color;
import java.awt.Font;
import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage;
@@ -42,6 +43,8 @@ import java.util.Map;
import java.util.Objects;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@@ -108,6 +111,7 @@ import org.apache.commons.lang3.StringUtils;
tags = {"minigame", "overlay", "timer"},
type = PluginType.PVM // don't remove this, added this because our barbarian assault plugin is big time modified
)
+@Singleton
public class BarbarianAssaultPlugin extends Plugin implements KeyListener
{
private static final String ENDGAME_REWARD_NEEDLE_TEXT = "
5";
@@ -241,16 +245,71 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
private String poisonUsed = null;
-
@Provides
BarbarianAssaultConfig provideConfig(ConfigManager configManager)
{
return configManager.getConfig(BarbarianAssaultConfig.class);
}
+ // save config values
+ @Getter(AccessLevel.PACKAGE)
+ private boolean swapLadder;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showTimer;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean removeIncorrectCalls;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean removeUnusedMenus;
+ private boolean prayerMetronome;
+ private int prayerMetronomeVolume;
+ private boolean showDeathTimes;
+ private DeathTimesMode showDeathTimesMode;
+ private boolean waveTimes;
+ private boolean showTotalRewards;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean highlightArrows;
+ @Getter(AccessLevel.PACKAGE)
+ private Color highlightArrowColor;
+ private boolean removeIncorrectAttackStyles;
+ private boolean tagging;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean highlightBait;
+ @Getter(AccessLevel.PACKAGE)
+ private Color highlightBaitColor;
+ private boolean showDefTimer;
+ private boolean deprioritizeBait;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean removePenanceCave;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean highlightPoison;
+ @Getter(AccessLevel.PACKAGE)
+ private Color highlightPoisonColor;
+ private boolean highlightNotification;
+ private Color highlightNotificationColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showHpCountOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showTeammateHealthbars;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean healerCodes;
+ private boolean healerMenuOption;
+ private boolean shiftOverstock;
+ private boolean controlHealer;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean swapCollectorBag;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean swapDestroyEggs;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean highlightCollectorEggs;
+ private boolean deprioritizeIncorrectEggs;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showEggCountOverlay;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
font = FontManager.getRunescapeFont().deriveFont(Font.BOLD, 24);
torsoImage = itemManager.getImage(ItemID.FIGHTER_TORSO);
clockImage = ImageUtil.getResourceStreamFromClass(getClass(), "clock.png");
@@ -329,10 +388,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
return;
}
+ updateConfig();
+
switch (configChanged.getKey())
{
case "showTimer":
- if (!config.showTimer())
+ if (!this.showTimer)
{
showRoleSprite();
}
@@ -352,7 +413,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
break;
case "showDefTimer":
- if (config.showDefTimer() && getRole() == Role.DEFENDER)
+ if (this.showDefTimer && getRole() == Role.DEFENDER)
{
addTickTimer();
}
@@ -364,9 +425,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
case "showDeathTimes":
case "showDeathTimesMode":
- if (config.showDeathTimes()
- && (config.showDeathTimesMode() == DeathTimesMode.INFO_BOX
- || config.showDeathTimesMode() == DeathTimesMode.BOTH))
+ if (this.showDeathTimes
+ && (this.showDeathTimesMode == DeathTimesMode.INFO_BOX
+ || this.showDeathTimesMode == DeathTimesMode.BOTH))
{
addAllDeathTimes();
}
@@ -383,7 +444,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
break;
case "removeIncorrectAttackStyles":
- if (!config.removeIncorrectAttackStyles())
+ if (!this.removeIncorrectAttackStyles)
{
clientThread.invoke(this::showAllStyles);
}
@@ -391,6 +452,44 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
}
}
+ public void updateConfig()
+ {
+ this.swapLadder = config.swapLadder();
+ this.showTimer = config.showTimer();
+ this.removeIncorrectCalls = config.removeIncorrectCalls();
+ this.removeUnusedMenus = config.removeUnusedMenus();
+ this.prayerMetronome = config.prayerMetronome();
+ this.prayerMetronomeVolume = config.prayerMetronomeVolume();
+ this.showDeathTimes = config.showDeathTimes();
+ this.showDeathTimesMode = config.showDeathTimesMode();
+ this.waveTimes = config.waveTimes();
+ this.showTotalRewards = config.showTotalRewards();
+ this.highlightArrows = config.highlightArrows();
+ this.highlightArrowColor = config.highlightArrowColor();
+ this.removeIncorrectAttackStyles = config.removeIncorrectAttackStyles();
+ this.tagging = config.tagging();
+ this.highlightBait = config.highlightBait();
+ this.highlightBaitColor = config.highlightBaitColor();
+ this.showDefTimer = config.showDefTimer();
+ this.deprioritizeBait = config.deprioritizeBait();
+ this.removePenanceCave = config.removePenanceCave();
+ this.highlightPoison = config.highlightPoison();
+ this.highlightPoisonColor = config.highlightPoisonColor();
+ this.highlightNotification = config.highlightNotification();
+ this.highlightNotificationColor = config.highlightNotificationColor();
+ this.showHpCountOverlay = config.showHpCountOverlay();
+ this.showTeammateHealthbars = config.showTeammateHealthbars();
+ this.healerCodes = config.healerCodes();
+ this.healerMenuOption = config.healerMenuOption();
+ this.shiftOverstock = config.shiftOverstock();
+ this.controlHealer = config.controlHealer();
+ this.swapCollectorBag = config.swapCollectorBag();
+ this.swapDestroyEggs = config.swapDestroyEggs();
+ this.highlightCollectorEggs = config.highlightCollectorEggs();
+ this.deprioritizeIncorrectEggs = config.deprioritizeIncorrectEggs();
+ this.showEggCountOverlay = config.showEggCountOverlay();
+ }
+
@Subscribe
public void onWidgetLoaded(WidgetLoaded event)
{
@@ -408,7 +507,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
Widget pointsWidget = client.getWidget(WidgetInfo.BA_REWARD_TEXT);
if (!rewardWidget.getText().contains(ENDGAME_REWARD_NEEDLE_TEXT))
{
- if (config.showTotalRewards() && pointsWidget != null)
+ if (this.showTotalRewards && pointsWidget != null)
{
// The wave will be null if the plugin is disabled mid game, but
// the wave points will still be accurate if it is re-enabled
@@ -433,7 +532,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
{
announceGameTime();
- if (config.showTotalRewards() && scorecard != null && scorecard.getNumberOfWaves() == 9)
+ if (this.showTotalRewards && scorecard != null && scorecard.getNumberOfWaves() == 9)
{
announce(scorecard.getGameSummary());
}
@@ -496,11 +595,11 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
wave.setHpHealed(wave.getHpHealed() + health);
}
}
- else if (message.contains("the wrong type of poisoned food to use") && config.highlightNotification())
+ else if (message.contains("the wrong type of poisoned food to use") && this.highlightNotification)
{
final MessageNode messageNode = chatMessage.getMessageNode();
final String nodeValue = Text.removeTags(messageNode.getValue());
- messageNode.setValue(ColorUtil.wrapWithColorTag(nodeValue, config.highlightNotificationColor()));
+ messageNode.setValue(ColorUtil.wrapWithColorTag(nodeValue, this.highlightNotificationColor));
chatMessageManager.update(messageNode);
}
else if (message.startsWith("All of the Penance"))
@@ -528,9 +627,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
break;
}
- if (config.showDeathTimes() && wave != null
- && (config.showDeathTimesMode() == DeathTimesMode.CHAT_BOX
- || config.showDeathTimesMode() == DeathTimesMode.BOTH))
+ if (this.showDeathTimes && wave != null
+ && (this.showDeathTimesMode == DeathTimesMode.CHAT_BOX
+ || this.showDeathTimesMode == DeathTimesMode.BOTH))
{
final MessageNode node = chatMessage.getMessageNode();
final String nodeValue = Text.removeTags(node.getValue());
@@ -635,9 +734,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
tickCounter.setCount(tickNum);
}
- if (config.prayerMetronome() && isAnyPrayerActive())
+ if (this.prayerMetronome && isAnyPrayerActive())
{
- for (int i = 0; i < config.prayerMetronomeVolume(); i++)
+ for (int i = 0; i < this.prayerMetronomeVolume; i++)
{
client.playSoundEffect(SoundEffectID.GE_INCREMENT_PLOP);
}
@@ -821,7 +920,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
// This doesn't have to be done in BeforeRender. And although it is
// inefficient, it's only being done while in the instance. Will
// likely be changed in the future
- if (getRole() == Role.ATTACKER && config.removeIncorrectAttackStyles())
+ if (getRole() == Role.ATTACKER && this.removeIncorrectAttackStyles)
{
Widget weapon = client.getWidget(WidgetInfo.COMBAT_WEAPON);
@@ -891,7 +990,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
switch (getRole())
{
case ATTACKER:
- if (config.tagging() && option.equals("attack") && (target.startsWith("penance fighter") || target.startsWith("penance ranger")))
+ if (this.tagging && option.equals("attack") && (target.startsWith("penance fighter") || target.startsWith("penance ranger")))
{
String tag = StringUtils.substringBefore(entry.getTarget(), ")");
@@ -932,7 +1031,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
priority.add(entry);
continue;
}
- else if (config.deprioritizeIncorrectEggs()
+ else if (this.deprioritizeIncorrectEggs
&& option.equals("take")
&& (target.equals("blue egg") || target.equals("green egg") || target.equals("red egg")))
{
@@ -954,7 +1053,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
priority.add(entry);
continue;
}
- else if (config.deprioritizeBait()
+ else if (this.deprioritizeBait
&& option.equals("take")
&& (target.equals("tofu") || target.equals("crackers") || target.equals("worms")))
{
@@ -963,7 +1062,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
break;
case HEALER:
- if (config.healerMenuOption() && target.contains("penance healer") && healers.containsKey(identifier))
+ if (this.healerMenuOption && target.contains("penance healer") && healers.containsKey(identifier))
{
String tag = StringUtils.substringBefore(entry.getTarget(), " (");
int time = healers.get(identifier).timeToPoison();
@@ -978,17 +1077,17 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
if ((target.startsWith("poisoned meat ->") || target.startsWith("poisoned tofu ->") || target.startsWith("poisoned worms ->")))
{
// Poison should only be used on healers
- if (config.removeUnusedMenus() && !target.contains("penance healer"))
+ if (this.removeUnusedMenus && !target.contains("penance healer"))
{
continue;
}
- else if (config.controlHealer() && controlDown && identifier == lastHealerPoisoned && target.contains("penance healer"))
+ else if (this.controlHealer && controlDown && identifier == lastHealerPoisoned && target.contains("penance healer"))
{
selected.add(entry);
continue;
}
}
- else if (config.shiftOverstock() && target.equals("healer item machine") && shiftDown)
+ else if (this.shiftOverstock && target.equals("healer item machine") && shiftDown)
{
if (option.contains(listen))
{
@@ -996,7 +1095,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
continue;
}
}
- else if (config.removeUnusedMenus())
+ else if (this.removeUnusedMenus)
{
// Vials that are empty should only be used on spring
if (target.startsWith("healing vial ->") && !target.endsWith("healer spring"))
@@ -1312,12 +1411,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
private void validateWidgets()
{
- if (!config.showTimer())
+ if (!this.showTimer)
{
showRoleSprite();
}
- if (config.showDefTimer() && getRole() == Role.DEFENDER)
+ if (this.showDefTimer && getRole() == Role.DEFENDER)
{
addTickTimer();
}
@@ -1326,9 +1425,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
removeTickTimer();
}
- if (config.showDeathTimes()
- && (config.showDeathTimesMode() == DeathTimesMode.INFO_BOX
- || config.showDeathTimesMode() == DeathTimesMode.BOTH))
+ if (this.showDeathTimes
+ && (this.showDeathTimesMode == DeathTimesMode.INFO_BOX
+ || this.showDeathTimesMode == DeathTimesMode.BOTH))
{
addAllDeathTimes();
}
@@ -1388,7 +1487,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
deathTimes.add(box);
- if (config.showDeathTimes() && (config.showDeathTimesMode() == DeathTimesMode.INFO_BOX || config.showDeathTimesMode() == DeathTimesMode.BOTH))
+ if (this.showDeathTimes && (this.showDeathTimesMode == DeathTimesMode.INFO_BOX || this.showDeathTimesMode == DeathTimesMode.BOTH))
{
infoBoxManager.addInfoBox(box);
}
@@ -1454,7 +1553,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
private void announceWaveTime()
{
- if (config.waveTimes() && wave != null)
+ if (this.waveTimes && wave != null)
{
announceTime("Wave " + getStage() + " duration: ", wave.getWaveTimer().getElapsedTimeFormatted());
}
@@ -1462,7 +1561,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
private void announceGameTime()
{
- if (config.waveTimes() && gameTimer != null)
+ if (this.waveTimes && gameTimer != null)
{
announceTime("Game finished, duration: ", gameTimer.getElapsedTimeFormatted());
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java
index e33c798a83..2e2f6635e1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java
@@ -35,7 +35,7 @@ import net.runelite.client.chat.ChatMessageBuilder;
import net.runelite.client.eventbus.Subscribe;
-@Getter
+@Getter(AccessLevel.PACKAGE)
public class Scorecard
{
private BarbarianAssaultPlugin game;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java
index 69347915a6..18e9077e38 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java
@@ -24,6 +24,7 @@
*/
package net.runelite.client.plugins.barbarianassault;
+import lombok.AccessLevel;
import lombok.Getter;
import java.time.Duration;
@@ -33,7 +34,7 @@ import java.time.format.DateTimeFormatter;
class Timer
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final Instant startTime;
Timer()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java
index 8efa4fe917..b3261d53c3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java
@@ -26,12 +26,14 @@
package net.runelite.client.plugins.barbarianassault;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.overlay.infobox.InfoBox;
import java.awt.Color;
import java.awt.image.BufferedImage;
+@EqualsAndHashCode(callSuper = true)
@Data
public class TimerBox extends InfoBox
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java
index a392312b75..feee859d9a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java
@@ -37,7 +37,6 @@ import net.runelite.client.chat.ChatMessageBuilder;
import java.awt.Color;
-
@Data
public class Wave
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java
index a72d2dfccf..f732d6bd07 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.api.Varbits;
@@ -43,13 +44,14 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.util.ColorUtil;
+@Singleton
public class BarrowsBrotherSlainOverlay extends Overlay
{
private final Client client;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- private BarrowsBrotherSlainOverlay(BarrowsPlugin plugin, Client client)
+ private BarrowsBrotherSlainOverlay(final BarrowsPlugin plugin, final Client client)
{
super(plugin);
setPosition(OverlayPosition.TOP_LEFT);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java
index 6b2f3edab4..c2053439e1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java
@@ -24,6 +24,7 @@
*/
package net.runelite.client.plugins.barrows;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.runelite.api.Varbits;
@@ -39,10 +40,10 @@ public enum BarrowsBrothers
TORAG("Torag", new WorldPoint(3553, 3283, 0), Varbits.BARROWS_KILLED_TORAG),
VERAC("Verac", new WorldPoint(3557, 3298, 0), Varbits.BARROWS_KILLED_VERAC);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final String name;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final WorldPoint location;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final Varbits killedVarbit;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
index 8e668d1697..12b3494af7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.GameObject;
import net.runelite.api.NPC;
@@ -44,22 +45,21 @@ import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
+@Singleton
class BarrowsOverlay extends Overlay
{
private static final int MAX_DISTANCE = 2350;
private final Client client;
private final BarrowsPlugin plugin;
- private final BarrowsConfig config;
@Inject
- private BarrowsOverlay(Client client, BarrowsPlugin plugin, BarrowsConfig config)
+ private BarrowsOverlay(final Client client, final BarrowsPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_WIDGETS);
this.client = client;
this.plugin = plugin;
- this.config = config;
}
@Override
@@ -71,7 +71,7 @@ class BarrowsOverlay extends Overlay
Widget puzzleAnswer = plugin.getPuzzleAnswer();
// tunnels are only on z=0
- if (!plugin.getWalls().isEmpty() && client.getPlane() == 0 && config.showMinimap())
+ if (!plugin.getWalls().isEmpty() && client.getPlane() == 0 && plugin.isShowMinimap())
{
// NPC dots
graphics.setColor(npcColor);
@@ -117,12 +117,12 @@ class BarrowsOverlay extends Overlay
graphics.setColor(playerColor);
graphics.fillRect(local.getMinimapLocation().getX(), local.getMinimapLocation().getY(), 3, 3);
}
- else if (config.showBrotherLoc())
+ else if (plugin.isShowBrotherLoc())
{
renderBarrowsBrothers(graphics);
}
- if (puzzleAnswer != null && config.showPuzzleAnswer() && !puzzleAnswer.isHidden())
+ if (puzzleAnswer != null && plugin.isShowPuzzleAnswer() && !puzzleAnswer.isHidden())
{
Rectangle answerRect = puzzleAnswer.getBounds();
graphics.setColor(Color.GREEN);
@@ -230,11 +230,11 @@ class BarrowsOverlay extends Overlay
if (client.getVar(brother.getKilledVarbit()) > 0)
{
- graphics.setColor(config.deadBrotherLocColor());
+ graphics.setColor(plugin.getDeadBrotherLocColor());
}
else
{
- graphics.setColor(config.brotherLocColor());
+ graphics.setColor(plugin.getBrotherLocColor());
}
graphics.drawString(brotherLetter, minimapText.getX(), minimapText.getY());
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java
index 2b5c044f82..a3bbf6461f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java
@@ -27,10 +27,12 @@ package net.runelite.client.plugins.barrows;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
import com.google.inject.Provides;
+import java.awt.Color;
import java.time.temporal.ChronoUnit;
import java.util.HashSet;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.ChatMessageType;
@@ -77,6 +79,7 @@ import net.runelite.client.util.StackFormatter;
description = "Show helpful information for the Barrows minigame",
tags = {"combat", "minigame", "minimap", "bosses", "pve", "pvm"}
)
+@Singleton
public class BarrowsPlugin extends Plugin
{
@Getter(AccessLevel.PACKAGE)
@@ -144,9 +147,23 @@ public class BarrowsPlugin extends Plugin
return configManager.getConfig(BarrowsConfig.class);
}
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showMinimap;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showBrotherLoc;
+ private boolean showChestValue;
+ @Getter(AccessLevel.PACKAGE)
+ private Color brotherLocColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color deadBrotherLocColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showPuzzleAnswer;
+ private boolean showPrayerDrainTimer;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
overlayManager.add(barrowsOverlay);
overlayManager.add(brotherOverlay);
}
@@ -179,12 +196,28 @@ public class BarrowsPlugin extends Plugin
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
- if (event.getGroup().equals("barrows") && !config.showPrayerDrainTimer())
+ if (event.getGroup().equals("barrows"))
{
- stopPrayerDrainTimer();
+ updateConfig();
+
+ if (!this.showPrayerDrainTimer)
+ {
+ stopPrayerDrainTimer();
+ }
}
}
+ public void updateConfig()
+ {
+ this.showMinimap = config.showMinimap();
+ this.showBrotherLoc = config.showBrotherLoc();
+ this.showChestValue = config.showChestValue();
+ this.brotherLocColor = config.brotherLocColor();
+ this.deadBrotherLocColor = config.deadBrotherLocColor();
+ this.showPuzzleAnswer = config.showPuzzleAnswer();
+ this.showPrayerDrainTimer = config.showPrayerDrainTimer();
+ }
+
@Subscribe
public void onWallObjectSpawned(WallObjectSpawned event)
{
@@ -276,10 +309,14 @@ public class BarrowsPlugin extends Plugin
@Subscribe
public void onWidgetLoaded(WidgetLoaded event)
{
- if (event.getGroupId() == WidgetID.BARROWS_REWARD_GROUP_ID && config.showChestValue())
+ if (event.getGroupId() == WidgetID.BARROWS_REWARD_GROUP_ID && this.showChestValue)
{
ItemContainer barrowsRewardContainer = client.getItemContainer(InventoryID.BARROWS_REWARD);
- Item[] items = barrowsRewardContainer.getItems();
+ Item[] items = new Item[0];
+ if (barrowsRewardContainer != null)
+ {
+ items = barrowsRewardContainer.getItems();
+ }
long chestPrice = 0;
for (Item item : items)
@@ -320,7 +357,7 @@ public class BarrowsPlugin extends Plugin
private void startPrayerDrainTimer()
{
- if (config.showPrayerDrainTimer())
+ if (this.showPrayerDrainTimer)
{
final LoopTimer loopTimer = new LoopTimer(
PRAYER_DRAIN_INTERVAL_MS,
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java
index b5d6c2f635..d23a8c238c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java
@@ -35,10 +35,10 @@ import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Varbits;
import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.MenuEntryAdded;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
-import net.runelite.client.menus.MenuManager;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
@@ -56,7 +56,6 @@ import org.apache.commons.lang3.RandomUtils;
type = PluginType.SKILLING,
enabledByDefault = false
)
-
@Singleton
@Slf4j
public class BlackjackPlugin extends Plugin
@@ -68,10 +67,9 @@ public class BlackjackPlugin extends Plugin
@Inject
private Client client;
@Inject
- private MenuManager menuManager;
- @Inject
private BlackjackConfig config;
+ private boolean pickpocketOnAggro;
@Provides
BlackjackConfig getConfig(ConfigManager configManager)
@@ -79,6 +77,20 @@ public class BlackjackPlugin extends Plugin
return configManager.getConfig(BlackjackConfig.class);
}
+ @Override
+ protected void startUp() throws Exception
+ {
+ this.pickpocketOnAggro = config.pickpocketOnAggro();
+ }
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (event.getGroup().equals("blackjack"))
+ {
+ this.pickpocketOnAggro = config.pickpocketOnAggro();
+ }
+ }
@Subscribe
public void onMenuEntryAdded(MenuEntryAdded event)
@@ -107,7 +119,7 @@ public class BlackjackPlugin extends Plugin
{
if (event.getType() == ChatMessageType.SPAM)
{
- if (event.getMessage().equals(SUCCESS_BLACKJACK) ^ (event.getMessage().equals(FAILED_BLACKJACK) && config.pickpocketOnAggro()))
+ if (event.getMessage().equals(SUCCESS_BLACKJACK) ^ (event.getMessage().equals(FAILED_BLACKJACK) && this.pickpocketOnAggro))
{
nextKnockOutTick = client.getTickCount() + RandomUtils.nextInt(3, 4);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java
index 9dba17df30..4e7b818f90 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.geom.Area;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.EquipmentInventorySlot;
import net.runelite.api.GameObject;
@@ -42,21 +43,20 @@ import net.runelite.api.coords.LocalPoint;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
+@Singleton
class BlastFurnaceClickBoxOverlay extends Overlay
{
private static final int MAX_DISTANCE = 2350;
private final Client client;
private final BlastFurnacePlugin plugin;
- private final BlastFurnaceConfig config;
@Inject
- private BlastFurnaceClickBoxOverlay(Client client, BlastFurnacePlugin plugin, BlastFurnaceConfig config)
+ private BlastFurnaceClickBoxOverlay(final Client client, final BlastFurnacePlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
this.client = client;
this.plugin = plugin;
- this.config = config;
}
@Override
@@ -64,13 +64,13 @@ class BlastFurnaceClickBoxOverlay extends Overlay
{
int dispenserState = client.getVar(Varbits.BAR_DISPENSER);
- if (config.showConveyorBelt() && plugin.getConveyorBelt() != null)
+ if (plugin.isShowConveyorBelt() && plugin.getConveyorBelt() != null)
{
Color color = dispenserState == 1 ? Color.RED : Color.GREEN;
renderObject(plugin.getConveyorBelt(), graphics, color);
}
- if (config.showBarDispenser() && plugin.getBarDispenser() != null)
+ if (plugin.isShowBarDispenser() && plugin.getBarDispenser() != null)
{
boolean hasIceGloves = hasIceGloves();
Color color = dispenserState == 2 && hasIceGloves ? Color.GREEN : (dispenserState == 3 ? Color.GREEN : Color.RED);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java
index 49242d63a8..12c1353973 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.blastfurnace;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import static net.runelite.api.Varbits.BLAST_FURNACE_COFFER;
@@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.util.StackFormatter;
+@Singleton
class BlastFurnaceCofferOverlay extends Overlay
{
private final Client client;
@@ -48,7 +50,7 @@ class BlastFurnaceCofferOverlay extends Overlay
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- private BlastFurnaceCofferOverlay(Client client, BlastFurnacePlugin plugin)
+ private BlastFurnaceCofferOverlay(final Client client, final BlastFurnacePlugin plugin)
{
super(plugin);
setPosition(OverlayPosition.TOP_LEFT);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java
index 0d17c94bb7..2a83c6965d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.client.game.ItemManager;
@@ -39,6 +40,7 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation;
import net.runelite.client.ui.overlay.components.ImageComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
class BlastFurnaceOverlay extends Overlay
{
private final Client client;
@@ -49,7 +51,7 @@ class BlastFurnaceOverlay extends Overlay
private ItemManager itemManager;
@Inject
- BlastFurnaceOverlay(Client client, BlastFurnacePlugin plugin)
+ BlastFurnaceOverlay(final Client client, final BlastFurnacePlugin plugin)
{
super(plugin);
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java
index 15d602a324..7c50696f55 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java
@@ -29,6 +29,7 @@ import com.google.inject.Provides;
import java.time.Duration;
import java.time.Instant;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.Client;
@@ -37,6 +38,7 @@ import net.runelite.api.GameState;
import static net.runelite.api.NullObjectID.NULL_9092;
import static net.runelite.api.ObjectID.CONVEYOR_BELT;
import net.runelite.api.Skill;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameObjectDespawned;
import net.runelite.api.events.GameObjectSpawned;
import net.runelite.api.events.GameStateChanged;
@@ -57,6 +59,7 @@ import net.runelite.client.util.Text;
description = "Show helpful information for the Blast Furnace minigame",
tags = {"minigame", "overlay", "skilling", "smithing"}
)
+@Singleton
public class BlastFurnacePlugin extends Plugin
{
private static final int BAR_DISPENSER = NULL_9092;
@@ -91,9 +94,19 @@ public class BlastFurnacePlugin extends Plugin
@Inject
private InfoBoxManager infoBoxManager;
+ @Inject
+ private BlastFurnaceConfig config;
+
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showConveyorBelt;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showBarDispenser;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(overlay);
overlayManager.add(cofferOverlay);
overlayManager.add(clickBoxOverlay);
@@ -117,6 +130,15 @@ public class BlastFurnacePlugin extends Plugin
return configManager.getConfig(BlastFurnaceConfig.class);
}
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (event.getGroup().equals("blastfurnace"))
+ {
+ updateConfig();
+ }
+ }
+
@Subscribe
public void onGameObjectSpawned(GameObjectSpawned event)
{
@@ -187,4 +209,10 @@ public class BlastFurnacePlugin extends Plugin
}
}
}
+
+ public void updateConfig()
+ {
+ this.showBarDispenser = config.showBarDispenser();
+ this.showConveyorBelt = config.showConveyorBelt();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java
index 8cff73bd55..0c4e15120d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.ItemID;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
@@ -43,20 +44,21 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation;
import net.runelite.client.ui.overlay.components.ImageComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
class BlastMineOreCountOverlay extends Overlay
{
private final Client client;
- private final BlastMinePluginConfig config;
+ private final BlastMinePlugin plugin;
private final ItemManager itemManager;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- private BlastMineOreCountOverlay(BlastMinePlugin plugin, Client client, BlastMinePluginConfig config, ItemManager itemManager)
+ private BlastMineOreCountOverlay(final BlastMinePlugin plugin, final Client client, final ItemManager itemManager)
{
super(plugin);
setPosition(OverlayPosition.TOP_LEFT);
this.client = client;
- this.config = config;
+ this.plugin = plugin;
this.itemManager = itemManager;
panelComponent.setOrientation(ComponentOrientation.HORIZONTAL);
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Blast mine overlay"));
@@ -74,7 +76,7 @@ class BlastMineOreCountOverlay extends Overlay
panelComponent.getChildren().clear();
- if (config.showOreOverlay())
+ if (plugin.isShowOreOverlay())
{
blastMineWidget.setHidden(true);
panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.COAL, client.getVar(Varbits.BLAST_MINE_COAL))));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java
index 7ddc7e8a80..88d98cebbf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java
@@ -25,9 +25,12 @@
package net.runelite.client.plugins.blastmine;
import com.google.inject.Provides;
+import java.awt.Color;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.GameObject;
@@ -49,9 +52,10 @@ import net.runelite.client.ui.overlay.OverlayManager;
description = "Show helpful information for the Blast Mine minigame",
tags = {"explode", "explosive", "mining", "minigame", "skilling"}
)
+@Singleton
public class BlastMinePlugin extends Plugin
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final Map rocks = new HashMap<>();
@Inject
@@ -66,15 +70,33 @@ public class BlastMinePlugin extends Plugin
@Inject
private BlastMineOreCountOverlay blastMineOreCountOverlay;
+ @Inject
+ private BlastMinePluginConfig config;
+
@Provides
BlastMinePluginConfig getConfig(ConfigManager configManager)
{
return configManager.getConfig(BlastMinePluginConfig.class);
}
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showOreOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showRockIconOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showTimerOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showWarningOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private Color timerColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color warningColor;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(blastMineRockOverlay);
overlayManager.add(blastMineOreCountOverlay);
}
@@ -132,4 +154,14 @@ public class BlastMinePlugin extends Plugin
(rock.getRemainingTimeRelative() == 1 && rock.getType() != BlastMineRockType.NORMAL) ||
(rock.getRemainingFuseTimeRelative() == 1 && rock.getType() == BlastMineRockType.LIT));
}
+
+ private void updateConfig()
+ {
+ this.showOreOverlay = config.showOreOverlay();
+ this.showRockIconOverlay = config.showRockIconOverlay();
+ this.showTimerOverlay = config.showTimerOverlay();
+ this.showWarningOverlay = config.showWarningOverlay();
+ this.timerColor = config.getTimerColor();
+ this.warningColor = config.getWarningColor();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java
index 1f1cec4fb5..441d836f3b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.blastmine;
import java.time.Duration;
import java.time.Instant;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.GameObject;
@@ -34,10 +35,10 @@ class BlastMineRock
private static final Duration PLANT_TIME = Duration.ofSeconds(30);
private static final Duration FUSE_TIME = Duration.ofMillis(4200);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final GameObject gameObject;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final BlastMineRockType type;
private final Instant creationTime = Instant.now();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java
index 92fbdfe221..5199a9bd4f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Polygon;
import java.awt.image.BufferedImage;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.GameObject;
import net.runelite.api.ItemID;
@@ -49,6 +50,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.ProgressPieComponent;
+@Singleton
public class BlastMineRockOverlay extends Overlay
{
private static final int MAX_DISTANCE = 16;
@@ -62,20 +64,18 @@ public class BlastMineRockOverlay extends Overlay
private final Client client;
private final BlastMinePlugin plugin;
- private final BlastMinePluginConfig config;
private final BufferedImage chiselIcon;
private final BufferedImage dynamiteIcon;
private final BufferedImage tinderboxIcon;
@Inject
- private BlastMineRockOverlay(Client client, BlastMinePlugin plugin, BlastMinePluginConfig config, ItemManager itemManager)
+ private BlastMineRockOverlay(final Client client, final BlastMinePlugin plugin, final ItemManager itemManager)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
this.client = client;
this.plugin = plugin;
- this.config = config;
chiselIcon = itemManager.getImage(ItemID.CHISEL);
dynamiteIcon = itemManager.getImage(ItemID.DYNAMITE);
tinderboxIcon = itemManager.getImage(ItemID.TINDERBOX);
@@ -114,8 +114,8 @@ public class BlastMineRockOverlay extends Overlay
drawIconOnRock(graphics, rock, tinderboxIcon);
break;
case LIT:
- drawTimerOnRock(graphics, rock, config.getTimerColor());
- drawAreaWarning(graphics, rock, config.getWarningColor(), tiles);
+ drawTimerOnRock(graphics, rock, plugin.getTimerColor());
+ drawAreaWarning(graphics, rock, plugin.getWarningColor(), tiles);
break;
}
}
@@ -125,7 +125,7 @@ public class BlastMineRockOverlay extends Overlay
private void drawIconOnRock(Graphics2D graphics, BlastMineRock rock, BufferedImage icon)
{
- if (!config.showRockIconOverlay())
+ if (!plugin.isShowRockIconOverlay())
{
return;
}
@@ -140,7 +140,7 @@ public class BlastMineRockOverlay extends Overlay
private void drawTimerOnRock(Graphics2D graphics, BlastMineRock rock, Color color)
{
- if (!config.showTimerOverlay())
+ if (!plugin.isShowTimerOverlay())
{
return;
}
@@ -161,7 +161,7 @@ public class BlastMineRockOverlay extends Overlay
private void drawAreaWarning(Graphics2D graphics, BlastMineRock rock, Color color, Tile[][][] tiles)
{
- if (!config.showWarningOverlay())
+ if (!plugin.isShowWarningOverlay())
{
return;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java
index 20e1d37f58..0960fcfb5d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.blastmine;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.ObjectID;
@@ -54,7 +55,7 @@ public enum BlastMineRockType
rockTypes = builder.build();
}
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final int[] objectIds;
BlastMineRockType(int... objectIds)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java
index 00a0a97561..50a1db0b8a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.boosts;
import java.awt.Color;
import java.awt.image.BufferedImage;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.Skill;
@@ -35,17 +36,15 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxPriority;
public class BoostIndicator extends InfoBox
{
private final BoostsPlugin plugin;
- private final BoostsConfig config;
private final Client client;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final Skill skill;
- BoostIndicator(Skill skill, BufferedImage image, BoostsPlugin plugin, Client client, BoostsConfig config)
+ BoostIndicator(final Skill skill, final BufferedImage image, final BoostsPlugin plugin, final Client client)
{
super(image, plugin);
this.plugin = plugin;
- this.config = config;
this.client = client;
this.skill = skill;
setTooltip(skill.getName() + " boost");
@@ -55,7 +54,7 @@ public class BoostIndicator extends InfoBox
@Override
public String getText()
{
- if (!config.useRelativeBoost())
+ if (!plugin.isUseRelativeBoost())
{
return String.valueOf(client.getBoostedSkillLevel(skill));
}
@@ -81,13 +80,13 @@ public class BoostIndicator extends InfoBox
return new Color(238, 51, 51);
}
- return boosted - base <= config.boostThreshold() ? Color.YELLOW : Color.GREEN;
+ return boosted - base <= plugin.getBoostThreshold() ? Color.YELLOW : Color.GREEN;
}
@Override
public boolean render()
{
- if (config.displayInfoboxes() && plugin.canShowBoosts() && plugin.getShownSkills().contains(getSkill()))
+ if (plugin.isDisplayInfoboxes() && plugin.canShowBoosts() && plugin.getShownSkills().contains(getSkill()))
{
return client.getBoostedSkillLevel(skill) != client.getRealSkillLevel(skill);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java
index 54a4f62b8f..977fe0b5a0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.api.Skill;
@@ -41,20 +42,19 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.util.ColorUtil;
+@Singleton
class BoostsOverlay extends Overlay
{
private final Client client;
- private final BoostsConfig config;
private final PanelComponent panelComponent = new PanelComponent();
private final BoostsPlugin plugin;
@Inject
- private BoostsOverlay(Client client, BoostsConfig config, BoostsPlugin plugin)
+ private BoostsOverlay(final Client client, final BoostsPlugin plugin)
{
super(plugin);
this.plugin = plugin;
this.client = client;
- this.config = config;
setPosition(OverlayPosition.TOP_LEFT);
setPriority(OverlayPriority.MED);
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Boosts overlay"));
@@ -63,7 +63,7 @@ class BoostsOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (config.displayInfoboxes() || config.displayIcons())
+ if (plugin.isDisplayInfoboxes() || plugin.isDisplayIcons())
{
return null;
}
@@ -103,7 +103,7 @@ class BoostsOverlay extends Overlay
final Color strColor = getTextColor(boost);
String str;
- if (config.useRelativeBoost())
+ if (plugin.isUseRelativeBoost())
{
str = String.valueOf(boost);
if (boost > 0)
@@ -133,7 +133,7 @@ class BoostsOverlay extends Overlay
return new Color(238, 51, 51);
}
- return boost <= config.boostThreshold() ? Color.YELLOW : Color.GREEN;
+ return boost <= plugin.getBoostThreshold() ? Color.YELLOW : Color.GREEN;
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
index 5dabff0736..a3ea8a41de 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.Constants;
@@ -107,6 +108,21 @@ public class BoostsPlugin extends Plugin
private long lastTickMillis;
private List boostedSkillsChanged = new ArrayList<>();
+ private boolean enableSkill;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean useRelativeBoost;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean displayInfoboxes;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean displayIcons;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean boldIconFont;
+ private BoostsConfig.DisplayChangeMode displayNextBuffChange;
+ private BoostsConfig.DisplayChangeMode displayNextDebuffChange;
+ @Getter(AccessLevel.PACKAGE)
+ private int boostThreshold;
+ private boolean groupNotifications;
+
@Provides
BoostsConfig provideConfig(ConfigManager configManager)
{
@@ -116,6 +132,8 @@ public class BoostsPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(boostsOverlay);
overlayManager.add(combatIconsOverlay);
updateShownSkills();
@@ -130,7 +148,7 @@ public class BoostsPlugin extends Plugin
{
if (skill != Skill.OVERALL)
{
- infoBoxManager.addInfoBox(new BoostIndicator(skill, skillIconManager.getSkillImage(skill), this, client, config));
+ infoBoxManager.addInfoBox(new BoostIndicator(skill, skillIconManager.getSkillImage(skill), this, client));
}
}
}
@@ -169,14 +187,15 @@ public class BoostsPlugin extends Plugin
return;
}
+ updateConfig();
updateShownSkills();
- if (config.displayNextBuffChange() == BoostsConfig.DisplayChangeMode.NEVER)
+ if (this.displayNextBuffChange == BoostsConfig.DisplayChangeMode.NEVER)
{
lastChangeDown = -1;
}
- if (config.displayNextDebuffChange() == BoostsConfig.DisplayChangeMode.NEVER)
+ if (this.displayNextDebuffChange == BoostsConfig.DisplayChangeMode.NEVER)
{
lastChangeUp = -1;
}
@@ -211,7 +230,7 @@ public class BoostsPlugin extends Plugin
lastSkillLevels[skillIdx] = cur;
updateBoostedStats();
- int boostThreshold = config.boostThreshold();
+ int boostThreshold = this.boostThreshold;
if (boostThreshold != 0)
{
@@ -220,7 +239,7 @@ public class BoostsPlugin extends Plugin
int boost = cur - real;
if (boost <= boostThreshold && boostThreshold < lastBoost)
{
- if (config.groupNotifications())
+ if (this.groupNotifications)
{
boostedSkillsChanged.add(skill.getName());
}
@@ -237,7 +256,7 @@ public class BoostsPlugin extends Plugin
{
lastTickMillis = System.currentTimeMillis();
- if (config.groupNotifications() && !boostedSkillsChanged.isEmpty())
+ if (this.groupNotifications && !boostedSkillsChanged.isEmpty())
{
if (boostedSkillsChanged.size() == 1)
{
@@ -268,7 +287,7 @@ public class BoostsPlugin extends Plugin
if (getChangeUpTicks() <= 0)
{
- switch (config.displayNextDebuffChange())
+ switch (this.displayNextDebuffChange)
{
case ALWAYS:
if (lastChangeUp != -1)
@@ -286,7 +305,7 @@ public class BoostsPlugin extends Plugin
if (getChangeDownTicks() <= 0)
{
- switch (config.displayNextBuffChange())
+ switch (this.displayNextBuffChange)
{
case ALWAYS:
if (lastChangeDown != -1)
@@ -305,7 +324,7 @@ public class BoostsPlugin extends Plugin
private void updateShownSkills()
{
- if (config.enableSkill())
+ if (this.enableSkill)
{
shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS);
}
@@ -368,8 +387,8 @@ public class BoostsPlugin extends Plugin
int getChangeDownTicks()
{
if (lastChangeDown == -1 ||
- config.displayNextBuffChange() == BoostsConfig.DisplayChangeMode.NEVER ||
- (config.displayNextBuffChange() == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedUp))
+ this.displayNextBuffChange == BoostsConfig.DisplayChangeMode.NEVER ||
+ (this.displayNextBuffChange == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedUp))
{
return -1;
}
@@ -396,8 +415,8 @@ public class BoostsPlugin extends Plugin
int getChangeUpTicks()
{
if (lastChangeUp == -1 ||
- config.displayNextDebuffChange() == BoostsConfig.DisplayChangeMode.NEVER ||
- (config.displayNextDebuffChange() == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedDown))
+ this.displayNextDebuffChange == BoostsConfig.DisplayChangeMode.NEVER ||
+ (this.displayNextDebuffChange == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedDown))
{
return -1;
}
@@ -418,4 +437,17 @@ public class BoostsPlugin extends Plugin
final long diff = System.currentTimeMillis() - lastTickMillis;
return time != -1 ? (int) ((time * Constants.GAME_TICK_LENGTH - diff) / 1000d) : time;
}
+
+ private void updateConfig()
+ {
+ this.enableSkill = config.enableSkill();
+ this.useRelativeBoost = config.useRelativeBoost();
+ this.displayInfoboxes = config.displayInfoboxes();
+ this.displayIcons = config.displayIcons();
+ this.boldIconFont = config.boldIconFont();
+ this.displayNextBuffChange = config.displayNextDebuffChange();
+ this.displayNextDebuffChange = config.displayNextDebuffChange();
+ this.boostThreshold = config.boostThreshold();
+ this.groupNotifications = config.groupNotifications();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java
index 2e4c9c5ab9..c3c69d9561 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java
@@ -6,6 +6,7 @@ import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.api.Skill;
@@ -23,21 +24,20 @@ import net.runelite.client.ui.FontManager;
import net.runelite.client.util.ColorUtil;
import net.runelite.client.util.ImageUtil;
+@Singleton
class CombatIconsOverlay extends Overlay
{
private final Client client;
- private final BoostsConfig config;
private final PanelComponent panelComponent = new PanelComponent();
private final SkillIconManager iconManager;
private final BoostsPlugin plugin;
@Inject
- private CombatIconsOverlay(Client client, BoostsConfig config, BoostsPlugin plugin, SkillIconManager iconManager)
+ private CombatIconsOverlay(final Client client, final BoostsPlugin plugin, final SkillIconManager iconManager)
{
super(plugin);
this.plugin = plugin;
this.client = client;
- this.config = config;
this.iconManager = iconManager;
setPosition(OverlayPosition.TOP_LEFT);
setPriority(OverlayPriority.MED);
@@ -47,12 +47,12 @@ class CombatIconsOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (config.displayInfoboxes() || !config.displayIcons())
+ if (plugin.isDisplayInfoboxes() || !plugin.isDisplayIcons())
{
return null;
}
- if (config.boldIconFont())
+ if (plugin.isBoldIconFont())
{
graphics.setFont(FontManager.getRunescapeBoldFont());
}
@@ -79,7 +79,7 @@ class CombatIconsOverlay extends Overlay
final Color strColor = getTextColor(boost);
String str;
- if (config.useRelativeBoost())
+ if (plugin.isUseRelativeBoost())
{
str = String.valueOf(boost);
if (boost > 0)
@@ -137,7 +137,7 @@ class CombatIconsOverlay extends Overlay
return new Color(238, 51, 51);
}
- return boost <= config.boostThreshold() ? Color.YELLOW : Color.GREEN;
+ return boost <= plugin.getBoostThreshold() ? Color.YELLOW : Color.GREEN;
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java
index 0e6b98c907..d5faf547dc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java
@@ -26,6 +26,7 @@
package net.runelite.client.plugins.bosstimer;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.NPC;
import net.runelite.api.events.NpcDespawned;
@@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
description = "Show boss spawn timer overlays",
tags = {"combat", "pve", "overlay", "spawn"}
)
+@Singleton
@Slf4j
public class BossTimersPlugin extends Plugin
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java
index 1d9d077f25..6d3a03a85a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java
@@ -33,7 +33,7 @@ class RespawnTimer extends Timer
{
private final Boss boss;
- public RespawnTimer(Boss boss, BufferedImage bossImage, Plugin plugin)
+ RespawnTimer(Boss boss, BufferedImage bossImage, Plugin plugin)
{
super(boss.getSpawnTime().toMillis(), ChronoUnit.MILLIS, bossImage, plugin);
this.boss = boss;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java
index 06d0500155..84b7423ab3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Polygon;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import static net.runelite.api.Perspective.LOCAL_TILE_SIZE;
@@ -40,22 +41,21 @@ import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.ui.overlay.components.TextComponent;
+@Singleton
class CannonOverlay extends Overlay
{
private static final int MAX_DISTANCE = 2500;
private final Client client;
- private final CannonConfig config;
private final CannonPlugin plugin;
private final TextComponent textComponent = new TextComponent();
@Inject
- CannonOverlay(Client client, CannonConfig config, CannonPlugin plugin)
+ CannonOverlay(final Client client, final CannonPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setPriority(OverlayPriority.MED);
this.client = client;
- this.config = config;
this.plugin = plugin;
}
@@ -91,9 +91,9 @@ class CannonOverlay extends Overlay
textComponent.render(graphics);
}
- if (config.showDoubleHitSpot())
+ if (plugin.isShowDoubleHitSpot())
{
- Color color = config.highlightDoubleHitColor();
+ Color color = plugin.getHighlightDoubleHitColor();
drawDoubleHitSpots(graphics, cannonPoint, color);
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
index 6b82e45aca..dd229ef8c6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.AnimationID;
import net.runelite.api.ChatMessageType;
@@ -80,19 +81,19 @@ public class CannonPlugin extends Plugin
private CannonCounter counter;
private boolean skipProjectileCheckThisTick;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int cballsLeft;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private boolean cannonPlaced;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private WorldPoint cannonPosition;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private GameObject cannon;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private List spotPoints = new ArrayList<>();
@Inject
@@ -124,6 +125,17 @@ public class CannonPlugin extends Plugin
private boolean lock;
+ private boolean showEmptyCannonNotification;
+ private boolean showInfobox;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showDoubleHitSpot;
+ @Getter(AccessLevel.PACKAGE)
+ private Color highlightDoubleHitColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showCannonSpots;
+ private int ammoAmount;
+ private boolean notifyAmmoLeft;
+
@Provides
CannonConfig provideConfig(ConfigManager configManager)
{
@@ -133,6 +145,8 @@ public class CannonPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(cannonOverlay);
overlayManager.add(cannonSpotOverlay);
lock = false;
@@ -169,7 +183,9 @@ public class CannonPlugin extends Plugin
{
if (event.getGroup().equals("cannon"))
{
- if (!config.showInfobox())
+ updateConfig();
+
+ if (!this.showInfobox)
{
removeCounter();
}
@@ -190,7 +206,7 @@ public class CannonPlugin extends Plugin
)
public void checkSpots()
{
- if (!config.showCannonSpots())
+ if (!this.showCannonSpots)
{
return;
}
@@ -318,7 +334,7 @@ public class CannonPlugin extends Plugin
// extra check is a good idea.
cballsLeft = 0;
- if (config.showEmptyCannonNotification())
+ if (this.showEmptyCannonNotification)
{
notifier.notify("Your cannon is out of ammo!");
}
@@ -350,11 +366,11 @@ public class CannonPlugin extends Plugin
{
return Color.orange;
}
- else if (cballsLeft <= config.ammoAmount())
+ else if (cballsLeft <= this.ammoAmount)
{
- if (config.notifyAmmoLeft() && !lock)
+ if (this.notifyAmmoLeft && !lock)
{
- notifier.notify("Your cannon has " + config.ammoAmount() + " balls left!");
+ notifier.notify("Your cannon has " + this.ammoAmount + " balls left!");
lock = true;
}
}
@@ -364,7 +380,7 @@ public class CannonPlugin extends Plugin
private void addCounter()
{
- if (!config.showInfobox() || counter != null)
+ if (!this.showInfobox || counter != null)
{
return;
}
@@ -385,4 +401,15 @@ public class CannonPlugin extends Plugin
infoBoxManager.removeInfoBox(counter);
counter = null;
}
+
+ private void updateConfig()
+ {
+ this.showEmptyCannonNotification = config.showEmptyCannonNotification();
+ this.showInfobox = config.showInfobox();
+ this.showDoubleHitSpot = config.showDoubleHitSpot();
+ this.highlightDoubleHitColor = config.highlightDoubleHitColor();
+ this.showCannonSpots = config.showCannonSpots();
+ this.ammoAmount = config.ammoAmount();
+ this.notifyAmmoLeft = config.notifyAmmoLeft();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java
index 01c3eff871..3bf377f2b0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
import java.awt.Polygon;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Setter;
import net.runelite.api.Client;
@@ -43,13 +44,13 @@ import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
public class CannonSpotOverlay extends Overlay
{
private static final int MAX_DISTANCE = 2350;
private final Client client;
private final CannonPlugin plugin;
- private final CannonConfig config;
@Inject
private ItemManager itemManager;
@@ -58,18 +59,17 @@ public class CannonSpotOverlay extends Overlay
private boolean hidden;
@Inject
- CannonSpotOverlay(Client client, CannonPlugin plugin, CannonConfig config)
+ CannonSpotOverlay(final Client client, final CannonPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
this.client = client;
this.plugin = plugin;
- this.config = config;
}
@Override
public Dimension render(Graphics2D graphics)
{
- if (hidden || !config.showCannonSpots() || plugin.isCannonPlaced())
+ if (hidden || !plugin.isShowCannonSpots() || plugin.isCannonPlaced())
{
return null;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java
index 354dd0edf4..28adddc615 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java
@@ -27,13 +27,14 @@ package net.runelite.client.plugins.cerberus;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
import java.util.Optional;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.runelite.api.NPC;
import net.runelite.api.NpcID;
import net.runelite.api.Skill;
-@Getter
+@Getter(AccessLevel.PACKAGE)
@RequiredArgsConstructor
public enum CerberusGhost
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java
index 4cc810847f..3f51018632 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.chatboxperformance;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.events.WidgetPositioned;
import net.runelite.api.widgets.Widget;
@@ -40,6 +41,7 @@ import net.runelite.client.plugins.PluginDescriptor;
name = "Chatbox performance",
hidden = true
)
+@Singleton
public class ChatboxPerformancePlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
index 079f1cdba6..fcac5d54b1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
@@ -25,6 +25,7 @@
*/
package net.runelite.client.plugins.chatcommands;
+import javax.inject.Singleton;
import net.runelite.api.vars.AccountType;
import com.google.inject.Provides;
import java.io.IOException;
@@ -81,6 +82,7 @@ import org.apache.commons.text.WordUtils;
description = "Enable chat commands",
tags = {"grand", "exchange", "level", "prices"}
)
+@Singleton
@Slf4j
public class ChatCommandsPlugin extends Plugin
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
index 8413b0e67a..a00c7391b2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
@@ -34,6 +34,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Setter;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
import net.runelite.api.MessageNode;
@@ -53,6 +56,7 @@ import org.apache.commons.lang3.StringUtils;
description = "Censor user configurable words or patterns from chat",
enabledByDefault = false
)
+@Singleton
public class ChatFilterPlugin extends Plugin
{
private static final Splitter NEWLINE_SPLITTER = Splitter
@@ -71,6 +75,17 @@ public class ChatFilterPlugin extends Plugin
@Inject
private ChatFilterConfig config;
+ @Setter(AccessLevel.PACKAGE)
+ private ChatFilterType filterType;
+ @Setter(AccessLevel.PACKAGE)
+ private String filteredWords;
+ @Setter(AccessLevel.PACKAGE)
+ private String filteredRegex;
+ @Setter(AccessLevel.PACKAGE)
+ private boolean filterFriends;
+ @Setter(AccessLevel.PACKAGE)
+ private boolean filterClan;
+
@Provides
ChatFilterConfig provideConfig(ConfigManager configManager)
{
@@ -80,6 +95,7 @@ public class ChatFilterPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
updateFilteredPatterns();
}
@@ -122,8 +138,8 @@ public class ChatFilterPlugin extends Plugin
MessageNode messageNode = (MessageNode) client.getMessages().get(messageId);
if (client.getLocalPlayer().getName().equals(messageNode.getName()) ||
- !config.filterFriends() && messageNode.isFromFriend() ||
- !config.filterClan() && messageNode.isFromClanMate())
+ !this.filterFriends && messageNode.isFromFriend() ||
+ !this.filterClan && messageNode.isFromClanMate())
{
return;
}
@@ -168,8 +184,8 @@ public class ChatFilterPlugin extends Plugin
{
boolean isMessageFromSelf = playerName.equals(client.getLocalPlayer().getName());
return !isMessageFromSelf &&
- (config.filterFriends() || !client.isFriended(playerName, false)) &&
- (config.filterClan() || !client.isClanMember(playerName));
+ (this.filterFriends || !client.isFriended(playerName, false)) &&
+ (this.filterClan || !client.isClanMember(playerName));
}
String censorMessage(final String message)
@@ -185,7 +201,7 @@ public class ChatFilterPlugin extends Plugin
while (m.find())
{
- switch (config.filterType())
+ switch (this.filterType)
{
case CENSOR_WORDS:
m.appendReplacement(sb, StringUtils.repeat("*", m.group(0).length()));
@@ -209,11 +225,11 @@ public class ChatFilterPlugin extends Plugin
{
filteredPatterns.clear();
- Text.fromCSV(config.filteredWords()).stream()
+ Text.fromCSV(this.filteredWords).stream()
.map(s -> Pattern.compile(Pattern.quote(s), Pattern.CASE_INSENSITIVE))
.forEach(filteredPatterns::add);
- NEWLINE_SPLITTER.splitToList(config.filteredRegex()).stream()
+ NEWLINE_SPLITTER.splitToList(this.filteredRegex).stream()
.map(s ->
{
try
@@ -237,6 +253,16 @@ public class ChatFilterPlugin extends Plugin
return;
}
+ updateConfig();
updateFilteredPatterns();
}
+
+ private void updateConfig()
+ {
+ this.filterType = config.filterType();
+ this.filteredWords = config.filteredWords();
+ this.filteredRegex = config.filteredRegex();
+ this.filterFriends = config.filterFriends();
+ this.filterClan = config.filterClan();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java
index d6ed9d888d..86586dedf5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java
@@ -32,12 +32,14 @@ import java.util.Deque;
import java.util.Iterator;
import java.util.Queue;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
import net.runelite.api.ScriptID;
import net.runelite.api.VarClientInt;
import net.runelite.api.VarClientStr;
import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.vars.InputType;
import net.runelite.client.callback.ClientThread;
@@ -56,6 +58,7 @@ import net.runelite.client.util.Text;
description = "Retain your chat history when logging in/out or world hopping",
tags = {"chat", "history", "retain", "cycle", "pm"}
)
+@Singleton
public class ChatHistoryPlugin extends Plugin implements KeyListener
{
private static final String WELCOME_MESSAGE = "Welcome to Old School RuneScape.";
@@ -82,6 +85,9 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
@Inject
private ChatMessageManager chatMessageManager;
+ private boolean retainChatHistory;
+ private boolean pmTargetCycling;
+
@Provides
ChatHistoryConfig getConfig(ConfigManager configManager)
{
@@ -91,6 +97,8 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
@Override
protected void startUp()
{
+ updateConfig();
+
messageQueue = EvictingQueue.create(100);
friends = new ArrayDeque<>(FRIENDS_MAX_SIZE + 1);
keyManager.registerKeyListener(this);
@@ -113,7 +121,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
// of information that chat history was reset
if (chatMessage.getMessage().equals(WELCOME_MESSAGE))
{
- if (!config.retainChatHistory())
+ if (!this.retainChatHistory)
{
return;
}
@@ -204,7 +212,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
@Override
public void keyPressed(KeyEvent e)
{
- if (e.getKeyCode() != CYCLE_HOTKEY || !config.pmTargetCycling())
+ if (e.getKeyCode() != CYCLE_HOTKEY || !this.pmTargetCycling)
{
return;
}
@@ -260,4 +268,21 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
return friends.getLast();
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!"chathistory".equals(event.getGroup()))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ private void updateConfig()
+ {
+ this.retainChatHistory = config.retainChatHistory();
+ this.pmTargetCycling = config.pmTargetCycling();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
index 0f9f000b28..0f8c5f1847 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
@@ -36,6 +36,7 @@ import java.util.regex.Pattern;
import static java.util.regex.Pattern.quote;
import java.util.stream.Collectors;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.MessageNode;
import net.runelite.api.events.ChatMessage;
@@ -57,6 +58,7 @@ import net.runelite.client.util.Text;
tags = {"duel", "messages", "notifications", "trade", "username"},
enabledByDefault = false
)
+@Singleton
public class ChatNotificationsPlugin extends Plugin
{
@Inject
@@ -82,6 +84,14 @@ public class ChatNotificationsPlugin extends Plugin
// Private message cache used to avoid duplicate notifications from ChatHistory.
private Set privateMessageHashes = new HashSet<>();
+ private boolean highlightOwnName;
+ private String highlightWordsString;
+ private boolean notifyOnOwnName;
+ private boolean notifyOnHighlight;
+ private boolean notifyOnTrade;
+ private boolean notifyOnDuel;
+ private boolean notifyOnPm;
+
@Provides
ChatNotificationsConfig provideConfig(ConfigManager configManager)
{
@@ -91,6 +101,7 @@ public class ChatNotificationsPlugin extends Plugin
@Override
public void startUp()
{
+ updateConfig();
updateHighlights();
}
@@ -117,6 +128,7 @@ public class ChatNotificationsPlugin extends Plugin
{
if (event.getGroup().equals("chatnotification"))
{
+ updateConfig();
updateHighlights();
}
}
@@ -125,9 +137,9 @@ public class ChatNotificationsPlugin extends Plugin
{
highlightMatcher = null;
- if (!config.highlightWordsString().trim().equals(""))
+ if (!this.highlightWordsString.trim().equals(""))
{
- List items = Text.fromCSV(config.highlightWordsString());
+ List items = Text.fromCSV(this.highlightWordsString);
String joined = items.stream()
.map(Text::escapeJagex) // we compare these strings to the raw Jagex ones
.map(Pattern::quote)
@@ -147,13 +159,13 @@ public class ChatNotificationsPlugin extends Plugin
switch (chatMessage.getType())
{
case TRADEREQ:
- if (chatMessage.getMessage().contains("wishes to trade with you.") && config.notifyOnTrade())
+ if (chatMessage.getMessage().contains("wishes to trade with you.") && this.notifyOnTrade)
{
notifier.notify(chatMessage.getMessage());
}
break;
case CHALREQ_TRADE:
- if (chatMessage.getMessage().contains("wishes to duel with you.") && config.notifyOnDuel())
+ if (chatMessage.getMessage().contains("wishes to duel with you.") && this.notifyOnDuel)
{
notifier.notify(chatMessage.getMessage());
}
@@ -167,7 +179,7 @@ public class ChatNotificationsPlugin extends Plugin
break;
case PRIVATECHAT:
case MODPRIVATECHAT:
- if (config.notifyOnPm())
+ if (this.notifyOnPm)
{
int messageHash = this.buildMessageHash(chatMessage);
if (this.privateMessageHashes.contains(messageHash))
@@ -187,7 +199,7 @@ public class ChatNotificationsPlugin extends Plugin
usernameReplacer = "" + username + "";
}
- if (config.highlightOwnName() && usernameMatcher != null)
+ if (this.highlightOwnName && usernameMatcher != null)
{
Matcher matcher = usernameMatcher.matcher(messageNode.getValue());
if (matcher.find())
@@ -195,7 +207,7 @@ public class ChatNotificationsPlugin extends Plugin
messageNode.setValue(matcher.replaceAll(usernameReplacer));
update = true;
- if (config.notifyOnOwnName())
+ if (this.notifyOnOwnName)
{
sendNotification(chatMessage);
}
@@ -222,7 +234,7 @@ public class ChatNotificationsPlugin extends Plugin
matcher.appendTail(stringBuffer);
messageNode.setValue(stringBuffer.toString());
- if (config.notifyOnHighlight())
+ if (this.notifyOnHighlight)
{
sendNotification(chatMessage);
}
@@ -261,4 +273,15 @@ public class ChatNotificationsPlugin extends Plugin
String notification = stringBuilder.toString();
notifier.notify(notification);
}
+
+ private void updateConfig()
+ {
+ this.highlightOwnName = config.highlightOwnName();
+ this.highlightWordsString = config.highlightWordsString();
+ this.notifyOnOwnName = config.notifyOnOwnName();
+ this.notifyOnHighlight = config.notifyOnHighlight();
+ this.notifyOnTrade = config.notifyOnTrade();
+ this.notifyOnDuel = config.notifyOnDuel();
+ this.notifyOnPm = config.notifyOnPm();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java
index 034dfa2647..3760f5b036 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java
@@ -3,6 +3,7 @@ package net.runelite.client.plugins.chattranslation;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ObjectArrays;
import com.google.inject.Provides;
+import javax.inject.Singleton;
import net.runelite.api.*;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ConfigChanged;
@@ -34,6 +35,7 @@ import java.util.ArrayList;
tags = {"translate", "language", "english", "spanish", "dutch", "french"},
type = PluginType.UTILITY
)
+@Singleton
public class ChatTranslationPlugin extends Plugin implements KeyListener
{
@@ -64,6 +66,13 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
@Inject
private ChatTranslationConfig config;
+ private boolean translateOptionVisable;
+ private boolean publicChat;
+ private String getPlayerNames;
+ private Languages publicTargetLanguage;
+ private boolean playerChat;
+ private Languages playerTargetLanguage;
+
@Provides
ChatTranslationConfig provideConfig(ConfigManager configManager)
{
@@ -73,9 +82,11 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
if (client != null)
{
- if (config.translateOptionVisable())
+ if (this.translateOptionVisable)
{
menuManager.get().addPlayerMenuItem(TRANSLATE);
}
@@ -90,7 +101,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
{
if (client != null)
{
- if (config.translateOptionVisable())
+ if (this.translateOptionVisable)
{
menuManager.get().removePlayerMenuItem(TRANSLATE);
}
@@ -105,9 +116,10 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
{
if (event.getGroup().equals("chattranslation"))
{
+ updateConfig();
if (event.getKey().equals("playerNames"))
{
- for (String names : Text.fromCSV(config.getPlayerNames()))
+ for (String names : Text.fromCSV(this.getPlayerNames))
{
if (!playerNames.contains(Text.toJagexName(names)))
{
@@ -121,7 +133,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
@Subscribe
public void onMenuEntryAdded(MenuEntryAdded event)
{
- if (!config.translateOptionVisable())
+ if (!this.translateOptionVisable)
{
return;
}
@@ -181,7 +193,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
case PUBLICCHAT:
case MODCHAT:
case FRIENDSCHAT:
- if (!config.publicChat())
+ if (!this.publicChat)
{
return;
}
@@ -201,7 +213,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
try
{
//Automatically check language of message and translate to selected language.
- String translation = translator.translate("auto", config.publicTargetLanguage().toString(), message);
+ String translation = translator.translate("auto", this.publicTargetLanguage.toString(), message);
if (translation != null)
{
final MessageNode messageNode = chatMessage.getMessageNode();
@@ -227,7 +239,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
return;
}
- if (!config.playerChat())
+ if (!this.playerChat)
{
return;
}
@@ -259,7 +271,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
try
{
//Automatically check language of message and translate to selected language.
- String translation = translator.translate("auto", config.playerTargetLanguage().toString(), message);
+ String translation = translator.translate("auto", this.playerTargetLanguage.toString(), message);
if (translation != null)
{
client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation);
@@ -291,4 +303,13 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
// Nothing.
}
+ private void updateConfig()
+ {
+ this.publicChat = config.publicChat();
+ this.getPlayerNames = config.getPlayerNames();
+ this.translateOptionVisable = config.translateOptionVisable();
+ this.publicTargetLanguage = config.publicTargetLanguage();
+ this.playerChat = config.playerChat();
+ this.playerTargetLanguage = config.playerTargetLanguage();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java
index e8f7542d7d..38c86929dd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java
@@ -26,13 +26,15 @@ package net.runelite.client.plugins.clanchat;
import java.awt.Color;
import java.awt.image.BufferedImage;
+import javax.inject.Singleton;
import net.runelite.client.ui.overlay.infobox.Counter;
+@Singleton
class ClanChatIndicator extends Counter
{
private final ClanChatPlugin plugin;
- ClanChatIndicator(BufferedImage image, ClanChatPlugin plugin)
+ ClanChatIndicator(final BufferedImage image, final ClanChatPlugin plugin)
{
super(image, plugin, plugin.getClanAmount());
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
index 8e053922dd..cab4bb4b45 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
@@ -40,6 +40,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.ChatLineBuffer;
import net.runelite.api.ChatMessageType;
import net.runelite.api.ClanMember;
@@ -68,7 +69,6 @@ import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.widgets.WidgetType;
import net.runelite.client.callback.ClientThread;
import net.runelite.client.chat.ChatMessageBuilder;
-import net.runelite.client.chat.ChatMessageManager;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.game.ClanManager;
@@ -87,6 +87,7 @@ import net.runelite.client.util.Text;
description = "Add rank icons to users talking in clan chat",
tags = {"icons", "rank", "recent"}
)
+@Singleton
public class ClanChatPlugin extends Plugin
{
private static final int MAX_CHATS = 20;
@@ -112,9 +113,6 @@ public class ClanChatPlugin extends Plugin
@Inject
private ClientThread clientThread;
-
- @Inject
- private ChatMessageManager chatMessageManager;
private List chats = new ArrayList<>();
@@ -132,6 +130,17 @@ public class ClanChatPlugin extends Plugin
private Map activityBuffer = new HashMap<>();
private int clanJoinedTick;
+ private boolean clanChatIcons;
+ private boolean recentChats;
+ private boolean showClanCounter;
+ private String chatsData;
+ private boolean showJoinLeave;
+ private ClanMemberRank joinLeaveRank;
+ private boolean privateMessageIcons;
+ private boolean publicChatIcons;
+ private boolean clanTabChat;
+ private String clanname;
+
@Provides
ClanChatConfig getConfig(ConfigManager configManager)
{
@@ -141,6 +150,7 @@ public class ClanChatPlugin extends Plugin
@Override
public void startUp()
{
+ updateConfig();
chats = new ArrayList<>(Text.fromCSV(config.chatsData()));
}
@@ -157,12 +167,14 @@ public class ClanChatPlugin extends Plugin
{
if (configChanged.getGroup().equals("clanchat"))
{
- if (!config.recentChats())
+ updateConfig();
+
+ if (!this.recentChats)
{
resetClanChats();
}
- if (config.showClanCounter())
+ if (this.showClanCounter)
{
clientThread.invoke(this::addClanCounter);
}
@@ -200,8 +212,8 @@ public class ClanChatPlugin extends Plugin
return;
}
- if (!config.showJoinLeave() ||
- member.getRank().getValue() < config.joinLeaveRank().getValue())
+ if (!this.showJoinLeave ||
+ member.getRank().getValue() < this.joinLeaveRank.getValue())
{
return;
}
@@ -245,8 +257,8 @@ public class ClanChatPlugin extends Plugin
}
}
- if (!config.showJoinLeave() ||
- member.getRank().getValue() < config.joinLeaveRank().getValue())
+ if (!this.showJoinLeave ||
+ member.getRank().getValue() < this.joinLeaveRank.getValue())
{
return;
}
@@ -271,7 +283,7 @@ public class ClanChatPlugin extends Plugin
return;
}
- client.setVar(VarClientStr.RECENT_CLAN_CHAT, config.clanname());
+ client.setVar(VarClientStr.RECENT_CLAN_CHAT, this.clanname);
Widget clanChatTitleWidget = client.getWidget(WidgetInfo.CLAN_CHAT_TITLE);
if (clanChatTitleWidget != null)
@@ -282,7 +294,7 @@ public class ClanChatPlugin extends Plugin
{
clanChatTitleWidget.setText(CLAN_CHAT_TITLE + " (" + client.getClanChatCount() + "/100)");
}
- else if (config.recentChats() && clanChatList.getChildren() == null && !Strings.isNullOrEmpty(owner.getText()))
+ else if (this.recentChats && clanChatList.getChildren() == null && !Strings.isNullOrEmpty(owner.getText()))
{
clanChatTitleWidget.setText(RECENT_TITLE);
@@ -290,7 +302,7 @@ public class ClanChatPlugin extends Plugin
}
}
- if (!config.showJoinLeave())
+ if (!this.showJoinLeave)
{
return;
}
@@ -373,7 +385,7 @@ public class ClanChatPlugin extends Plugin
channelColor = CHAT_CLAN_NAME_TRANSPARENT_BACKGROUND;
}
- if (config.clanChatIcons() && rank != null && rank != ClanMemberRank.UNRANKED)
+ if (this.clanChatIcons && rank != null && rank != ClanMemberRank.UNRANKED)
{
rankIcon = clanManager.getIconNumber(rank);
}
@@ -405,7 +417,7 @@ public class ClanChatPlugin extends Plugin
@Subscribe
public void onVarClientStrChanged(VarClientStrChanged strChanged)
{
- if (strChanged.getIndex() == VarClientStr.RECENT_CLAN_CHAT.getIndex() && config.recentChats())
+ if (strChanged.getIndex() == VarClientStr.RECENT_CLAN_CHAT.getIndex() && this.recentChats)
{
updateRecentChat(client.getVar(VarClientStr.RECENT_CLAN_CHAT));
}
@@ -428,20 +440,20 @@ public class ClanChatPlugin extends Plugin
{
case PRIVATECHAT:
case MODPRIVATECHAT:
- if (!config.privateMessageIcons())
+ if (!this.privateMessageIcons)
{
return;
}
break;
case PUBLICCHAT:
case MODCHAT:
- if (!config.publicChatIcons())
+ if (!this.publicChatIcons)
{
return;
}
break;
case FRIENDSCHAT:
- if (!config.clanChatIcons())
+ if (!this.clanChatIcons)
{
return;
}
@@ -515,7 +527,7 @@ public class ClanChatPlugin extends Plugin
final int[] intStack = client.getIntStack();
final int size = client.getIntStackSize();
- intStack[size - 1] = config.clanTabChat() ? 1 : 0;
+ intStack[size - 1] = this.clanTabChat ? 1 : 0;
}
int getClanAmount()
@@ -617,7 +629,10 @@ public class ClanChatPlugin extends Plugin
chats.remove(0);
}
- config.chatsData(Text.toCSV(chats));
+ String csvText = Text.toCSV(chats);
+
+ config.chatsData(csvText);
+ this.chatsData = csvText;
}
private void removeClanCounter()
@@ -628,7 +643,7 @@ public class ClanChatPlugin extends Plugin
private void addClanCounter()
{
- if (!config.showClanCounter() || clanMemberCounter != null || clanMembers.isEmpty())
+ if (!this.showClanCounter || clanMemberCounter != null || clanMembers.isEmpty())
{
return;
}
@@ -637,4 +652,18 @@ public class ClanChatPlugin extends Plugin
clanMemberCounter = new ClanChatIndicator(image, this);
infoBoxManager.addInfoBox(clanMemberCounter);
}
+
+ private void updateConfig()
+ {
+ this.clanChatIcons = config.clanChatIcons();
+ this.recentChats = config.recentChats();
+ this.showClanCounter = config.showClanCounter();
+ this.chatsData = config.chatsData();
+ this.showJoinLeave = config.showJoinLeave();
+ this.joinLeaveRank = config.joinLeaveRank();
+ this.privateMessageIcons = config.privateMessageIcons();
+ this.publicChatIcons = config.publicChatIcons();
+ this.clanTabChat = config.clanTabChat();
+ this.clanname = config.clanname();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java
index be94ee06f3..d0b8e79c9c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java
@@ -19,7 +19,7 @@ public class ClanManModeMinimapOverlay extends Overlay
private final ClanManModeConfig config;
@Inject
- private ClanManModeMinimapOverlay(ClanManModeConfig config, ClanManModeService ClanManModeService)
+ private ClanManModeMinimapOverlay(final ClanManModeConfig config, final ClanManModeService ClanManModeService)
{
this.config = config;
this.ClanManModeService = ClanManModeService;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java
index 4cfc1cd6ad..e616ad7486 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java
@@ -20,7 +20,7 @@ public class ClanManModeOverlay extends Overlay
private final ClanManModeConfig config;
@Inject
- private ClanManModeOverlay(ClanManModeConfig config, ClanManModeService ClanManModeService)
+ private ClanManModeOverlay(final ClanManModeConfig config, final ClanManModeService ClanManModeService)
{
this.config = config;
this.ClanManModeService = ClanManModeService;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java
index 65f6bbe8a2..dbee4e7291 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java
@@ -5,6 +5,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Player;
@@ -27,7 +28,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
type = PluginType.PVP,
enabledByDefault = false
)
-
+@Singleton
public class ClanManModePlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java
index c84072e94e..ca32c5892d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java
@@ -20,7 +20,7 @@ public class ClanManModeService
private final ClanManModePlugin plugin;
@Inject
- private ClanManModeService(Client client, ClanManModeConfig config, ClanManModePlugin plugin)
+ private ClanManModeService(final Client client, final ClanManModeConfig config, final ClanManModePlugin plugin)
{
this.config = config;
this.client = client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java
index 5aea2e108f..8a70eef7c6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java
@@ -4,19 +4,21 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Polygon;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
public class ClanManModeTileOverlay extends Overlay
{
private final ClanManModeService ClanManModeService;
private final ClanManModeConfig config;
@Inject
- private ClanManModeTileOverlay(ClanManModeConfig config, ClanManModeService ClanManModeService)
+ private ClanManModeTileOverlay(final ClanManModeConfig config, final ClanManModeService ClanManModeService)
{
this.config = config;
this.ClanManModeService = ClanManModeService;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java
index ecaa85b8ba..bf6c3d85d5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.cluescrolls;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
@@ -36,6 +37,7 @@ import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
+@Singleton
class ClueScrollEmoteOverlay extends Overlay
{
private final ClueScrollPlugin plugin;
@@ -44,7 +46,7 @@ class ClueScrollEmoteOverlay extends Overlay
private boolean hasScrolled;
@Inject
- private ClueScrollEmoteOverlay(ClueScrollPlugin plugin, Client client)
+ private ClueScrollEmoteOverlay(final ClueScrollPlugin plugin, final Client client)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_WIDGETS);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java
index 2b44290fb5..19e0b5b01e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
@@ -37,6 +38,7 @@ import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
+@Singleton
class ClueScrollMusicOverlay extends Overlay
{
private static final Rectangle PADDING = new Rectangle(2, 1, 0, 1);
@@ -47,7 +49,7 @@ class ClueScrollMusicOverlay extends Overlay
private boolean hasScrolled;
@Inject
- private ClueScrollMusicOverlay(ClueScrollPlugin plugin, Client client)
+ private ClueScrollMusicOverlay(final ClueScrollPlugin plugin, final Client client)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_WIDGETS);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java
index 0f95a3c940..9347f28de5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import static net.runelite.api.ItemID.SPADE;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.client.plugins.cluescrolls.clues.ClueScroll;
@@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.components.ComponentConstants;
import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
public class ClueScrollOverlay extends Overlay
{
private static final ItemRequirement HAS_SPADE = new SingleItemRequirement(SPADE);
@@ -53,7 +55,7 @@ public class ClueScrollOverlay extends Overlay
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- private ClueScrollOverlay(ClueScrollPlugin plugin)
+ private ClueScrollOverlay(final ClueScrollPlugin plugin)
{
super(plugin);
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
index 742decdd0d..98498a40fb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
@@ -41,6 +41,7 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Stream;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ChatMessageType;
@@ -108,6 +109,7 @@ import net.runelite.client.util.Text;
tags = {"arrow", "hints", "world", "map", "coordinates", "emotes"}
)
@Slf4j
+@Singleton
public class ClueScrollPlugin extends Plugin
{
private static final Color HIGHLIGHT_BORDER_COLOR = Color.ORANGE;
@@ -164,6 +166,8 @@ public class ClueScrollPlugin extends Plugin
private final TextComponent textComponent = new TextComponent();
+ private boolean displayHintArrows;
+
@Provides
ClueScrollConfig getConfig(ConfigManager configManager)
{
@@ -179,6 +183,7 @@ public class ClueScrollPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ this.displayHintArrows = config.displayHintArrows();
overlayManager.add(clueScrollOverlay);
overlayManager.add(clueScrollEmoteOverlay);
overlayManager.add(clueScrollWorldOverlay);
@@ -274,7 +279,7 @@ public class ClueScrollPlugin extends Plugin
worldMapPointsSet = false;
npcsToMark.clear();
- if (config.displayHintArrows())
+ if (this.displayHintArrows)
{
client.clearHintArrow();
}
@@ -313,9 +318,13 @@ public class ClueScrollPlugin extends Plugin
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
- if (event.getGroup().equals("cluescroll") && !config.displayHintArrows())
+ if (event.getGroup().equals("cluescroll"))
{
- client.clearHintArrow();
+ this.displayHintArrows = config.displayHintArrows();
+ if (!this.displayHintArrows)
+ {
+ client.clearHintArrow();
+ }
}
}
@@ -366,7 +375,7 @@ public class ClueScrollPlugin extends Plugin
if (location != null)
{
// Only set the location hint arrow if we do not already have more accurate location
- if (config.displayHintArrows()
+ if (this.displayHintArrows
&& (client.getHintArrowNpc() == null
|| !npcsToMark.contains(client.getHintArrowNpc())))
{
@@ -455,7 +464,7 @@ public class ClueScrollPlugin extends Plugin
worldMapPointsSet = false;
npcsToMark.clear();
- if (config.displayHintArrows())
+ if (this.displayHintArrows)
{
client.clearHintArrow();
}
@@ -698,7 +707,7 @@ public class ClueScrollPlugin extends Plugin
}
}
- if (!npcsToMark.isEmpty() && config.displayHintArrows())
+ if (!npcsToMark.isEmpty() && this.displayHintArrows)
{
// Always set hint arrow to first seen NPC
client.setHintArrow(npcsToMark.get(0));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java
index 3dd2d55a33..53887d80c6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java
@@ -35,7 +35,7 @@ class ClueScrollServiceImpl implements ClueScrollService
private final ClueScrollPlugin plugin;
@Inject
- private ClueScrollServiceImpl(ClueScrollPlugin plugin)
+ private ClueScrollServiceImpl(final ClueScrollPlugin plugin)
{
this.plugin = plugin;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java
index 45fa1f874c..0ee530285c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java
@@ -36,7 +36,7 @@ class ClueScrollWorldMapPoint extends WorldMapPoint
private final BufferedImage clueScrollWorldImage;
private final Point clueScrollWorldImagePoint;
- ClueScrollWorldMapPoint(final WorldPoint worldPoint, ClueScrollPlugin plugin)
+ ClueScrollWorldMapPoint(final WorldPoint worldPoint, final ClueScrollPlugin plugin)
{
super(worldPoint, null);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java
index d68f06a691..0c4598043b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java
@@ -28,11 +28,13 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.plugins.cluescrolls.clues.ClueScroll;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
+@Singleton
public class ClueScrollWorldOverlay extends Overlay
{
public static final int IMAGE_Z_OFFSET = 30;
@@ -44,7 +46,7 @@ public class ClueScrollWorldOverlay extends Overlay
private final ClueScrollPlugin plugin;
@Inject
- private ClueScrollWorldOverlay(ClueScrollPlugin plugin)
+ private ClueScrollWorldOverlay(final ClueScrollPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java
index 24b14895c9..162aeca40a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java
@@ -25,6 +25,9 @@
package net.runelite.client.plugins.combatcounter;
import com.google.inject.Provides;
+import java.awt.Color;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.api.Actor;
@@ -35,6 +38,7 @@ import net.runelite.api.NPCDefinition;
import net.runelite.api.Player;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.AnimationChanged;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.HitsplatApplied;
import net.runelite.api.kit.KitType;
@@ -59,7 +63,7 @@ import java.util.Map;
type = PluginType.UTILITY,
enabledByDefault = false
)
-
+@Singleton
public class CombatCounter extends Plugin
{
@@ -79,16 +83,30 @@ public class CombatCounter extends Plugin
private CombatCounterConfig config;
private boolean instanced = false;
- private boolean prevInstance = false;
- @Setter
- @Getter
- private Map counter = new HashMap();
- private long BLOWPIPE_ID = 5061;
+ @Setter(AccessLevel.PACKAGE)
+ @Getter(AccessLevel.PACKAGE)
+ private Map counter = new HashMap<>();
private Map blowpipe = new HashMap<>();
- public Map npcDamageMap = new HashMap();
- public Map playerDamage = new HashMap();
+ private Map npcDamageMap = new HashMap<>();
+ Map playerDamage = new HashMap<>();
+
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showTickCounter;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showDamageCounter;
+ private boolean resetOnNewInstance;
+ @Getter(AccessLevel.PACKAGE)
+ private Color selfColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color totalColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color otherColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color bgColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color titleColor;
@Provides
CombatCounterConfig provideConfig(ConfigManager configManager)
@@ -96,8 +114,6 @@ public class CombatCounter extends Plugin
return configManager.getConfig(CombatCounterConfig.class);
}
-
-
private Map variables = new HashMap()
{
{
@@ -157,7 +173,7 @@ public class CombatCounter extends Plugin
}
};
- public List MELEE_ANIMATIONS = new ArrayList()
+ private List MELEE_ANIMATIONS = new ArrayList()
{
{
this.add(422); // Unarmed Punch, Block
@@ -201,7 +217,7 @@ public class CombatCounter extends Plugin
}
};
- public List RANGE_ANIMATIONS = new ArrayList()
+ private List RANGE_ANIMATIONS = new ArrayList()
{
{
this.add(7552); // Armadyl Crossbow Accurate, Rapid, Longrange, Special
@@ -214,7 +230,7 @@ public class CombatCounter extends Plugin
}
};
- public List MAGE_ANIMATIONS = new ArrayList()
+ private List MAGE_ANIMATIONS = new ArrayList()
{
{
this.add(1167); // Trident Accurate, Accurate, Longrange
@@ -226,6 +242,8 @@ public class CombatCounter extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(tickOverlay);
overlayManager.add(damageOverlay);
@@ -252,7 +270,7 @@ public class CombatCounter extends Plugin
{
Actor actor = event.getActor();
- if (actor != null && actor instanceof Player)
+ if (actor instanceof Player)
{
Player p = (Player) actor;
String name = actor.getName();
@@ -276,6 +294,7 @@ public class CombatCounter extends Plugin
counter.put(name, ticks);
counter = sortByValue(counter);
+ long BLOWPIPE_ID = 5061;
if (animation == BLOWPIPE_ID)
{
this.blowpipe.put(name, -4L);
@@ -285,11 +304,11 @@ public class CombatCounter extends Plugin
* This part handles the Damage Counter.
*/
Actor interacting = actor.getInteracting();
- if (interacting != null && interacting instanceof NPC)
+ if (interacting instanceof NPC)
{
NPC npc = (NPC) interacting;
- List actives = new ArrayList();
+ List actives = new ArrayList<>();
actives.add(npc);
if (animation == 1979 || animation == 7618)
@@ -340,7 +359,7 @@ public class CombatCounter extends Plugin
if (delay != -1)
{
- List ticksToAdd = new ArrayList();
+ List ticksToAdd = new ArrayList<>();
ticksToAdd.add(delay);
if (canFarcast && delay > 2)
@@ -348,7 +367,7 @@ public class CombatCounter extends Plugin
ticksToAdd.add(delay - 1);
}
- /**
+ /*
* Dragon Claw Specials are 2 ticks long.
*/
if (animation == 7514)
@@ -364,7 +383,7 @@ public class CombatCounter extends Plugin
for (Integer tick : ticksToAdd)
{
- List attackers = new ArrayList();
+ List attackers = new ArrayList<>();
if (dc.attackers.containsKey(tick))
attackers = dc.attackers.get(tick);
@@ -389,9 +408,9 @@ public class CombatCounter extends Plugin
@Subscribe
public void onGameTick(GameTick event)
{
- if (config.resetOnNewInstance())
+ if (this.resetOnNewInstance)
{
- prevInstance = instanced;
+ boolean prevInstance = instanced;
instanced = client.isInInstancedRegion();
if (!prevInstance && instanced)
{
@@ -402,19 +421,19 @@ public class CombatCounter extends Plugin
}
}
- Map visible = new HashMap();
+ Map visible = new HashMap<>();
for (Player p : this.client.getPlayers())
{
if (p.getName() != null)
visible.put(p.getName(), p);
}
- for (NPC npc : new ArrayList(this.npcDamageMap.keySet()))
+ for (NPC npc : new ArrayList<>(this.npcDamageMap.keySet()))
{
NPCDamageCounter counter = this.npcDamageMap.get(npc);
Map> attackers = counter.attackers;
- for (Integer i : new ArrayList(attackers.keySet()))
+ for (Integer i : new ArrayList<>(attackers.keySet()))
{
List p = attackers.get(i);
attackers.put(i - 1, p);
@@ -455,7 +474,7 @@ public class CombatCounter extends Plugin
// this.playerDamage.put(name, count);
// }
- for (Integer i : new ArrayList(attackers.keySet()))
+ for (Integer i : new ArrayList<>(attackers.keySet()))
if (i <= -1)
attackers.remove(i);
@@ -465,7 +484,7 @@ public class CombatCounter extends Plugin
this.playerDamage = sortByValue(this.playerDamage);
- for (String user : new ArrayList(blowpipe.keySet()))
+ for (String user : new ArrayList<>(blowpipe.keySet()))
{
if (visible.containsKey(user))
{
@@ -481,7 +500,7 @@ public class CombatCounter extends Plugin
Player p = visible.get(user);
Actor interacting = p.getInteracting();
- if (interacting != null && interacting instanceof NPC)
+ if (interacting instanceof NPC)
{
NPC npc = (NPC) interacting;
@@ -493,14 +512,14 @@ public class CombatCounter extends Plugin
int delay = this.calculateBPDelay(distance);
- List counts = new ArrayList();
+ List counts = new ArrayList<>();
counts.add(delay);
if (delay > 2)
counts.add(delay - 1);
for (int tick : counts)
{
- List attackers = new ArrayList();
+ List attackers = new ArrayList<>();
if (dc.attackers.containsKey(tick))
attackers = dc.attackers.get(tick);
@@ -553,7 +572,7 @@ public class CombatCounter extends Plugin
return result;
}
- public int calculateDistance(Player p, NPC npc)
+ private int calculateDistance(Player p, NPC npc)
{
int size = 1;
NPCDefinition comp = npc.getTransformedDefinition();
@@ -582,23 +601,44 @@ public class CombatCounter extends Plugin
return distance;
}
- public int calculateBPDelay(double distance)
+ private int calculateBPDelay(double distance)
{
return 2 + (int) Math.floor(distance / 6d);
}
- public int calculateChinDelay(double distance)
+ private int calculateChinDelay(double distance)
{
return 2 + (int) Math.floor(distance / 6d);
}
- public int calculateMageDelay(double distance)
+ private int calculateMageDelay(double distance)
{
return 2 + (int) Math.floor((1d + distance) / 3d);
}
- public int calculateRangedDelay(double distance)
+ private int calculateRangedDelay(double distance)
{
return 2 + (int) Math.floor((3d + distance) / 6d);
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (event.getGroup().equals("combatcounter"))
+ {
+ updateConfig();
+ }
+ }
+
+ private void updateConfig()
+ {
+ this.showTickCounter = config.showTickCounter();
+ this.showDamageCounter = config.showDamageCounter();
+ this.resetOnNewInstance = config.resetOnNewInstance();
+ this.selfColor = config.selfColor();
+ this.totalColor = config.totalColor();
+ this.otherColor = config.otherColor();
+ this.bgColor = config.bgColor();
+ this.titleColor = config.titleColor();
+ }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java
index 7f97d6ab42..dd0a2cc25c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java
@@ -26,9 +26,9 @@ package net.runelite.client.plugins.combatcounter;
import java.awt.Dimension;
import java.awt.Graphics2D;
-import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.api.Player;
@@ -42,17 +42,16 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.util.ColorUtil;
+@Singleton
class CombatOverlay extends Overlay
{
private final Client client;
private final CombatCounter plugin;
private final PanelComponent panelComponent = new PanelComponent();
- private final CombatCounterConfig config;
- private HashMap ticks = new HashMap<>();
@Inject
- public CombatOverlay(Client client, CombatCounter plugin, CombatCounterConfig config)
+ public CombatOverlay(final Client client, final CombatCounter plugin)
{
super(plugin);
@@ -60,7 +59,6 @@ class CombatOverlay extends Overlay
setPosition(OverlayPosition.DETACHED);
setPosition(OverlayPosition.BOTTOM_RIGHT);
- this.config = config;
this.client = client;
this.plugin = plugin;
@@ -70,7 +68,7 @@ class CombatOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (config.showTickCounter())
+ if (plugin.isShowTickCounter())
{
panelComponent.getChildren().clear();
@@ -79,8 +77,8 @@ class CombatOverlay extends Overlay
{
return null;
}
- panelComponent.setBackgroundColor(config.bgColor());
- panelComponent.getChildren().add(TitleComponent.builder().text("Tick Counter").color(config.titleColor()).build());
+ panelComponent.setBackgroundColor(plugin.getBgColor());
+ panelComponent.getChildren().add(TitleComponent.builder().text("Tick Counter").color(plugin.getTitleColor()).build());
int total = 0;
TableComponent tableComponent = new TableComponent();
@@ -102,22 +100,22 @@ class CombatOverlay extends Overlay
{
if (client.getLocalPlayer().getName().contains(name))
{
- tableComponent.addRow(ColorUtil.prependColorTag(name, config.selfColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), config.selfColor()));
+ tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), plugin.getSelfColor()));
}
else
{
- tableComponent.addRow(ColorUtil.prependColorTag(name, config.otherColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), config.otherColor()));
+ tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), plugin.getOtherColor()));
}
total += map.get(name);
}
if (!map.containsKey(local.getName()))
{
- tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), config.selfColor()), ColorUtil.prependColorTag("0", config.selfColor()));
+ tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), plugin.getSelfColor()), ColorUtil.prependColorTag("0", plugin.getSelfColor()));
}
}
- tableComponent.addRow(ColorUtil.prependColorTag("Total:", config.totalColor()), ColorUtil.prependColorTag(String.valueOf(total), config.totalColor()));
+ tableComponent.addRow(ColorUtil.prependColorTag("Total:", plugin.getTotalColor()), ColorUtil.prependColorTag(String.valueOf(total), plugin.getTotalColor()));
if (!tableComponent.isEmpty())
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java
index 998246ccf2..0e2cd5109e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.api.Player;
@@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.util.ColorUtil;
+@Singleton
class DamageOverlay extends Overlay
{
@@ -48,12 +50,10 @@ class DamageOverlay extends Overlay
private final CombatCounter plugin;
- private final CombatCounterConfig config;
-
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- public DamageOverlay(Client client, CombatCounter plugin, CombatCounterConfig config)
+ public DamageOverlay(final Client client, final CombatCounter plugin)
{
super(plugin);
@@ -61,7 +61,6 @@ class DamageOverlay extends Overlay
setPosition(OverlayPosition.DETACHED);
setPosition(OverlayPosition.BOTTOM_RIGHT);
- this.config = config;
this.client = client;
this.plugin = plugin;
@@ -71,7 +70,7 @@ class DamageOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (config.showDamageCounter())
+ if (plugin.isShowDamageCounter())
{
panelComponent.getChildren().clear();
@@ -80,8 +79,8 @@ class DamageOverlay extends Overlay
{
return null;
}
- panelComponent.setBackgroundColor(config.bgColor());
- panelComponent.getChildren().add(TitleComponent.builder().text("Damage Counter").color(config.titleColor()).build());
+ panelComponent.setBackgroundColor(plugin.getBgColor());
+ panelComponent.getChildren().add(TitleComponent.builder().text("Damage Counter").color(plugin.getTitleColor()).build());
TableComponent tableComponent = new TableComponent();
tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
@@ -103,17 +102,17 @@ class DamageOverlay extends Overlay
String val = String.format("%.1f", map.get(name));
if (client.getLocalPlayer().getName().contains(name))
{
- tableComponent.addRow(ColorUtil.prependColorTag(name, config.selfColor()), ColorUtil.prependColorTag(val, config.selfColor()));
+ tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(val, plugin.getSelfColor()));
}
else
{
- tableComponent.addRow(ColorUtil.prependColorTag(name, config.otherColor()), ColorUtil.prependColorTag(val, config.otherColor()));
+ tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(val, plugin.getOtherColor()));
}
}
if (!map.containsKey(local.getName()))
{
- tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), config.selfColor()), ColorUtil.prependColorTag("0", config.selfColor()));
+ tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), plugin.getSelfColor()), ColorUtil.prependColorTag("0", plugin.getSelfColor()));
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java
index ef55777b59..2c5a848c89 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java
@@ -4,17 +4,19 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import javax.inject.Singleton;
-public class NPCDamageCounter
+@Singleton
+class NPCDamageCounter
{
- public Map> attackers;
+ Map> attackers;
- public List damage;
+ List damage;
- public NPCDamageCounter()
+ NPCDamageCounter()
{
- this.attackers = new TreeMap>();
- this.damage = new ArrayList();
+ this.attackers = new TreeMap<>();
+ this.damage = new ArrayList<>();
}
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java
index 3083e02cac..92c567aab9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Experience;
import net.runelite.api.Skill;
@@ -39,19 +40,20 @@ import net.runelite.client.ui.overlay.tooltip.Tooltip;
import net.runelite.client.ui.overlay.tooltip.TooltipManager;
import net.runelite.client.util.ColorUtil;
+@Singleton
class CombatLevelOverlay extends Overlay
{
private static final Color COMBAT_LEVEL_COLOUR = new Color(0xff981f);
private final Client client;
- private final CombatLevelConfig config;
+ private final CombatLevelPlugin plugin;
private final TooltipManager tooltipManager;
@Inject
- private CombatLevelOverlay(Client client, CombatLevelConfig config, TooltipManager tooltipManager)
+ private CombatLevelOverlay(final Client client, final CombatLevelPlugin plugin, final TooltipManager tooltipManager)
{
this.client = client;
- this.config = config;
+ this.plugin = plugin;
this.tooltipManager = tooltipManager;
}
@@ -59,7 +61,7 @@ class CombatLevelOverlay extends Overlay
public Dimension render(Graphics2D graphics)
{
Widget combatLevelWidget = client.getWidget(WidgetInfo.COMBAT_LEVEL);
- if (!config.showLevelsUntil()
+ if (!plugin.isShowLevelsUntil()
|| client.getLocalPlayer().getCombatLevel() == Experience.MAX_COMBAT_LEVEL
|| combatLevelWidget == null || combatLevelWidget.isHidden())
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java
index e466e939f4..a2db038077 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java
@@ -30,6 +30,9 @@ import java.text.DecimalFormat;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.Experience;
import net.runelite.api.GameState;
@@ -52,6 +55,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
description = "Show a more accurate combat level in Combat Options panel and other combat level functions",
tags = {"wilderness", "attack", "range"}
)
+@Singleton
public class CombatLevelPlugin extends Plugin
{
private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.###");
@@ -80,6 +84,10 @@ public class CombatLevelPlugin extends Plugin
@Inject
private OverlayManager overlayManager;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showLevelsUntil;
+ private boolean wildernessAttackLevelRange;
+
@Provides
CombatLevelConfig provideConfig(ConfigManager configManager)
{
@@ -89,9 +97,11 @@ public class CombatLevelPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(overlay);
- if (config.wildernessAttackLevelRange())
+ if (this.wildernessAttackLevelRange)
{
appendAttackLevelRangeText();
}
@@ -151,7 +161,9 @@ public class CombatLevelPlugin extends Plugin
return;
}
- if (config.wildernessAttackLevelRange())
+ updateConfig();
+
+ if (this.wildernessAttackLevelRange)
{
appendAttackLevelRangeText();
}
@@ -164,7 +176,7 @@ public class CombatLevelPlugin extends Plugin
@Subscribe
public void onScriptCallbackEvent(ScriptCallbackEvent event)
{
- if (config.wildernessAttackLevelRange()
+ if (this.wildernessAttackLevelRange
&& "wildernessWidgetTextSet".equals(event.getEventName()))
{
appendAttackLevelRangeText();
@@ -241,4 +253,10 @@ public class CombatLevelPlugin extends Plugin
{
return Math.max(MIN_COMBAT_LEVEL, combatLevel - wildernessLevel) + "-" + Math.min(Experience.MAX_COMBAT_LEVEL, combatLevel + wildernessLevel);
}
+
+ private void updateConfig()
+ {
+ this.showLevelsUntil = config.showLevelsUntil();
+ this.wildernessAttackLevelRange = config.showLevelsUntil();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
index b80d912bc4..4d569f827c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
@@ -50,6 +50,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import java.util.stream.Collectors;
+import javax.inject.Singleton;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
@@ -113,6 +114,7 @@ import net.runelite.client.util.Text;
import org.apache.commons.lang3.StringUtils;
@Slf4j
+@Singleton
public class ConfigPanel extends PluginPanel
{
private static final int SPINNER_FIELD_WIDTH = 6;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
index 2004675a05..a4520ebbd1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.config;
import java.awt.image.BufferedImage;
import java.util.concurrent.ScheduledExecutorService;
import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.swing.SwingUtilities;
import net.runelite.api.MenuAction;
import net.runelite.client.config.ChatColorConfig;
@@ -39,7 +40,6 @@ import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginManager;
import net.runelite.client.ui.ClientToolbar;
-import net.runelite.client.ui.ClientUI;
import net.runelite.client.ui.NavigationButton;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayMenuEntry;
@@ -50,10 +50,9 @@ import net.runelite.client.util.ImageUtil;
loadWhenOutdated = true,
hidden = true // prevent users from disabling
)
+@Singleton
public class ConfigPlugin extends Plugin
{
- @Inject
- private ClientUI clientUI;
@Inject
private ClientToolbar clientToolbar;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java
index 585ade5ea6..98fc840a7c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java
@@ -26,17 +26,20 @@ package net.runelite.client.plugins.config;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
+import javax.inject.Singleton;
import javax.swing.JButton;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.client.config.Keybind;
import net.runelite.client.config.ModifierlessKeybind;
+@Singleton
public class HotkeyButton extends JButton
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Keybind value;
- public HotkeyButton(Keybind value, boolean modifierless)
+ HotkeyButton(Keybind value, boolean modifierless)
{
setValue(value);
addActionListener(e ->
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
index 3cd10af230..22065fc7df 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
@@ -32,6 +32,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.annotation.Nullable;
+import javax.inject.Singleton;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -47,6 +48,7 @@ import net.runelite.client.ui.components.IconButton;
import net.runelite.client.util.ImageUtil;
import org.apache.commons.text.similarity.JaroWinklerDistance;
+@Singleton
public class PluginListItem extends JPanel
{
private static final JaroWinklerDistance DISTANCE = new JaroWinklerDistance();
@@ -74,10 +76,10 @@ public class PluginListItem extends JPanel
@Getter(AccessLevel.PACKAGE)
public final ConfigDescriptor configDescriptor;
- @Getter
+ @Getter(AccessLevel.PUBLIC)
private final String name;
- @Getter
+ @Getter(AccessLevel.PUBLIC)
private final String description;
private final List keywords = new ArrayList<>();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java
index a7bad8d813..7b71bfad11 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java
@@ -32,6 +32,7 @@ import java.text.DecimalFormat;
import java.time.Instant;
import java.time.Duration;
import javax.inject.Inject;
+import javax.inject.Singleton;
import static net.runelite.api.AnimationID.COOKING_FIRE;
import static net.runelite.api.AnimationID.COOKING_RANGE;
import net.runelite.api.Client;
@@ -47,6 +48,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
+@Singleton
class CookingOverlay extends Overlay
{
private static final int COOK_TIMEOUT = 3;
@@ -58,7 +60,7 @@ class CookingOverlay extends Overlay
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- private CookingOverlay(Client client, CookingPlugin plugin, XpTrackerService xpTrackerService)
+ private CookingOverlay(final Client client, final CookingPlugin plugin, final XpTrackerService xpTrackerService)
{
super(plugin);
setPosition(OverlayPosition.TOP_LEFT);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
index 976d81c4a0..96be647e3f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
@@ -30,14 +30,17 @@ import java.time.Duration;
import java.time.Instant;
import java.util.Optional;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
+import lombok.Setter;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
import net.runelite.api.GraphicID;
import net.runelite.api.ItemID;
import net.runelite.api.Player;
import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.SpotAnimationChanged;
import net.runelite.client.config.ConfigManager;
@@ -55,6 +58,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
description = "Show cooking statistics",
tags = {"overlay", "skilling", "cook"}
)
+@Singleton
@PluginDependency(XpTrackerPlugin.class)
public class CookingPlugin extends Plugin
{
@@ -79,6 +83,10 @@ public class CookingPlugin extends Plugin
@Getter(AccessLevel.PACKAGE)
private CookingSession session;
+ private int statTimeout;
+ @Setter(AccessLevel.PACKAGE)
+ private boolean fermentTimer;
+
@Provides
CookingConfig getConfig(ConfigManager configManager)
{
@@ -88,6 +96,7 @@ public class CookingPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
session = null;
overlayManager.add(overlay);
}
@@ -103,12 +112,12 @@ public class CookingPlugin extends Plugin
@Subscribe
public void onGameTick(GameTick gameTick)
{
- if (session == null || config.statTimeout() == 0)
+ if (session == null || this.statTimeout == 0)
{
return;
}
- Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+ Duration statTimeout = Duration.ofMinutes(this.statTimeout);
Duration sinceCut = Duration.between(session.getLastCookingAction(), Instant.now());
if (sinceCut.compareTo(statTimeout) >= 0)
@@ -127,7 +136,7 @@ public class CookingPlugin extends Plugin
return;
}
- if (player.getSpotAnimation() == GraphicID.WINE_MAKE && config.fermentTimer())
+ if (player.getSpotAnimation() == GraphicID.WINE_MAKE && this.fermentTimer)
{
Optional fermentTimerOpt = infoBoxManager.getInfoBoxes().stream()
.filter(FermentTimer.class::isInstance)
@@ -184,4 +193,19 @@ public class CookingPlugin extends Plugin
session.increaseBurnAmount();
}
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged configChanged)
+ {
+ if (configChanged.getGroup().equals("cooking"))
+ {
+ updateConfig();
+ }
+ }
+
+ private void updateConfig()
+ {
+ this.statTimeout = config.statTimeout();
+ this.fermentTimer = config.fermentTimer();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java
index 292e4a3584..14ad6a2722 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java
@@ -26,9 +26,11 @@
package net.runelite.client.plugins.cooking;
import java.time.Instant;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
+@Singleton
class CookingSession
{
@Getter(AccessLevel.PACKAGE)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java
index 5312414ad1..36ef995fa8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java
@@ -28,9 +28,11 @@ import java.awt.Color;
import java.awt.Image;
import java.time.Duration;
import java.time.Instant;
+import javax.inject.Singleton;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.overlay.infobox.InfoBox;
+@Singleton
final class FermentTimer extends InfoBox
{
private static final Duration FERMENT_TIME = Duration.ofMillis(13_800);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java
index 29c7dff16a..51eb6a8d88 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java
@@ -29,24 +29,23 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Polygon;
import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
import net.runelite.api.NPC;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
class CoreOverlay extends Overlay
{
- private final Client client;
private final CorpPlugin corpPlugin;
@Inject
- private CoreOverlay(Client client, CorpPlugin corpPlugin)
+ private CoreOverlay(final CorpPlugin corpPlugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
- this.client = client;
this.corpPlugin = corpPlugin;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java
index f76feec525..132075580a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.api.NPC;
@@ -48,16 +49,16 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.util.ColorUtil;
+@Singleton
class CorpDamageOverlay extends Overlay
{
private final Client client;
private final CorpPlugin corpPlugin;
- private final CorpConfig config;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- private CorpDamageOverlay(Client client, CorpPlugin corpPlugin, CorpConfig config)
+ private CorpDamageOverlay(final Client client, final CorpPlugin corpPlugin)
{
super(corpPlugin);
setPosition(OverlayPosition.TOP_LEFT);
@@ -65,7 +66,6 @@ class CorpDamageOverlay extends Overlay
setPriority(OverlayPriority.LOW);
this.client = client;
this.corpPlugin = corpPlugin;
- this.config = config;
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Corp overlay"));
}
@@ -122,7 +122,7 @@ class CorpDamageOverlay extends Overlay
}
}
- if (config.showDamage())
+ if (corpPlugin.isShowDamage())
{
tableComponent.addRow("Your damage", ColorUtil.prependColorTag(Integer.toString(myDamage), damageForKill > 0 && myDamage >= damageForKill ? Color.GREEN : Color.RED));
tableComponent.addRow("Total damage:", Integer.toString(totalDamage));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java
index 627c9091e8..d4c815f7eb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java
@@ -41,6 +41,7 @@ import net.runelite.api.MenuEntry;
import net.runelite.api.NPC;
import net.runelite.api.NpcID;
import net.runelite.api.Varbits;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.HitsplatApplied;
import net.runelite.api.events.InteractingChanged;
@@ -101,6 +102,10 @@ public class CorpPlugin extends Plugin
@Inject
private CorpConfig config;
+ private boolean leftClickCore;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showDamage;
+
@Provides
CorpConfig getConfig(ConfigManager configManager)
{
@@ -110,6 +115,8 @@ public class CorpPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(corpOverlay);
overlayManager.add(coreOverlay);
}
@@ -229,7 +236,7 @@ public class CorpPlugin extends Plugin
public void onMenuEntryAdded(MenuEntryAdded menuEntryAdded)
{
if (menuEntryAdded.getType() != NPC_SECTION_ACTION
- || !config.leftClickCore() || !menuEntryAdded.getOption().equals(ATTACK))
+ || !this.leftClickCore || !menuEntryAdded.getOption().equals(ATTACK))
{
return;
}
@@ -248,4 +255,19 @@ public class CorpPlugin extends Plugin
menuEntry.setType(NPC_SECTION_ACTION + MENU_ACTION_DEPRIORITIZE_OFFSET);
client.setMenuEntries(menuEntries);
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged configChanged)
+ {
+ if (configChanged.getGroup().equals("corp"))
+ {
+ updateConfig();
+ }
+ }
+
+ private void updateConfig()
+ {
+ this.leftClickCore = config.leftClickCore();
+ this.showDamage = config.showDamage();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java
index 55edc43f39..e69be13521 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java
@@ -32,6 +32,7 @@ import java.awt.Image;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.NpcID;
import net.runelite.api.SpriteID;
@@ -47,21 +48,20 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.util.ColorUtil;
+@Singleton
public class CoxInfoBox extends Overlay
{
private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150);
private final CoxPlugin plugin;
- private final CoxConfig config;
private final Client client;
private final SpriteManager spriteManager;
private final PanelComponent prayAgainstPanel = new PanelComponent();
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- CoxInfoBox(CoxPlugin plugin, CoxConfig config, Client client, SpriteManager spriteManager)
+ CoxInfoBox(CoxPlugin plugin, Client client, SpriteManager spriteManager)
{
this.plugin = plugin;
- this.config = config;
this.client = client;
this.spriteManager = spriteManager;
setPosition(OverlayPosition.BOTTOM_RIGHT);
@@ -79,7 +79,7 @@ public class CoxInfoBox extends Overlay
final PrayAgainst prayAgainst = plugin.getPrayAgainstOlm();
- if (plugin.getPrayAgainstOlm() == null && !config.prayAgainstOlm())
+ if (plugin.getPrayAgainstOlm() == null && !plugin.isConfigPrayAgainstOlm())
{
return null;
}
@@ -105,7 +105,7 @@ public class CoxInfoBox extends Overlay
plugin.setPrayAgainstOlm(null);
}
- if (config.vangHealth() && plugin.getVanguards() > 0)
+ if (plugin.isVangHealth() && plugin.getVanguards() > 0)
{
panelComponent.getChildren().add(TitleComponent.builder()
.text("Vanguards")
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java
index 4218f092c6..00d60e94ee 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java
@@ -31,9 +31,9 @@ import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Polygon;
-import java.util.Iterator;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import net.runelite.api.NPC;
@@ -50,18 +50,17 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
public class CoxOverlay extends Overlay
{
private final Client client;
private final CoxPlugin plugin;
- private final CoxConfig config;
@Inject
- private CoxOverlay(Client client, CoxPlugin plugin, CoxConfig config)
+ private CoxOverlay(final Client client, final CoxPlugin plugin)
{
this.client = client;
this.plugin = plugin;
- this.config = config;
setPosition(OverlayPosition.DYNAMIC);
setPriority(OverlayPriority.HIGH);
setLayer(OverlayLayer.ABOVE_SCENE);
@@ -72,13 +71,13 @@ public class CoxOverlay extends Overlay
{
for (WorldPoint point : plugin.getOlm_Heal())
{
- drawTile(graphics, point, config.tpColor(), 2, 150, 50);
+ drawTile(graphics, point, plugin.getTpColor(), 2, 150, 50);
}
for (WorldPoint point : plugin.getOlm_TP())
{
client.setHintArrow(point);
- drawTile(graphics, point, config.tpColor(), 2, 150, 50);
+ drawTile(graphics, point, plugin.getTpColor(), 2, 150, 50);
}
if (plugin.inRaid())
@@ -96,14 +95,14 @@ public class CoxOverlay extends Overlay
case NpcID.TEKTON_7545:
case NpcID.TEKTON_ENRAGED:
case NpcID.TEKTON_ENRAGED_7544:
- if (config.tekton())
+ if (plugin.isTekton())
{
hitSquares = getHitSquares(npcs.getNpc().getWorldLocation(), npcs.getNpcSize(), 1, false);
for (WorldPoint p : hitSquares)
{
- drawTile(graphics, p, config.tektonColor(), 0, 0, 50);
+ drawTile(graphics, p, plugin.getTektonColor(), 0, 0, 50);
}
- if (config.tektonTickCounter())
+ if (plugin.isTektonTickCounter())
{
ticksLeft = npcs.getTicksUntilAttack();
int attackTicksleft = plugin.getTektonAttackTicks();
@@ -119,10 +118,10 @@ public class CoxOverlay extends Overlay
}
final String ticksLeftStr = String.valueOf(ticksLeft);
Point canvasPoint = npcs.getNpc().getCanvasTextLocation(graphics, ticksLeftStr, 0);
- renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), color, canvasPoint);
+ renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), color, canvasPoint);
}
}
- if (config.tektonTickCounter())
+ if (plugin.isTektonTickCounter())
{
final int attackTicksleft = plugin.getTektonAttackTicks();
String attacksLeftStr;
@@ -143,7 +142,7 @@ public class CoxOverlay extends Overlay
if (npcs.getNpc() != null)
{
Point canvasPoint = npcs.getNpc().getCanvasTextLocation(graphics, attacksLeftStr, 0);
- renderTextLocationAbove(graphics, attacksLeftStr, config.textSize(), config.fontStyle().getFont(), attackcolor, canvasPoint);
+ renderTextLocationAbove(graphics, attacksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), attackcolor, canvasPoint);
}
}
}
@@ -152,12 +151,12 @@ public class CoxOverlay extends Overlay
case NpcID.MUTTADILE:
case NpcID.MUTTADILE_7562:
case NpcID.MUTTADILE_7563:
- if (config.muttadile())
+ if (plugin.isMuttadile())
{
hitSquares = getHitSquares(npcs.getNpc().getWorldLocation(), npcs.getNpcSize(), 1, false);
for (WorldPoint p : hitSquares)
{
- drawTile(graphics, p, config.muttaColor(), 0, 0, 50);
+ drawTile(graphics, p, plugin.getMuttaColor(), 0, 0, 50);
}
}
break;
@@ -165,15 +164,15 @@ public class CoxOverlay extends Overlay
case NpcID.GUARDIAN_7570:
case NpcID.GUARDIAN_7571:
case NpcID.GUARDIAN_7572:
- if (config.guardians())
+ if (plugin.isGuardians())
{
hitSquares = getHitSquares(npcs.getNpc().getWorldLocation(), npcs.getNpcSize(), 2, true);
for (WorldPoint p : hitSquares)
{
- drawTile(graphics, p, config.guardColor(), 0, 0, 50);
+ drawTile(graphics, p, plugin.getGuardColor(), 0, 0, 50);
}
}
- if (config.guardinTickCounter())
+ if (plugin.isGuardinTickCounter())
{
ticksLeft = npcs.getTicksUntilAttack();
if (ticksLeft > 0)
@@ -188,7 +187,7 @@ public class CoxOverlay extends Overlay
}
final String ticksLeftStr = String.valueOf(ticksLeft);
Point canvasPoint = npcs.getNpc().getCanvasTextLocation(graphics, ticksLeftStr, 0);
- renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), color, canvasPoint);
+ renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), color, canvasPoint);
}
}
break;
@@ -196,7 +195,7 @@ public class CoxOverlay extends Overlay
case NpcID.VANGUARD_7527:
case NpcID.VANGUARD_7528:
case NpcID.VANGUARD_7529:
- if (config.vangHighlight())
+ if (plugin.isVangHighlight())
{
OverlayUtil.renderPolygon(graphics, npcs.getNpc().getConvexHull(), npcs.getAttackStyle().getColor());
}
@@ -210,10 +209,10 @@ public class CoxOverlay extends Overlay
NPC olmHand = plugin.getHand();
final String tickStr = String.valueOf(tick);
Point canvasPoint = olmHand.getCanvasTextLocation(graphics, tickStr, 50);
- renderTextLocation(graphics, tickStr, config.textSize(), config.fontStyle().getFont(), Color.GRAY, canvasPoint);
+ renderTextLocation(graphics, tickStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.GRAY, canvasPoint);
}
- if (config.timers())
+ if (plugin.isTimers())
{
if (plugin.getBurnTarget().size() > 0)
{
@@ -221,7 +220,7 @@ public class CoxOverlay extends Overlay
{
final int ticksLeft = plugin.getBurnTicks();
String ticksLeftStr = String.valueOf(ticksLeft);
- Color tickcolor = new Color(255, 255, 255, 255);
+ Color tickcolor;
if (ticksLeft >= 0)
{
if (ticksLeft == 34 ||
@@ -243,7 +242,7 @@ public class CoxOverlay extends Overlay
tickcolor = new Color(255, 255, 255, 255);
}
Point canvasPoint = actor.getCanvasTextLocation(graphics, ticksLeftStr, 0);
- renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), tickcolor, canvasPoint);
+ renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), tickcolor, canvasPoint);
}
}
}
@@ -251,9 +250,9 @@ public class CoxOverlay extends Overlay
if (plugin.getAcidTarget() != null)
{
Actor actor = plugin.getAcidTarget();
- renderActorOverlay(graphics, actor, config.acidColor(), 2, 100, 10);
+ renderActorOverlay(graphics, actor, plugin.getAcidColor(), 2, 100, 10);
final int ticksLeft = plugin.getAcidTicks();
- Color tickcolor = new Color(255, 255, 255, 255);
+ Color tickcolor;
if (ticksLeft > 0)
{
if (ticksLeft > 1)
@@ -266,12 +265,12 @@ public class CoxOverlay extends Overlay
}
final String ticksLeftStr = String.valueOf(ticksLeft);
Point canvasPoint = actor.getCanvasTextLocation(graphics, ticksLeftStr, 0);
- renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), tickcolor, canvasPoint);
+ renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), tickcolor, canvasPoint);
}
}
}
- if (config.tpOverlay())
+ if (plugin.isTpOverlay())
{
if (plugin.getTeleportTarget() != null)
{
@@ -283,7 +282,7 @@ public class CoxOverlay extends Overlay
{
NPC boss = plugin.getOlm_NPC();
- if (config.olmTick())
+ if (plugin.isOlmTick())
{
if (boss != null)
{
@@ -329,7 +328,7 @@ public class CoxOverlay extends Overlay
}
final String combinedStr = cycleStr + ":" + tickStr;
Point canvasPoint = boss.getCanvasTextLocation(graphics, combinedStr, 130);
- renderTextLocation(graphics, combinedStr, config.textSize(), config.fontStyle().getFont(), Color.WHITE, canvasPoint);
+ renderTextLocation(graphics, combinedStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.WHITE, canvasPoint);
}
}
}
@@ -412,7 +411,7 @@ public class CoxOverlay extends Overlay
final Point canvasCenterPoint_shadow = new Point(
canvasPoint.getX() + 1,
canvasPoint.getY() + 1);
- if (config.shadows())
+ if (plugin.isShadows())
{
OverlayUtil.renderTextLocation(graphics, canvasCenterPoint_shadow, txtString, Color.BLACK);
}
@@ -431,7 +430,7 @@ public class CoxOverlay extends Overlay
final Point canvasCenterPoint_shadow = new Point(
canvasPoint.getX() + 1,
canvasPoint.getY() + 21);
- if (config.shadows())
+ if (plugin.isShadows())
{
OverlayUtil.renderTextLocation(graphics, canvasCenterPoint_shadow, txtString, Color.BLACK);
}
@@ -445,14 +444,7 @@ public class CoxOverlay extends Overlay
List big = new WorldArea(npcLoc.getX() - thickness, npcLoc.getY() - thickness, npcSize + (thickness * 2), npcSize + (thickness * 2), npcLoc.getPlane()).toWorldPointList();
if (!includeUnder)
{
- for (Iterator it = big.iterator(); it.hasNext(); )
- {
- WorldPoint p = it.next();
- if (little.contains(p))
- {
- it.remove();
- }
- }
+ big.removeIf(little::contains);
}
return big;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java
index f5f08b1199..9dc12d080f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java
@@ -28,6 +28,7 @@
package net.runelite.client.plugins.coxhelper;
import com.google.inject.Provides;
+import java.awt.Color;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -54,6 +55,7 @@ import net.runelite.api.ProjectileID;
import net.runelite.api.Varbits;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned;
@@ -154,6 +156,47 @@ public class CoxPlugin extends Plugin
@Getter(AccessLevel.PACKAGE)
private Map npcContainer = new HashMap<>();
+ @Getter(AccessLevel.PACKAGE)
+ private boolean muttadile;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean tekton;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean tektonTickCounter;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean guardians;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean guardinTickCounter;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean vangHighlight;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean vangHealth;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean configPrayAgainstOlm;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean timers;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean tpOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean olmTick;
+ @Getter(AccessLevel.PACKAGE)
+ private Color muttaColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color guardColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color tektonColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color burnColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color acidColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color tpColor;
+ @Getter(AccessLevel.PACKAGE)
+ private CoxConfig.FontStyle fontStyle;
+ @Getter(AccessLevel.PACKAGE)
+ private int textSize;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean shadows;
+
@Provides
CoxConfig getConfig(ConfigManager configManager)
{
@@ -163,6 +206,8 @@ public class CoxPlugin extends Plugin
@Override
protected void startUp()
{
+ updateConfig();
+
overlayManager.add(coxOverlay);
overlayManager.add(coxInfoBox);
HandCripple = false;
@@ -650,4 +695,37 @@ public class CoxPlugin extends Plugin
{
return client.getVar(Varbits.IN_RAID) == 1;
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged configChanged)
+ {
+ if (configChanged.getGroup().equals("Cox"))
+ {
+ updateConfig();
+ }
+ }
+
+ private void updateConfig()
+ {
+ this.muttadile = config.muttadile();
+ this.tekton = config.tekton();
+ this.tektonTickCounter = config.tektonTickCounter();
+ this.guardians = config.guardians();
+ this.guardinTickCounter = config.guardinTickCounter();
+ this.vangHighlight = config.vangHighlight();
+ this.vangHealth = config.vangHealth();
+ this.configPrayAgainstOlm = config.prayAgainstOlm();
+ this.timers = config.timers();
+ this.tpOverlay = config.tpOverlay();
+ this.olmTick = config.olmTick();
+ this.muttaColor = config.muttaColor();
+ this.guardColor = config.guardColor();
+ this.tektonColor = config.tektonColor();
+ this.burnColor = config.burnColor();
+ this.acidColor = config.acidColor();
+ this.tpColor = config.tpColor();
+ this.fontStyle = config.fontStyle();
+ this.textSize = config.textSize();
+ this.shadows = config.shadows();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java
index de33254a5d..6265025058 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java
@@ -26,6 +26,7 @@
package net.runelite.client.plugins.coxhelper;
import java.awt.Color;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@@ -36,40 +37,40 @@ import net.runelite.api.NPCDefinition;
class NPCContainer
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private NPC npc;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int npcIndex;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private String npcName;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int npcSize;
- @Setter
- @Getter
+ @Setter(AccessLevel.PACKAGE)
+ @Getter(AccessLevel.PACKAGE)
private int ticksUntilAttack;
- @Setter
- @Getter
+ @Setter(AccessLevel.PACKAGE)
+ @Getter(AccessLevel.PACKAGE)
private int intermissionPeriod;
- @Setter
- @Getter
+ @Setter(AccessLevel.PACKAGE)
+ @Getter(AccessLevel.PACKAGE)
private int npcSpeed;
- @Setter
- @Getter
+ @Setter(AccessLevel.PACKAGE)
+ @Getter(AccessLevel.PACKAGE)
private Actor npcInteracting;
- @Setter
- @Getter
+ @Setter(AccessLevel.PACKAGE)
+ @Getter(AccessLevel.PACKAGE)
private Specials specials;
- @Setter
- @Getter
+ @Setter(AccessLevel.PACKAGE)
+ @Getter(AccessLevel.PACKAGE)
private Attackstyle attackStyle;
@@ -93,7 +94,7 @@ class NPCContainer
}
@AllArgsConstructor
- @Getter
+ @Getter(AccessLevel.PACKAGE)
public enum Specials
{
PORTALS("Portals"),
@@ -106,7 +107,7 @@ class NPCContainer
}
@AllArgsConstructor
- @Getter
+ @Getter(AccessLevel.PACKAGE)
public enum Attackstyle
{
MAGE("Mage", Color.CYAN),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java
index 2b61b5010e..30942bb461 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java
@@ -24,12 +24,13 @@
*/
package net.runelite.client.plugins.coxhelper;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.runelite.api.Prayer;
@AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
public enum PrayAgainst
{
MELEE(Prayer.PROTECT_FROM_MELEE),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java b/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java
index 155b3bfcc6..77a9ec68b2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.crystalmathlabs;
import java.io.IOException;
import java.util.Objects;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
@@ -52,6 +53,7 @@ import okhttp3.Response;
enabledByDefault = false
)
@Slf4j
+@Singleton
public class CrystalMathLabs extends Plugin
{
/**
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
index 71ae0b81a9..78e34ab41f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.customcursor;
import java.awt.image.BufferedImage;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.client.util.ImageUtil;
@@ -43,10 +44,10 @@ public enum CustomCursor
ZAMORAK_GODSWORD("Zamorak Godsword", "cursor-zamorak-godsword.png");
private final String name;
- @Getter
+ @Getter(AccessLevel.PUBLIC)
private final BufferedImage cursorImage;
- CustomCursor(String name, String icon)
+ CustomCursor(final String name, final String icon)
{
this.name = name;
this.cursorImage = ImageUtil.getResourceStreamFromClass(CustomCursorPlugin.class, icon);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java
index 7e0fc4c18e..feb8729740 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.customcursor;
import com.google.inject.Provides;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.events.ConfigChanged;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
@@ -38,6 +39,7 @@ import net.runelite.client.ui.ClientUI;
description = "Replaces your mouse cursor image",
enabledByDefault = false
)
+@Singleton
public class CustomCursorPlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java
index 4e9c86df1d..764b93a308 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java
@@ -26,6 +26,8 @@
package net.runelite.client.plugins.dailytaskindicators;
+import javax.inject.Singleton;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.vars.AccountType;
import com.google.inject.Provides;
import javax.inject.Inject;
@@ -50,6 +52,7 @@ import net.runelite.client.plugins.PluginDescriptor;
name = "Daily Task Indicator",
description = "Show chat notifications for daily tasks upon login"
)
+@Singleton
public class DailyTasksPlugin extends Plugin
{
private static final int ONE_DAY = 86400000;
@@ -80,6 +83,16 @@ public class DailyTasksPlugin extends Plugin
private long lastReset;
private boolean loggingIn;
+ private boolean showHerbBoxes;
+ private boolean showStaves;
+ private boolean showEssence;
+ private boolean showRunes;
+ private boolean showSand;
+ private boolean showFlax;
+ private boolean showBonemeal;
+ private boolean showArrows;
+ private boolean showDynamite;
+
@Provides
DailyTasksConfig provideConfig(ConfigManager configManager)
{
@@ -89,6 +102,8 @@ public class DailyTasksPlugin extends Plugin
@Override
public void startUp()
{
+ updateConfig();
+
loggingIn = true;
}
@@ -120,47 +135,47 @@ public class DailyTasksPlugin extends Plugin
lastReset = (long) Math.floor(currentTime / ONE_DAY) * ONE_DAY;
loggingIn = false;
- if (config.showHerbBoxes())
+ if (this.showHerbBoxes)
{
checkHerbBoxes(dailyReset);
}
- if (config.showStaves())
+ if (this.showStaves)
{
checkStaves(dailyReset);
}
- if (config.showEssence())
+ if (this.showEssence)
{
checkEssence(dailyReset);
}
- if (config.showRunes())
+ if (this.showRunes)
{
checkRunes(dailyReset);
}
- if (config.showSand())
+ if (this.showSand)
{
checkSand(dailyReset);
}
- if (config.showFlax())
+ if (this.showFlax)
{
checkFlax(dailyReset);
}
- if (config.showBonemeal())
+ if (this.showBonemeal)
{
checkBonemeal(dailyReset);
}
- if (config.showArrows())
+ if (this.showArrows)
{
checkArrows(dailyReset);
}
- if (config.showDynamite())
+ if (this.showDynamite)
{
checkDynamite(dailyReset);
}
@@ -281,4 +296,26 @@ public class DailyTasksPlugin extends Plugin
.runeLiteFormattedMessage(message)
.build());
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged configChanged)
+ {
+ if (configChanged.getGroup().equals("dailytaskindicators"))
+ {
+ updateConfig();
+ }
+ }
+
+ private void updateConfig()
+ {
+ this.showHerbBoxes = config.showHerbBoxes();
+ this.showStaves = config.showStaves();
+ this.showEssence = config.showEssence();
+ this.showRunes = config.showRunes();
+ this.showSand = config.showSand();
+ this.showFlax = config.showFlax();
+ this.showBonemeal = config.showBonemeal();
+ this.showArrows = config.showArrows();
+ this.showDynamite = config.showDynamite();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java
index 34bb399c2f..049e6192b9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java
@@ -32,6 +32,7 @@ import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
@@ -56,6 +57,7 @@ import net.runelite.client.util.ImageUtil;
description = "Show where you last died, and on what world",
tags = {"arrow", "hints", "world", "map", "overlay"}
)
+@Singleton
@Slf4j
public class DeathIndicatorPlugin extends Plugin
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java
index 96d5dfa246..f8a56ffbc6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.defaultworld;
import com.google.inject.Provides;
import java.io.IOException;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
@@ -47,6 +48,7 @@ import net.runelite.http.api.worlds.WorldResult;
tags = {"home"}
)
@Slf4j
+@Singleton
public class DefaultWorldPlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java
index bf1154fecc..eaaf010435 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java
@@ -33,6 +33,7 @@ import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.Point;
@@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
+@Singleton
public class DemonicGorillaOverlay extends Overlay
{
private static final Color COLOR_ICON_BACKGROUND = new Color(0, 0, 0, 128);
@@ -58,7 +60,7 @@ public class DemonicGorillaOverlay extends Overlay
private SkillIconManager iconManager;
@Inject
- public DemonicGorillaOverlay(Client client, DemonicGorillaPlugin plugin)
+ public DemonicGorillaOverlay(final Client client, final DemonicGorillaPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
@@ -106,7 +108,10 @@ public class DemonicGorillaOverlay extends Overlay
{
BufferedImage icon = getIcon(attackStyle);
icons.add(icon);
- totalWidth += icon.getWidth();
+ if (icon != null)
+ {
+ totalWidth += icon.getWidth();
+ }
}
int bgPadding = 4;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
index 0df801bda5..d031b501b5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
@@ -32,6 +32,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.AnimationID;
import net.runelite.api.Client;
@@ -64,6 +66,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
description = "Count demonic gorilla attacks and display their next possible attack styles",
tags = {"combat", "overlay", "pve", "pvm"}
)
+@Singleton
public class DemonicGorillaPlugin extends Plugin
{
@Inject
@@ -78,7 +81,7 @@ public class DemonicGorillaPlugin extends Plugin
@Inject
private ClientThread clientThread;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Map gorillas;
private List recentBoulders;
@@ -145,7 +148,7 @@ public class DemonicGorillaPlugin extends Plugin
}
}
- public static boolean isNpcGorilla(int npcId)
+ private static boolean isNpcGorilla(int npcId)
{
return npcId == NpcID.DEMONIC_GORILLA ||
npcId == NpcID.DEMONIC_GORILLA_7145 ||
@@ -321,8 +324,11 @@ public class DemonicGorillaPlugin extends Plugin
.stream()
.filter(x -> x != DemonicGorilla.AttackStyle.MELEE)
.collect(Collectors.toList()));
- checkGorillaAttackStyleSwitch(gorilla, DemonicGorilla.AttackStyle.MELEE,
- getProtectedStyle(interacting));
+ if (interacting != null)
+ {
+ checkGorillaAttackStyleSwitch(gorilla, DemonicGorilla.AttackStyle.MELEE,
+ getProtectedStyle(interacting));
+ }
}
}
else if (animationId != gorilla.getLastTickAnimation())
@@ -373,8 +379,7 @@ public class DemonicGorillaPlugin extends Plugin
else if (mp != null)
{
WorldArea lastPlayerArea = mp.getLastWorldArea();
- if (lastPlayerArea != null &&
- interacting != null && recentBoulders.stream()
+ if (lastPlayerArea != null && recentBoulders.stream()
.anyMatch(x -> x.distanceTo(lastPlayerArea) == 0))
{
// A boulder started falling on the gorillas target,
@@ -425,23 +430,21 @@ public class DemonicGorillaPlugin extends Plugin
// Gorillas can't normally walk through other gorillas
// or other players
final WorldArea area1 = new WorldArea(x, 1, 1);
- return area1 != null &&
- gorillas.values().stream().noneMatch(y ->
+ return gorillas.values().stream().noneMatch(y ->
+ {
+ if (y == gorilla)
{
- if (y == gorilla)
- {
- return false;
- }
- final WorldArea area2 =
- y.getNpc().getIndex() < gorilla.getNpc().getIndex() ?
- y.getNpc().getWorldArea() : y.getLastWorldArea();
- return area2 != null && area1.intersectsWith(area2);
- }) &&
- memorizedPlayers.values().stream().noneMatch(y ->
- {
- final WorldArea area2 = y.getLastWorldArea();
- return area2 != null && area1.intersectsWith(area2);
- });
+ return false;
+ }
+ final WorldArea area2 =
+ y.getNpc().getIndex() < gorilla.getNpc().getIndex() ?
+ y.getNpc().getWorldArea() : y.getLastWorldArea();
+ return area2 != null && area1.intersectsWith(area2);
+ }) && memorizedPlayers.values().stream().noneMatch(y ->
+ {
+ final WorldArea area2 = y.getLastWorldArea();
+ return area2 != null && area1.intersectsWith(area2);
+ });
// There is a special case where if a player walked through
// a gorilla, or a player walked through another player,
@@ -453,9 +456,7 @@ public class DemonicGorillaPlugin extends Plugin
{
int distance = gorilla.getNpc().getWorldArea().distanceTo(mp.getLastWorldArea());
WorldPoint predictedMovement = predictedNewArea.toWorldPoint();
- if (distance <= DemonicGorilla.MAX_ATTACK_RANGE &&
- mp != null &&
- mp.getLastWorldArea().hasLineOfSightTo(client, gorilla.getLastWorldArea()))
+ if (distance <= DemonicGorilla.MAX_ATTACK_RANGE && mp.getLastWorldArea().hasLineOfSightTo(client, gorilla.getLastWorldArea()))
{
if (predictedMovement.distanceTo(gorilla.getLastWorldArea().toWorldPoint()) != 0)
{
@@ -549,8 +550,7 @@ public class DemonicGorillaPlugin extends Plugin
{
recentBoulders.add(WorldPoint.fromLocal(client, event.getPosition()));
}
- else if (projectileId == ProjectileID.DEMONIC_GORILLA_MAGIC ||
- projectileId == ProjectileID.DEMONIC_GORILLA_RANGED)
+ else
{
WorldPoint projectileSourcePosition = WorldPoint.fromLocal(
client, projectile.getX1(), projectile.getY1(), client.getPlane());
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java
index 7dd0058cd6..262042b7e1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java
@@ -26,25 +26,26 @@ package net.runelite.client.plugins.demonicgorilla;
import java.util.ArrayList;
import java.util.List;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.api.Hitsplat;
import net.runelite.api.Player;
import net.runelite.api.coords.WorldArea;
-public class MemorizedPlayer
+class MemorizedPlayer
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Player player;
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private WorldArea lastWorldArea;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private List recentHitsplats;
- public MemorizedPlayer(Player player)
+ MemorizedPlayer(final Player player)
{
this.player = player;
this.recentHitsplats = new ArrayList<>();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java
index 6f3faff8d2..405f889469 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java
@@ -24,25 +24,25 @@
*/
package net.runelite.client.plugins.demonicgorilla;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.Player;
-public class PendingGorillaAttack
+class PendingGorillaAttack
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private DemonicGorilla attacker;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private DemonicGorilla.AttackStyle attackStyle;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Player target;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int finishesOnTick;
- public PendingGorillaAttack(DemonicGorilla attacker, DemonicGorilla.AttackStyle attackStyle,
- Player target, int finishesOnTick)
+ PendingGorillaAttack(final DemonicGorilla attacker, final DemonicGorilla.AttackStyle attackStyle, final Player target, final int finishesOnTick)
{
this.attacker = attacker;
this.attackStyle = attackStyle;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
index 29bce7dc98..ac5487f6a8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
@@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import java.util.List;
import java.util.Map;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.runelite.api.Client;
@@ -36,7 +37,7 @@ import net.runelite.api.Skill;
import net.runelite.api.Varbits;
@AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
enum DiscordGameEventType
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
index 9d698b2085..68a10c2567 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.discord;
import com.google.common.base.Strings;
import com.google.inject.Inject;
import com.google.inject.Provides;
+import com.google.inject.Singleton;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
@@ -37,6 +38,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import javax.imageio.ImageIO;
+import lombok.AccessLevel;
+import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
@@ -80,9 +83,10 @@ import okhttp3.Response;
tags = {"action", "activity", "external", "integration", "status"}
)
@Slf4j
+@Singleton
public class DiscordPlugin extends Plugin
{
- public static boolean discordEnabled = false;
+ private static boolean discordEnabled = false;
@Inject
private Client client;
@@ -112,6 +116,19 @@ public class DiscordPlugin extends Plugin
private NavigationButton discordButton;
private boolean loginFlag;
+ @Getter(AccessLevel.PACKAGE)
+ private int actionTimeout;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean hideElapsedTime;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean alwaysShowParty;
+ private boolean showSkillingActivity;
+ private boolean showBossActivity;
+ private boolean showCityActivity;
+ private boolean showDungeonActivity;
+ private boolean showMinigameActivity;
+ private boolean showRaidingActivity;
+
@Provides
private DiscordConfig provideConfig(ConfigManager configManager)
{
@@ -121,6 +138,8 @@ public class DiscordPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "discord.png");
discordButton = NavigationButton.builder()
@@ -182,6 +201,8 @@ public class DiscordPlugin extends Plugin
{
if (event.getGroup().equalsIgnoreCase("discord"))
{
+ updateConfig();
+
checkForGameStateUpdate();
checkForAreaUpdate();
updatePresence();
@@ -201,7 +222,7 @@ public class DiscordPlugin extends Plugin
final DiscordGameEventType discordGameEventType = DiscordGameEventType.fromSkill(event.getSkill());
- if (discordGameEventType != null && config.showSkillingActivity())
+ if (discordGameEventType != null && this.showSkillingActivity)
{
discordState.triggerEvent(discordGameEventType);
}
@@ -210,7 +231,7 @@ public class DiscordPlugin extends Plugin
@Subscribe
public void onVarbitChanged(VarbitChanged event)
{
- if (!config.showRaidingActivity())
+ if (!this.showRaidingActivity)
{
return;
}
@@ -419,15 +440,28 @@ public class DiscordPlugin extends Plugin
switch (event.getDiscordAreaType())
{
case BOSSES:
- return config.showBossActivity();
+ return this.showBossActivity;
case CITIES:
- return config.showCityActivity();
+ return this.showCityActivity;
case DUNGEONS:
- return config.showDungeonActivity();
+ return this.showDungeonActivity;
case MINIGAMES:
- return config.showMinigameActivity();
+ return this.showMinigameActivity;
}
return false;
}
+
+ public void updateConfig()
+ {
+ this.actionTimeout = config.actionTimeout();
+ this.hideElapsedTime = config.hideElapsedTime();
+ this.alwaysShowParty = config.alwaysShowParty();
+ this.showSkillingActivity = config.showSkillingActivity();
+ this.showBossActivity = config.showBossActivity();
+ this.showCityActivity = config.showCityActivity();
+ this.showDungeonActivity = config.showDungeonActivity();
+ this.showMinigameActivity = config.showMinigameActivity();
+ this.showRaidingActivity = config.showRaidingActivity();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java
index c110194187..ddb554fd75 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java
@@ -56,16 +56,16 @@ class DiscordState
private final UUID partyId = UUID.randomUUID();
private final List events = new ArrayList<>();
private final DiscordService discordService;
- private final DiscordConfig config;
+ private final DiscordPlugin plugin;
private PartyService party;
private final RuneLiteProperties properties;
private DiscordPresence lastPresence;
@Inject
- private DiscordState(final DiscordService discordService, final DiscordConfig config, final PartyService party, final RuneLiteProperties properties)
+ private DiscordState(final DiscordService discordService, final DiscordPlugin plugin, final PartyService party, final RuneLiteProperties properties)
{
this.discordService = discordService;
- this.config = config;
+ this.plugin = plugin;
this.party = party;
this.properties = properties;
}
@@ -97,7 +97,7 @@ class DiscordState
.startTimestamp(lastPresence.getStartTimestamp())
.smallImageKey(lastPresence.getSmallImageKey())
.partyMax(lastPresence.getPartyMax())
- .partySize(Math.max(config.alwaysShowParty() ? 1 : 0, party.getMembers().size()));
+ .partySize(Math.max(plugin.isAlwaysShowParty() ? 1 : 0, party.getMembers().size()));
if (party.isOwner())
{
@@ -126,7 +126,7 @@ class DiscordState
{
// If we aren't showing the elapsed time within Discord then
// We null out the event start property
- event = new EventWithTime(eventType, config.hideElapsedTime() ? null : Instant.now());
+ event = new EventWithTime(eventType, plugin.isHideElapsedTime() ? null : Instant.now());
events.add(event);
}
@@ -205,7 +205,7 @@ class DiscordState
*/
void checkForTimeout()
{
- final Duration actionTimeout = Duration.ofMinutes(config.actionTimeout());
+ final Duration actionTimeout = Duration.ofMinutes(plugin.getActionTimeout());
final Instant now = Instant.now();
events.removeIf(event -> event.getType().isShouldTimeout() && now.isAfter(event.getUpdated().plus(actionTimeout)));
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java
index 21eb1eab10..dff53b98c1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java
@@ -30,6 +30,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import javax.inject.Inject;
+import javax.inject.Singleton;
import joptsimple.internal.Strings;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
@@ -52,6 +53,7 @@ import net.runelite.client.util.ImageUtil;
enabledByDefault = false
)
@Slf4j
+@Singleton
public class EmojiPlugin extends Plugin
{
private static final Pattern TAG_REGEXP = Pattern.compile("<[^>]*>");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java
index 73069862cd..72a13d5fe9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.entityhider;
import com.google.inject.Provides;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Player;
@@ -44,6 +45,7 @@ import net.runelite.client.plugins.PluginDescriptor;
tags = {"npcs", "players", "projectiles"},
enabledByDefault = false
)
+@Singleton
public class EntityHiderPlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java
index a43592e5d7..91c7a4b065 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java
@@ -29,7 +29,7 @@ import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
import net.runelite.client.config.Range;
-@ConfigGroup("grounditems")
+@ConfigGroup("equipmentinspector")
public interface EquipmentInspectorConfig extends Config
{
@ConfigItem(
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
index d85f8127ac..10680e620b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
@@ -37,12 +37,14 @@ import java.util.Optional;
import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.Nullable;
import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.swing.SwingUtilities;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
import net.runelite.api.ItemDefinition;
import net.runelite.api.Player;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.PlayerMenuOptionClicked;
import net.runelite.api.kit.KitType;
import net.runelite.client.chat.ChatColorType;
@@ -66,7 +68,7 @@ import net.runelite.client.util.Text;
type = PluginType.PVP,
enabledByDefault = false
)
-
+@Singleton
@Slf4j
public class EquipmentInspectorPlugin extends Plugin
{
@@ -100,6 +102,10 @@ public class EquipmentInspectorPlugin extends Plugin
private int Prot3 = 0;
private int Prot4 = 0;
+ private boolean ShowValue;
+ private int protecteditems;
+ private boolean ExactValue;
+
@Provides
EquipmentInspectorConfig provideConfig(ConfigManager configManager)
{
@@ -109,6 +115,7 @@ public class EquipmentInspectorPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
equipmentInspectorPanel = injector.getInstance(EquipmentInspectorPanel.class);
if (client != null)
@@ -166,10 +173,18 @@ public class EquipmentInspectorPlugin extends Plugin
// The player menu uses a non-breaking space in the player name, we need to replace this to compare
// against the playerName in the player cache.
String finalPlayerName = playerName.replace('\u00A0', ' ');
- List players = client.getPlayers();
- Optional targetPlayer = players.stream()
- .filter(Objects::nonNull)
- .filter(p -> p.getName().equals(finalPlayerName)).findFirst();
+ List players = null;
+ if (client != null)
+ {
+ players = client.getPlayers();
+ }
+ Optional targetPlayer = Optional.empty();
+ if (players != null)
+ {
+ targetPlayer = players.stream()
+ .filter(Objects::nonNull)
+ .filter(p -> p.getName().equals(finalPlayerName)).findFirst();
+ }
if (targetPlayer.isPresent())
{
@@ -224,13 +239,13 @@ public class EquipmentInspectorPlugin extends Plugin
}
}
}
- int IgnoredItems = config.protecteditems();
+ int IgnoredItems = this.protecteditems;
if (IgnoredItems != 0 && IgnoredItems != 1 && IgnoredItems != 2 && IgnoredItems != 3)
{
IgnoredItems = 4;
}
- if (config.ShowValue())
+ if (this.ShowValue)
{
switch (IgnoredItems)
{
@@ -255,13 +270,13 @@ public class EquipmentInspectorPlugin extends Plugin
break;
}
String StringPrice = "";
- if (!config.ExactValue())
+ if (!this.ExactValue)
{
TotalPrice = TotalPrice / 1000;
StringPrice = NumberFormat.getIntegerInstance().format(TotalPrice);
StringPrice = StringPrice + 'K';
}
- if (config.ExactValue())
+ if (this.ExactValue)
{
StringPrice = NumberFormat.getIntegerInstance().format(TotalPrice);
}
@@ -281,4 +296,20 @@ public class EquipmentInspectorPlugin extends Plugin
});
}
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (event.getGroup().equalsIgnoreCase("equipmentinspector"))
+ {
+ updateConfig();
+ }
+ }
+
+ public void updateConfig()
+ {
+ this.ShowValue = config.ShowValue();
+ this.protecteditems = config.protecteditems();
+ this.ExactValue = config.ExactValue();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/normal.png b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/normal.png
deleted file mode 100644
index 613f95e46d..0000000000
Binary files a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/normal.png and /dev/null differ
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java
index 8cd0340b69..623aa869e7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java
@@ -31,7 +31,7 @@ class CacheKey
private final ExamineType type;
private final int id;
- public CacheKey(ExamineType type, int id)
+ CacheKey(final ExamineType type, final int id)
{
this.type = type;
this.id = id;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
index ddc21c724b..414c75a4c7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
@@ -33,6 +33,7 @@ import java.util.Deque;
import java.util.concurrent.ScheduledExecutorService;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
@@ -69,6 +70,7 @@ import net.runelite.http.api.osbuddy.OSBGrandExchangeResult;
tags = {"npcs", "items", "inventory", "objects"}
)
@Slf4j
+@Singleton
public class ExaminePlugin extends Plugin
{
private static final Pattern X_PATTERN = Pattern.compile("^\\d+ x ");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java
index cfdd113ef6..ee6ee0f26e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.experiencedrop;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Actor;
import net.runelite.api.Point;
import net.runelite.client.ui.overlay.Overlay;
@@ -34,16 +35,15 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
class XpDropOverlay extends Overlay
{
private final XpDropPlugin plugin;
- private final XpDropConfig config;
@Inject
- private XpDropOverlay(XpDropPlugin plugin, XpDropConfig config)
+ private XpDropOverlay(final XpDropPlugin plugin)
{
this.plugin = plugin;
- this.config = config;
setPosition(OverlayPosition.DYNAMIC);
setPriority(OverlayPriority.MED);
}
@@ -57,12 +57,12 @@ class XpDropOverlay extends Overlay
if (opponent != null)
{
int offset = opponent.getLogicalHeight() + 50;
- String damageStr = String.valueOf(this.plugin.getDamage());
+ String damageStr = String.valueOf(plugin.getDamage());
Point textLocation = opponent.getCanvasTextLocation(graphics, damageStr, offset);
- if (textLocation != null && this.plugin.getDamage() != 0)
+ if (textLocation != null && plugin.getDamage() != 0)
{
- OverlayUtil.renderTextLocation(graphics, textLocation, damageStr, config.getDamageColor());
+ OverlayUtil.renderTextLocation(graphics, textLocation, damageStr, plugin.getDamageColor());
}
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
index e6e4aa3811..a94da44953 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
@@ -27,11 +27,13 @@
package net.runelite.client.plugins.experiencedrop;
import com.google.inject.Provides;
+import java.awt.Color;
import java.util.Arrays;
import java.util.EnumMap;
import java.util.Map;
import java.util.stream.IntStream;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.Actor;
@@ -65,6 +67,7 @@ import net.runelite.client.util.ColorUtil;
description = "Enable customization of the way XP drops are displayed",
tags = {"experience", "levels", "tick"}
)
+@Singleton
public class XpDropPlugin extends Plugin
{
private static final int XPDROP_PADDING = 2; // space between xp drop icons
@@ -104,6 +107,15 @@ public class XpDropPlugin extends Plugin
private PrayerType currentTickPrayer;
private XpDropConfig.DamageMode damageMode;
+ private boolean hideSkillIcons;
+ private Color getMeleePrayerColor;
+ private Color getRangePrayerColor;
+ private Color getMagePrayerColor;
+ private int fakeXpDropDelay;
+ private XpDropConfig.DamageMode showdamagedrops;
+ @Getter(AccessLevel.PACKAGE)
+ private Color damageColor;
+
@Provides
XpDropConfig provideConfig(ConfigManager configManager)
{
@@ -113,6 +125,8 @@ public class XpDropPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
damageMode = config.showdamagedrops();
if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT)
@@ -135,10 +149,11 @@ public class XpDropPlugin extends Plugin
return;
}
+ updateConfig();
if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT)
{
- damageMode = config.showdamagedrops();
+ damageMode = this.showdamagedrops;
if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT)
{
@@ -147,7 +162,7 @@ public class XpDropPlugin extends Plugin
}
else
{
- damageMode = config.showdamagedrops();
+ damageMode = this.showdamagedrops;
if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT)
{
@@ -180,7 +195,7 @@ public class XpDropPlugin extends Plugin
return;
}
- if (config.hideSkillIcons())
+ if (this.hideSkillIcons)
{
if (widget.getSpriteId() > 0)
{
@@ -245,21 +260,21 @@ public class XpDropPlugin extends Plugin
id == SpriteID.SKILL_ATTACK || id == SpriteID.SKILL_STRENGTH || id == SpriteID.SKILL_DEFENCE
|| correctPrayer))
{
- color = config.getMeleePrayerColor().getRGB();
+ color = this.getMeleePrayerColor.getRGB();
correctPrayer = true;
}
break;
case RANGE:
if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_RANGED || correctPrayer))
{
- color = config.getRangePrayerColor().getRGB();
+ color = this.getRangePrayerColor.getRGB();
correctPrayer = true;
}
break;
case MAGIC:
if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_MAGIC || correctPrayer))
{
- color = config.getMagePrayerColor().getRGB();
+ color = this.getMagePrayerColor.getRGB();
correctPrayer = true;
}
break;
@@ -301,7 +316,7 @@ public class XpDropPlugin extends Plugin
currentTickPrayer = getActivePrayerType();
correctPrayer = false;
- final int fakeTickDelay = config.fakeXpDropDelay();
+ final int fakeTickDelay = this.fakeXpDropDelay;
if (fakeTickDelay == 0 || lastSkill == null)
{
@@ -343,7 +358,7 @@ public class XpDropPlugin extends Plugin
@Subscribe
public void onScriptCallbackEvent(ScriptCallbackEvent e)
{
- if (config.showdamagedrops() == XpDropConfig.DamageMode.NONE)
+ if (this.showdamagedrops == XpDropConfig.DamageMode.NONE)
{
return;
}
@@ -388,7 +403,7 @@ public class XpDropPlugin extends Plugin
StringBuilder builder = new StringBuilder()
.append(stringStack[stringStackSize - 1])
- .append(ColorUtil.colorTag(config.getDamageColor()))
+ .append(ColorUtil.colorTag(this.damageColor))
.append(" (").append(damage).append(")");
stringStack[stringStackSize - 1] = builder.toString();
@@ -430,4 +445,15 @@ public class XpDropPlugin extends Plugin
damage = (int) Math.rint(damageDealt / npcManager.getXpModifier(target.getId()));
tickShow = 3;
}
+
+ private void updateConfig()
+ {
+ this.hideSkillIcons = config.hideSkillIcons();
+ this.getMeleePrayerColor = config.getMeleePrayerColor();
+ this.getRangePrayerColor = config.getRangePrayerColor();
+ this.getMagePrayerColor = config.getMagePrayerColor();
+ this.fakeXpDropDelay = config.fakeXpDropDelay();
+ this.showdamagedrops = config.showdamagedrops();
+ this.damageColor = config.getDamageColor();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java
index b32f7f6c10..53f6b3d575 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java
@@ -35,6 +35,7 @@ import java.util.Map;
import java.util.TreeMap;
import javax.annotation.Nullable;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
@@ -43,6 +44,7 @@ import net.runelite.api.ScriptID;
import net.runelite.api.SoundEffectID;
import net.runelite.api.SpriteID;
import net.runelite.api.Varbits;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.VarbitChanged;
import net.runelite.api.events.WidgetLoaded;
@@ -66,6 +68,7 @@ import net.runelite.client.util.Text;
description = "Show the location of the fairy ring teleport",
tags = {"teleportation"}
)
+@Singleton
public class FairyRingPlugin extends Plugin
{
private static final String[] leftDial = new String[]{"A", "D", "C", "B"};
@@ -93,6 +96,8 @@ public class FairyRingPlugin extends Plugin
private Widget searchBtn;
private Collection codes = null;
+ private boolean autoOpen;
+
@Data
private static class CodeWidgets
{
@@ -106,6 +111,23 @@ public class FairyRingPlugin extends Plugin
private Widget description;
}
+ @Override
+ protected void startUp() throws Exception
+ {
+ this.autoOpen = config.autoOpen();
+ }
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("fairyrings"))
+ {
+ return;
+ }
+
+ this.autoOpen = config.autoOpen();
+ }
+
@Provides
FairyRingConfig getConfig(ConfigManager configManager)
{
@@ -142,7 +164,7 @@ public class FairyRingPlugin extends Plugin
codes = null;
- if (config.autoOpen())
+ if (this.autoOpen)
{
openSearch();
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
index b6eb858b72..622ef7d273 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
@@ -41,6 +41,7 @@ import java.time.Instant;
import java.util.Comparator;
import java.util.function.Supplier;
import javax.imageio.ImageIO;
+import javax.inject.Singleton;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.ImageIcon;
@@ -66,6 +67,7 @@ import okhttp3.Response;
import okhttp3.ResponseBody;
@Slf4j
+@Singleton
class FeedPanel extends PluginPanel
{
private static final ImageIcon RUNELITE_ICON;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
index 8a34a73cf1..0366361345 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
@@ -33,6 +33,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.events.ConfigChanged;
import net.runelite.client.config.ConfigManager;
@@ -53,6 +54,7 @@ import net.runelite.http.api.feed.FeedResult;
loadWhenOutdated = true
)
@Slf4j
+@Singleton
public class FeedPlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java
index cc0f1a523c..3bc482bf51 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java
@@ -40,7 +40,7 @@ import net.runelite.api.NPCDefinition;
import net.runelite.api.NpcID;
import net.runelite.api.Prayer;
-@Getter
+@Getter(AccessLevel.PACKAGE)
class FightCaveContainer
{
private NPC npc;
@@ -50,11 +50,11 @@ class FightCaveContainer
private int attackSpeed;
private int priority;
private ImmutableSet animations;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private int ticksUntilAttack;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private Actor npcInteracting;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private AttackStyle attackStyle;
FightCaveContainer(NPC npc, int attackSpeed)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java
index 68569157d5..4f9c675825 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Point;
import net.runelite.api.Prayer;
@@ -44,19 +45,18 @@ import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.util.ImageUtil;
+@Singleton
public class FightCaveOverlay extends Overlay
{
private FightCavePlugin plugin;
- private FightCaveConfig config;
private Client client;
private SpriteManager spriteManager;
@Inject
- FightCaveOverlay(Client client, FightCavePlugin plugin, FightCaveConfig config, SpriteManager spriteManager)
+ FightCaveOverlay(final Client client, final FightCavePlugin plugin, final SpriteManager spriteManager)
{
this.client = client;
this.plugin = plugin;
- this.config = config;
this.spriteManager = spriteManager;
setPosition(OverlayPosition.DYNAMIC);
setPriority(OverlayPriority.HIGHEST);
@@ -82,8 +82,8 @@ public class FightCaveOverlay extends Overlay
}
final String ticksLeftStr = String.valueOf(ticksLeft);
- final int font = config.fontStyle().getFont();
- final boolean shadows = config.shadows();
+ final int font = plugin.getFontStyle().getFont();
+ final boolean shadows = plugin.isShadows();
Color color = (ticksLeft <= 1 ? Color.WHITE : attackStyle.getColor());
final Point canvasPoint = npc.getNpc().getCanvasTextLocation(graphics, Integer.toString(ticksLeft), 0);
@@ -101,10 +101,10 @@ public class FightCaveOverlay extends Overlay
renderImageLocation(graphics, npc.getNpc().getCanvasImageLocation(ImageUtil.resizeImage(pray, 36, 36), 0), pray, 12, 30);
}
- OverlayUtil.renderTextLocation(graphics, ticksLeftStr, config.textSize(), font, color, canvasPoint, shadows, 0);
+ OverlayUtil.renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), font, color, canvasPoint, shadows, 0);
}
- if (config.tickTimersWidget())
+ if (plugin.isTickTimersWidget())
{
if (!plugin.getMageTicks().isEmpty())
@@ -113,7 +113,7 @@ public class FightCaveOverlay extends Overlay
Prayer.PROTECT_FROM_MAGIC,
plugin.getMageTicks().get(0) == 1 ? Color.WHITE : Color.CYAN,
Integer.toString(plugin.getMageTicks().get(0)),
- config.shadows()
+ plugin.isShadows()
);
}
if (!plugin.getRangedTicks().isEmpty())
@@ -122,7 +122,7 @@ public class FightCaveOverlay extends Overlay
Prayer.PROTECT_FROM_MISSILES,
plugin.getRangedTicks().get(0) == 1 ? Color.WHITE : Color.GREEN,
Integer.toString(plugin.getRangedTicks().get(0)),
- config.shadows()
+ plugin.isShadows()
);
}
if (!plugin.getMeleeTicks().isEmpty())
@@ -131,7 +131,7 @@ public class FightCaveOverlay extends Overlay
Prayer.PROTECT_FROM_MELEE,
plugin.getMeleeTicks().get(0) == 1 ? Color.WHITE : Color.RED,
Integer.toString(plugin.getMeleeTicks().get(0)),
- config.shadows()
+ plugin.isShadows()
);
}
}
@@ -146,7 +146,7 @@ public class FightCaveOverlay extends Overlay
if (bounds != null)
{
- renderTextLocation(graphics, ticks, 16, config.fontStyle().getFont(), color, centerPoint(bounds), shadows);
+ renderTextLocation(graphics, ticks, 16, plugin.getFontStyle().getFont(), color, centerPoint(bounds), shadows);
}
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java
index c694aae2f2..a31197e700 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java
@@ -35,6 +35,7 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@@ -45,6 +46,7 @@ import net.runelite.api.GameState;
import net.runelite.api.NPC;
import net.runelite.api.NpcID;
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;
@@ -65,7 +67,7 @@ import org.apache.commons.lang3.ArrayUtils;
type = PluginType.PVM,
enabledByDefault = false
)
-
+@Singleton
@Slf4j
public class FightCavePlugin extends Plugin
{
@@ -146,6 +148,18 @@ public class FightCavePlugin extends Plugin
return String.format("%dx %s", quantity, monster);
}
+
+ @Getter(AccessLevel.PACKAGE)
+ private WaveDisplayMode waveDisplay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean tickTimersWidget;
+ @Getter(AccessLevel.PACKAGE)
+ private FightCaveConfig.FontStyle fontStyle;
+ @Getter(AccessLevel.PACKAGE)
+ private int textSize;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean shadows;
+
@Provides
FightCaveConfig provideConfig(ConfigManager configManager)
{
@@ -155,6 +169,8 @@ public class FightCavePlugin extends Plugin
@Override
public void startUp()
{
+ updateConfig();
+
if (client.getGameState() == GameState.LOGGED_IN)
{
if (regionCheck())
@@ -174,6 +190,17 @@ public class FightCavePlugin extends Plugin
currentWave = -1;
}
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("fightcave"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
@Subscribe
public void onChatMessage(ChatMessage event)
{
@@ -346,4 +373,13 @@ public class FightCavePlugin extends Plugin
{
return ArrayUtils.contains(client.getMapRegions(), FIGHT_CAVE_REGION);
}
+
+ private void updateConfig()
+ {
+ this.waveDisplay = config.waveDisplay();
+ this.tickTimersWidget = config.tickTimersWidget();
+ this.fontStyle = config.fontStyle();
+ this.textSize = config.textSize();
+ this.shadows = config.shadows();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java
index f1d81816f6..12beb81be2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java
@@ -32,6 +32,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.ui.ColorScheme;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
@@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
+@Singleton
class WaveOverlay extends Overlay
{
private static final Color HEADER_COLOR = ColorScheme.BRAND_ORANGE;
@@ -49,7 +51,7 @@ class WaveOverlay extends Overlay
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- private WaveOverlay(FightCaveConfig config, FightCavePlugin plugin)
+ private WaveOverlay(final FightCaveConfig config, final FightCavePlugin plugin)
{
this.config = config;
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java
index 78082d052a..24f15c5e42 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.api.Skill;
@@ -41,25 +42,24 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
+@Singleton
class FishingOverlay extends Overlay
{
private static final String FISHING_SPOT = "Fishing spot";
private final Client client;
private final FishingPlugin plugin;
- private final FishingConfig config;
private final XpTrackerService xpTrackerService;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- public FishingOverlay(Client client, FishingPlugin plugin, FishingConfig config, XpTrackerService xpTrackerService)
+ public FishingOverlay(final Client client, final FishingPlugin plugin, final XpTrackerService xpTrackerService)
{
super(plugin);
setPosition(OverlayPosition.TOP_LEFT);
this.client = client;
this.plugin = plugin;
- this.config = config;
this.xpTrackerService = xpTrackerService;
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Fishing overlay"));
}
@@ -67,7 +67,7 @@ class FishingOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (!config.showFishingStats() || plugin.getSession().getLastFishCaught() == null)
+ if (!plugin.isShowFishingStats() || plugin.getSession().getLastFishCaught() == null)
{
return null;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
index aa4db54c50..074a4d4858 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
@@ -50,6 +50,7 @@ import net.runelite.api.NPC;
import net.runelite.api.Varbits;
import net.runelite.api.coords.LocalPoint;
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.InteractingChanged;
@@ -138,9 +139,27 @@ public class FishingPlugin extends Plugin
return configManager.getConfig(FishingConfig.class);
}
+ @Getter(AccessLevel.PACKAGE)
+ private boolean onlyCurrentSpot;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showSpotTiles;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showSpotIcons;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showSpotNames;
+ private int statTimeout;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showFishingStats;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showMinnowOverlay;
+ private boolean trawlerNotification;
+ private boolean trawlerTimer;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(overlay);
overlayManager.add(spotOverlay);
overlayManager.add(fishingSpotMinimapOverlay);
@@ -161,6 +180,17 @@ public class FishingPlugin extends Plugin
trawlerStartTime = null;
}
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("fishing"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
@Subscribe
public void onGameStateChanged(GameStateChanged gameStateChanged)
{
@@ -253,7 +283,7 @@ public class FishingPlugin extends Plugin
// Reset fishing session
if (session.getLastFishCaught() != null)
{
- final Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+ final Duration statTimeout = Duration.ofMinutes(this.statTimeout);
final Duration sinceCaught = Duration.between(session.getLastFishCaught(), Instant.now());
if (sinceCaught.compareTo(statTimeout) >= 0)
@@ -267,7 +297,7 @@ public class FishingPlugin extends Plugin
for (NPC npc : fishingSpots)
{
- if (FishingSpot.getSPOTS().get(npc.getId()) == FishingSpot.MINNOW && config.showMinnowOverlay())
+ if (FishingSpot.getSPOTS().get(npc.getId()) == FishingSpot.MINNOW && this.showMinnowOverlay)
{
final int id = npc.getIndex();
final MinnowSpot minnowSpot = minnowSpots.get(id);
@@ -282,7 +312,7 @@ public class FishingPlugin extends Plugin
}
}
- if (config.trawlerTimer())
+ if (this.trawlerTimer)
{
updateTrawlerTimer();
}
@@ -319,7 +349,7 @@ public class FishingPlugin extends Plugin
@Subscribe
public void onVarbitChanged(VarbitChanged event)
{
- if (!config.trawlerNotification() || client.getGameState() != GameState.LOGGED_IN)
+ if (!this.trawlerNotification || client.getGameState() != GameState.LOGGED_IN)
{
return;
}
@@ -411,4 +441,17 @@ public class FishingPlugin extends Plugin
final LocalPoint cameraPoint = new LocalPoint(client.getCameraX(), client.getCameraY());
fishingSpots.sort(Comparator.comparing(npc -> -1 * npc.getLocalLocation().distanceTo(cameraPoint)));
}
+
+ private void updateConfig()
+ {
+ this.onlyCurrentSpot = config.onlyCurrentSpot();
+ this.showSpotTiles = config.showSpotTiles();
+ this.showSpotIcons = config.showSpotIcons();
+ this.showSpotNames = config.showSpotNames();
+ this.statTimeout = config.statTimeout();
+ this.showFishingStats = config.showFishingStats();
+ this.showMinnowOverlay = config.showMinnowOverlay();
+ this.trawlerNotification = config.trawlerNotification();
+ this.trawlerTimer = config.trawlerTimer();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java
index ae1f387747..f5daf21ce6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java
@@ -25,12 +25,13 @@
package net.runelite.client.plugins.fishing;
import java.time.Instant;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
class FishingSession
{
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private Instant lastFishCaught;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
index c241cd695f..c04ae8426b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Setter;
import net.runelite.api.GraphicID;
@@ -37,21 +38,20 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
class FishingSpotMinimapOverlay extends Overlay
{
private final FishingPlugin plugin;
- private final FishingConfig config;
@Setter(AccessLevel.PACKAGE)
private boolean hidden;
@Inject
- public FishingSpotMinimapOverlay(FishingPlugin plugin, FishingConfig config)
+ public FishingSpotMinimapOverlay(final FishingPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_WIDGETS);
this.plugin = plugin;
- this.config = config;
}
@Override
@@ -71,7 +71,7 @@ class FishingSpotMinimapOverlay extends Overlay
continue;
}
- if (config.onlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot)
+ if (plugin.isOnlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot)
{
continue;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
index 1b9c27eda0..7f7f058438 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
@@ -32,6 +32,7 @@ import java.awt.image.BufferedImage;
import java.time.Duration;
import java.time.Instant;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Setter;
import net.runelite.api.Client;
@@ -48,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.ui.overlay.components.ProgressPieComponent;
import net.runelite.client.util.ImageUtil;
+@Singleton
class FishingSpotOverlay extends Overlay
{
private static final Duration MINNOW_MOVE = Duration.ofSeconds(15);
@@ -55,7 +57,6 @@ class FishingSpotOverlay extends Overlay
private static final int ONE_TICK_AERIAL_FISHING = 3;
private final FishingPlugin plugin;
- private final FishingConfig config;
private final Client client;
private final ItemManager itemManager;
@@ -63,12 +64,11 @@ class FishingSpotOverlay extends Overlay
private boolean hidden;
@Inject
- private FishingSpotOverlay(FishingPlugin plugin, FishingConfig config, Client client, ItemManager itemManager)
+ private FishingSpotOverlay(final FishingPlugin plugin, final Client client, final ItemManager itemManager)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
this.plugin = plugin;
- this.config = config;
this.client = client;
this.itemManager = itemManager;
}
@@ -90,14 +90,14 @@ class FishingSpotOverlay extends Overlay
continue;
}
- if (config.onlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot)
+ if (plugin.isOnlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot)
{
continue;
}
Color color = npc.getSpotAnimation() == GraphicID.FLYING_FISH ? Color.RED : Color.CYAN;
- if (spot == FishingSpot.MINNOW && config.showMinnowOverlay())
+ if (spot == FishingSpot.MINNOW && plugin.isShowMinnowOverlay())
{
MinnowSpot minnowSpot = plugin.getMinnowSpots().get(npc.getIndex());
if (minnowSpot != null)
@@ -123,7 +123,7 @@ class FishingSpotOverlay extends Overlay
}
}
- if (config.showSpotTiles())
+ if (plugin.isShowSpotTiles())
{
Polygon poly = npc.getCanvasTilePoly();
@@ -139,7 +139,7 @@ class FishingSpotOverlay extends Overlay
}
}
- if (config.showSpotIcons())
+ if (plugin.isShowSpotIcons())
{
BufferedImage fishImage = itemManager.getImage(spot.getFishSpriteId());
@@ -159,7 +159,7 @@ class FishingSpotOverlay extends Overlay
}
}
- if (config.showSpotNames())
+ if (plugin.isShowSpotNames())
{
String text = spot.getName();
Point textLocation = npc.getCanvasTextLocation(graphics, text, npc.getLogicalHeight() + 40);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java
index 4c145ae303..811eca25bb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java
@@ -35,38 +35,37 @@ import java.awt.Rectangle;
import java.awt.geom.Line2D;
import java.util.ArrayList;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
+@Singleton
public class FlexoOverlay extends Overlay
{
- private static Rectangle clickArea;
-
- ArrayList clickAreas = new ArrayList<>();
- ArrayList clickPoints = new ArrayList<>();
+ @Inject
+ private FlexoPlugin plugin;
@Inject
- private FlexoConfig config;
-
- @Inject
- public FlexoOverlay(FlexoConfig config)
+ public FlexoOverlay(final FlexoPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_WIDGETS);
- this.config = config;
+ this.plugin = plugin;
}
@Override
public Dimension render(Graphics2D graphics)
{
- if (config.getDebugNPCs() || config.getDebugGroundItems() || config.getDebugPlayers())
+ if (!plugin.isOverlayEnabled())
{
- if (clickArea != null)
- {
- graphics.draw(clickArea);
- }
+ return null;
+ }
+
+ if (plugin.isDebugNPCs() || plugin.isDebugGroundItems() || plugin.isDebugPlayers())
+ {
+ ArrayList clickAreas = plugin.getClickAreas();
if (clickAreas != null)
{
for (Rectangle clickArea : clickAreas)
@@ -77,6 +76,8 @@ public class FlexoOverlay extends Overlay
}
}
}
+
+ ArrayList clickPoints = plugin.getClickPoints();
if (clickPoints != null)
{
for (Point p : clickPoints)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java
index ed49c53b91..e6587510ae 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java
@@ -36,10 +36,13 @@ import com.github.joonasvali.naturalmouse.support.SinusoidalDeviationProvider;
import com.github.joonasvali.naturalmouse.util.FlowTemplates;
import com.google.inject.Provides;
import java.awt.AWTException;
+import java.awt.Point;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
+import lombok.AccessLevel;
+import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.NPC;
import net.runelite.api.Perspective;
@@ -97,26 +100,52 @@ public class FlexoPlugin extends Plugin
@Inject
private FlexoOverlay overlay;
+ @Inject
+ private FlexoConfig config;
+
@Provides
FlexoConfig getConfig(ConfigManager configManager)
{
return configManager.getConfig(FlexoConfig.class);
}
+ @Getter(AccessLevel.PACKAGE)
+ private boolean overlayEnabled;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean debugNPCs;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean debugPlayers;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean debugGroundItems;
+ private int minDelayAmt;
+ private int getReactionTimeVariation;
+ private int getMouseDragSpeed;
+ private int getOvershoots;
+ private boolean getVariatingFlow;
+ private boolean getSlowStartupFlow;
+ private boolean getSlowStartup2Flow;
+ private boolean getJaggedFlow;
+ private boolean getInterruptedFlow;
+ private boolean getInterruptedFlow2;
+ private boolean getStoppingFlow;
+ private int getDeviationSlope;
+ private String getNoisinessDivider;
+ private int scalingFactor;
+
+ @Getter(AccessLevel.PACKAGE)
+ private ArrayList clickAreas = new ArrayList<>();
+ @Getter(AccessLevel.PACKAGE)
+ private ArrayList clickPoints = new ArrayList<>();
+
@Subscribe
private void onConfigChanged(ConfigChanged event)
{
- if (event.getKey().compareTo("overlayEnabled") == 0)
+ if (!event.getGroup().equals("flexo") || (!event.getGroup().equals("stretchedmode")) )
{
- if (getConfig(configManager).overlayEnabled())
- {
- overlayManager.add(overlay);
- }
- else
- {
- overlayManager.remove(overlay);
- }
+ return;
}
+
+ updateConfig();
updateMouseMotionFactory();
}
@@ -132,12 +161,12 @@ public class FlexoPlugin extends Plugin
{
Flexo.clientUI = clientUI;
}
- overlay.clickAreas = new ArrayList<>();
- overlay.clickPoints = new ArrayList<>();
- if (getConfig(configManager).getDebugNPCs())
+ this.clickAreas = new ArrayList<>();
+ this.clickPoints = new ArrayList<>();
+ if (this.debugNPCs)
{
Flexo.isStretched = client.isStretchedEnabled();
- Flexo.scale = configManager.getConfig(StretchedModeConfig.class).scalingFactor();
+ Flexo.scale = this.scalingFactor;
if (flexo != null)
{
for (NPC npc : client.getNpcs())
@@ -147,19 +176,19 @@ public class FlexoPlugin extends Plugin
if (npc.getConvexHull() != null)
{
Rectangle r = FlexoMouse.getClickArea(npc.getConvexHull().getBounds());
- overlay.clickAreas.add(r);
+ this.clickAreas.add(r);
java.awt.Point p = FlexoMouse.getClickPoint(r);
- overlay.clickPoints.add(p);
+ this.clickPoints.add(p);
}
}
}
}
}
- if (getConfig(configManager).getDebugPlayers())
+ if (this.debugPlayers)
{
Flexo.isStretched = client.isStretchedEnabled();
- Flexo.scale = configManager.getConfig(StretchedModeConfig.class).scalingFactor();
+ Flexo.scale = this.scalingFactor;
if (flexo != null)
{
for (Player player : client.getPlayers())
@@ -169,9 +198,9 @@ public class FlexoPlugin extends Plugin
if (player.getConvexHull() != null)
{
Rectangle r = FlexoMouse.getClickArea(player.getConvexHull().getBounds());
- overlay.clickAreas.add(r);
+ this.clickAreas.add(r);
java.awt.Point p = FlexoMouse.getClickPoint(r);
- overlay.clickPoints.add(p);
+ this.clickPoints.add(p);
}
}
}
@@ -179,10 +208,10 @@ public class FlexoPlugin extends Plugin
}
// Could still use some improvement
- if (getConfig(configManager).getDebugGroundItems())
+ if (this.debugGroundItems)
{
Flexo.isStretched = client.isStretchedEnabled();
- Flexo.scale = configManager.getConfig(StretchedModeConfig.class).scalingFactor();
+ Flexo.scale = this.scalingFactor;
if (flexo != null)
{
@@ -200,9 +229,9 @@ public class FlexoPlugin extends Plugin
Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds());
Rectangle r2 = FlexoMouse.getClickArea(r1);
Rectangle r3 = FlexoMouse.getClickArea(r2);
- overlay.clickAreas.add(r3);
+ this.clickAreas.add(r3);
java.awt.Point p = FlexoMouse.getClickPoint(r3);
- overlay.clickPoints.add(p);
+ this.clickPoints.add(p);
}
}
}
@@ -214,7 +243,7 @@ public class FlexoPlugin extends Plugin
private void updateMouseMotionFactory()
{
- Flexo.minDelay = getConfig(configManager).minDelayAmt();
+ Flexo.minDelay = this.minDelayAmt;
MouseMotionFactory factory = new MouseMotionFactory();
// TODO:Add Options for various flows to allow more personalization
List flows = new ArrayList<>();
@@ -222,50 +251,50 @@ public class FlexoPlugin extends Plugin
// Always add random
flows.add(new Flow(FlowTemplates.random()));
- if (getConfig(configManager).getVariatingFlow())
+ if (this.getVariatingFlow)
{
flows.add(new Flow(FlowTemplates.variatingFlow()));
}
- if (getConfig(configManager).getSlowStartupFlow())
+ if (this.getSlowStartupFlow)
{
flows.add(new Flow(FlowTemplates.slowStartupFlow()));
}
- if (getConfig(configManager).getSlowStartup2Flow())
+ if (this.getSlowStartup2Flow)
{
flows.add(new Flow(FlowTemplates.slowStartup2Flow()));
}
- if (getConfig(configManager).getJaggedFlow())
+ if (this.getJaggedFlow)
{
flows.add(new Flow(FlowTemplates.jaggedFlow()));
}
- if (getConfig(configManager).getInterruptedFlow())
+ if (this.getInterruptedFlow)
{
flows.add(new Flow(FlowTemplates.interruptedFlow()));
}
- if (getConfig(configManager).getInterruptedFlow2())
+ if (this.getInterruptedFlow2)
{
flows.add(new Flow(FlowTemplates.interruptedFlow2()));
}
- if (getConfig(configManager).getStoppingFlow())
+ if (this.getStoppingFlow)
{
flows.add(new Flow(FlowTemplates.stoppingFlow()));
}
DefaultSpeedManager manager = new DefaultSpeedManager(flows);
//TODO:Add options for custom Deviation Provider and Noise Provider
- factory.setDeviationProvider(new SinusoidalDeviationProvider(getConfig(configManager).getDeviationSlope()));
- factory.setNoiseProvider(new DefaultNoiseProvider(Double.valueOf(getConfig(configManager).getNoisinessDivider())));
- factory.getNature().setReactionTimeVariationMs(getConfig(configManager).getReactionTimeVariation());
- manager.setMouseMovementBaseTimeMs(getConfig(configManager).getMouseDragSpeed());
+ factory.setDeviationProvider(new SinusoidalDeviationProvider(this.getDeviationSlope));
+ factory.setNoiseProvider(new DefaultNoiseProvider(Double.valueOf(this.getNoisinessDivider)));
+ factory.getNature().setReactionTimeVariationMs(this.getReactionTimeVariation);
+ manager.setMouseMovementBaseTimeMs(this.getMouseDragSpeed);
DefaultOvershootManager overshootManager = (DefaultOvershootManager) factory.getOvershootManager();
- overshootManager.setOvershoots(getConfig(configManager).getOvershoots());
+ overshootManager.setOvershoots(this.getOvershoots);
factory.setSpeedManager(manager);
Flexo.currentMouseMotionFactory = factory;
@@ -274,6 +303,8 @@ public class FlexoPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
Flexo.isStretched = client.isStretchedEnabled();
overlayManager.add(overlay);
updateMouseMotionFactory();
@@ -284,4 +315,26 @@ public class FlexoPlugin extends Plugin
{
overlayManager.remove(overlay);
}
+
+ private void updateConfig()
+ {
+ this.overlayEnabled = config.overlayEnabled();
+ this.debugNPCs = config.getDebugNPCs();
+ this.debugPlayers = config.getDebugPlayers();
+ this.debugGroundItems = config.getDebugGroundItems();
+ this.minDelayAmt = config.minDelayAmt();
+ this.getReactionTimeVariation = config.getReactionTimeVariation();
+ this.getMouseDragSpeed = config.getMouseDragSpeed();
+ this.getOvershoots = config.getOvershoots();
+ this.getVariatingFlow = config.getVariatingFlow();
+ this.getSlowStartupFlow = config.getSlowStartupFlow();
+ this.getSlowStartup2Flow = config.getSlowStartup2Flow();
+ this.getJaggedFlow = config.getJaggedFlow();
+ this.getInterruptedFlow = config.getInterruptedFlow();
+ this.getInterruptedFlow2 = config.getInterruptedFlow2();
+ this.getStoppingFlow = config.getStoppingFlow();
+ this.getDeviationSlope = config.getDeviationSlope();
+ this.getNoisinessDivider = config.getNoisinessDivider();
+ this.scalingFactor = configManager.getConfig(StretchedModeConfig.class).scalingFactor();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java
index 1dfbc0bda0..a46289ad80 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.Point;
@@ -40,12 +41,11 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.ProgressPieComponent;
-
+@Singleton
public class FlinchingOverlay extends Overlay
{
private final Client client;
private final FlinchingPlugin plugin;
- private final FlinchingConfig config;
private Color color;
private Color borderColor;
@@ -53,15 +53,14 @@ public class FlinchingOverlay extends Overlay
private int overlaySize;
@Inject
- FlinchingOverlay(Client client, FlinchingPlugin plugin, FlinchingConfig config)
+ FlinchingOverlay(Client client, FlinchingPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
this.plugin = plugin;
- this.config = config;
this.client = client;
- overlaySize = this.config.getFlinchOverlaySize();
+ overlaySize = this.plugin.getFlinchOverlaySize();
}
@Override
@@ -73,10 +72,10 @@ public class FlinchingOverlay extends Overlay
public void updateConfig()
{
- borderColor = config.getFlinchOverlayColor();
+ borderColor = plugin.getFlinchOverlayColor();
color = new Color(borderColor.getRed(), borderColor.getGreen(), borderColor.getBlue(), 100);
- overlaySize = config.getFlinchOverlaySize();
+ overlaySize = plugin.getFlinchOverlaySize();
}
private void drawOverlays(Graphics2D graphics)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java
index bbe125e4f7..0ed62ecd06 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java
@@ -25,10 +25,14 @@
package net.runelite.client.plugins.flinching;
import com.google.inject.Provides;
+import java.awt.Color;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Actor;
import net.runelite.api.Client;
@@ -49,6 +53,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
@Slf4j
+@Singleton
@PluginDescriptor(
name = "Flinching Timer",
description = "Time your attacks while flinching",
@@ -79,6 +84,15 @@ public class FlinchingPlugin extends Plugin
private boolean resetOnHit = true;
private boolean resetOnHitReceived = true;
+ private int getFlinchAttackedDelay;
+ private int getFlinchDelay;
+ @Getter(AccessLevel.PACKAGE)
+ private int flinchOverlaySize;
+ @Getter(AccessLevel.PACKAGE)
+ private Color flinchOverlayColor;
+ private boolean getFlinchResetOnHit;
+ private boolean getFlinchResetOnHitReceived;
+
@Provides
FlinchingConfig provideConfig(ConfigManager configManager)
{
@@ -88,11 +102,13 @@ public class FlinchingPlugin extends Plugin
@Override
protected void startUp()
{
+ updateConfig();
+
overlayManager.add(overlay);
overlay.updateConfig();
- resetOnHit = config.getFlinchResetOnHit();
- resetOnHitReceived = config.getFlinchResetOnHitReceived();
+ resetOnHit = this.getFlinchResetOnHit;
+ resetOnHitReceived = this.getFlinchResetOnHitReceived;
ClearTargets();
}
@@ -108,16 +124,18 @@ public class FlinchingPlugin extends Plugin
{
if (event.getGroup().equals("flinching"))
{
+ updateConfig();
+
overlay.updateConfig();
- resetOnHit = config.getFlinchResetOnHit();
- resetOnHitReceived = config.getFlinchResetOnHitReceived();
+ resetOnHit = this.getFlinchResetOnHit;
+ resetOnHitReceived = this.getFlinchResetOnHitReceived;
for (Map.Entry integerFlinchingTargetEntry : flinchingTargets.entrySet())
{
FlinchingTarget target = integerFlinchingTargetEntry.getValue();
if (target != null)
{
- target.SetDelayTime(config.getFlinchDelay(), config.getFlinchAttackedDelay());
+ target.SetDelayTime(this.getFlinchDelay, this.getFlinchAttackedDelay);
}
}
}
@@ -279,4 +297,14 @@ public class FlinchingPlugin extends Plugin
{
return (flinchingTargets);
}
+
+ private void updateConfig()
+ {
+ this.getFlinchAttackedDelay = config.getFlinchAttackedDelay();
+ this.getFlinchDelay = config.getFlinchDelay();
+ this.flinchOverlaySize = config.getFlinchOverlaySize();
+ this.flinchOverlayColor = config.getFlinchOverlayColor();
+ this.getFlinchResetOnHit = config.getFlinchResetOnHit();
+ this.getFlinchResetOnHitReceived = config.getFlinchResetOnHitReceived();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java
index 24c0aad399..58d90cb247 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.flinching;
import java.time.Duration;
import java.time.Instant;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.NPC;
import net.runelite.api.coords.WorldPoint;
@@ -42,11 +43,11 @@ public class FlinchingTarget
public boolean isActive;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int objectId;
private NPC targetObject;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
public WorldPoint worldLocation;
FlinchingTarget(NPC target)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java
index 671098a333..3fdd3f6925 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java
@@ -59,7 +59,7 @@ public class FpsDrawListener implements Runnable
private long sleepDelay = 0;
@Inject
- private FpsDrawListener(FpsConfig config, FpsPlugin plugin)
+ private FpsDrawListener(final FpsConfig config, final FpsPlugin plugin)
{
this.config = config;
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java
index 110a447966..17afae61b6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Point;
import net.runelite.api.Varbits;
@@ -47,6 +48,7 @@ import net.runelite.client.ui.overlay.OverlayUtil;
* This locks "FPS:" into one position (the far top right corner of the canvas),
* along with a locked position for the FPS value.
*/
+@Singleton
public class FpsOverlay extends Overlay
{
// Local dependencies
@@ -57,7 +59,7 @@ public class FpsOverlay extends Overlay
private boolean isFocused = true;
@Inject
- private FpsOverlay(FpsPlugin plugin, Client client)
+ private FpsOverlay(final FpsPlugin plugin, final Client client)
{
this.client = client;
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java
index 2ef788fab8..686b09c152 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.fps;
import com.google.inject.Inject;
import com.google.inject.Provides;
+import com.google.inject.Singleton;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -64,6 +65,7 @@ import net.runelite.client.util.ping.Ping;
tags = {"frames", "framerate", "limit", "overlay", "ping"},
enabledByDefault = false
)
+@Singleton
public class FpsPlugin extends Plugin
{
static final String CONFIG_GROUP_KEY = "fpscontrol";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java
index 47cbd82c69..c9921af410 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java
@@ -24,10 +24,11 @@
package net.runelite.client.plugins.freezetimers;
import java.awt.Font;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
-@Getter
+@Getter(AccessLevel.PACKAGE)
@AllArgsConstructor
public enum FontStyle
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java
index 233c6710c0..2a5409cd4d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java
@@ -1,5 +1,6 @@
package net.runelite.client.plugins.freezetimers;
+import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import net.runelite.api.Actor;
@@ -8,8 +9,8 @@ import net.runelite.api.coords.LocalPoint;
@Builder
class FreezeInfo
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final Actor actor;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final LocalPoint freezePoint;
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java
index 6842cd111d..fe43baae47 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java
@@ -34,6 +34,7 @@ import java.awt.Graphics2D;
import java.awt.Polygon;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import net.runelite.api.GraphicID;
@@ -45,24 +46,22 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.util.ImageUtil;
-
+@Singleton
public class FreezeTimersOverlay extends Overlay
{
- private final FreezeTimersConfig config;
+ private final FreezeTimersPlugin plugin;
private final Client client;
private final Font timerFont = FontManager.getRunescapeBoldFont().deriveFont(14.0f);
private final BufferedImage FREEZE_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "freeze.png");
private final BufferedImage TB_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "teleblock.png");
private final BufferedImage VENG_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "veng.png");
private Timers timers;
- private boolean lock;
- private long finishedAtTest;
@Inject
- public FreezeTimersOverlay(FreezeTimersConfig config, Client client, Timers timers)
+ public FreezeTimersOverlay(final FreezeTimersPlugin plugin, final Client client, final Timers timers)
{
- this.config = config;
+ this.plugin = plugin;
this.client = client;
this.timers = timers;
setPriority(OverlayPriority.HIGHEST);
@@ -73,11 +72,11 @@ public class FreezeTimersOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (config.showPlayers())
+ if (plugin.isShowPlayers())
{
client.getPlayers().forEach((p) -> renderOverlayFor(graphics, p));
}
- if (config.showNpcs())
+ if (plugin.isShowNpcs())
{
client.getNpcs().forEach((npc) -> renderOverlayFor(graphics, npc));
}
@@ -93,15 +92,15 @@ public class FreezeTimersOverlay extends Overlay
int overlaysDrawn = 0;
- if (drawFreezeOverlay(g, actor, overlaysDrawn) && config.FreezeTimers())
+ if (drawFreezeOverlay(g, actor, overlaysDrawn) && plugin.isFreezeTimers())
{
overlaysDrawn++;
}
- if (drawTBOverlay(g, actor, overlaysDrawn) && config.TB())
+ if (drawTBOverlay(g, actor, overlaysDrawn) && plugin.isTB())
{
overlaysDrawn++;
}
- if (drawVengOverlay(g, actor, overlaysDrawn) && config.Veng())
+ if (drawVengOverlay(g, actor, overlaysDrawn) && plugin.isVeng())
{
overlaysDrawn++;
}
@@ -127,15 +126,15 @@ public class FreezeTimersOverlay extends Overlay
Point FixedPoint = new Point(poi.getX(), poi.getY());
- if (config.noImage())
+ if (plugin.isNoImage())
{
if (test > 3)
{
- OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.WHITE, FixedPoint, false, 0);
+ OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.WHITE, FixedPoint, false, 0);
}
else
{
- OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.YELLOW, FixedPoint, false, 0);
+ OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.YELLOW, FixedPoint, false, 0);
}
}
else
@@ -148,7 +147,7 @@ public class FreezeTimersOverlay extends Overlay
private boolean drawTBOverlay(Graphics2D g, Actor actor, int overlaysDrawn)
{
long currentTick = System.currentTimeMillis();
- if (!config.TB())
+ if (!plugin.isTB())
{
return false;
}
@@ -167,19 +166,19 @@ public class FreezeTimersOverlay extends Overlay
}
Point FixedPoint = new Point(poi.getX() + 20, poi.getY());
- if (config.noImage())
+ if (plugin.isNoImage())
{
if (timers.getTimerEnd(actor, TimerType.FREEZE) <= currentTick)
{
- OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.CYAN, poi, false, 0);
+ OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.CYAN, poi, false, 0);
}
if (timers.getTimerEnd(actor, TimerType.FREEZE) >= currentTick)
{
- OverlayUtil.renderTextLocation(g, " | " + text, config.textSize(), config.fontStyle().getFont(), Color.CYAN, FixedPoint, false, 0);
+ OverlayUtil.renderTextLocation(g, " | " + text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.CYAN, FixedPoint, false, 0);
}
if (timers.getTimerEnd(actor, TimerType.VENG) >= currentTick)
{
- OverlayUtil.renderTextLocation(g, " | " + text, config.textSize(), config.fontStyle().getFont(), Color.CYAN, FixedPoint, false, 0);
+ OverlayUtil.renderTextLocation(g, " | " + text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.CYAN, FixedPoint, false, 0);
}
}
else
@@ -192,7 +191,7 @@ public class FreezeTimersOverlay extends Overlay
private boolean drawVengOverlay(Graphics2D g, Actor actor, int overlaysDrawn)
{
long currentTick = System.currentTimeMillis();
- if (!config.Veng())
+ if (!plugin.isVeng())
{
return false;
}
@@ -211,19 +210,19 @@ public class FreezeTimersOverlay extends Overlay
}
Point FixedPoint = new Point(poi.getX() - 20, poi.getY());
- if (config.noImage())
+ if (plugin.isNoImage())
{
if (timers.getTimerEnd(actor, TimerType.FREEZE) <= currentTick)
{
- OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.RED, poi, false, 0);
+ OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.RED, poi, false, 0);
}
if (timers.getTimerEnd(actor, TimerType.FREEZE) >= currentTick)
{
- OverlayUtil.renderTextLocation(g, text + " | ", config.textSize(), config.fontStyle().getFont(), Color.RED, FixedPoint, false, 0);
+ OverlayUtil.renderTextLocation(g, text + " | ", plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.RED, FixedPoint, false, 0);
}
if (timers.getTimerEnd(actor, TimerType.TELEBLOCK) >= currentTick)
{
- OverlayUtil.renderTextLocation(g, text + " | ", config.textSize(), config.fontStyle().getFont(), Color.RED, FixedPoint, false, 0);
+ OverlayUtil.renderTextLocation(g, text + " | ", plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.RED, FixedPoint, false, 0);
}
}
else
@@ -253,7 +252,7 @@ public class FreezeTimersOverlay extends Overlay
int yOffset = (overlaysDrawn * 18);
g.setFont(timerFont);
g.setColor(WHITE);
- int xOffset = config.offset();
+ int xOffset = plugin.getOffset();
renderActorTextAndImage(g, actor, text, Color.WHITE, image, yOffset,
xOffset);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java
index e66279aa4d..5769c33df1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java
@@ -28,9 +28,13 @@ import com.google.inject.Provides;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import net.runelite.api.Player;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.SpotAnimationChanged;
import net.runelite.api.events.PlayerDespawned;
@@ -48,11 +52,10 @@ import net.runelite.client.ui.overlay.OverlayManager;
type = PluginType.PVP,
enabledByDefault = false
)
-
+@Singleton
public class FreezeTimersPlugin extends Plugin
{
private final Map freezes = new HashMap<>();
- private Actor player;
@Inject
private Client client;
@@ -69,8 +72,31 @@ public class FreezeTimersPlugin extends Plugin
@Inject
private FreezeTimersOverlay overlay;
+ @Inject
+ private FreezeTimersConfig config;
+
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showPlayers;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showNpcs;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean FreezeTimers;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean TB;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean Veng;
+ @Getter(AccessLevel.PACKAGE)
+ private int offset;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean noImage;
+ @Getter(AccessLevel.PACKAGE)
+ private FontStyle fontStyle;
+ @Getter(AccessLevel.PACKAGE)
+ private int textSize;
+
public void startUp()
{
+ updateConfig();
overlayManager.add(overlay);
}
@@ -141,4 +167,26 @@ public class FreezeTimersPlugin extends Plugin
freezes.remove(actor.getName());
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (event.getGroup().equals("freezetimers"))
+ {
+ updateConfig();
+ }
+ }
+
+ private void updateConfig()
+ {
+ this.showPlayers = config.showPlayers();
+ this.showNpcs = config.showNpcs();
+ this.FreezeTimers = config.FreezeTimers();
+ this.TB = config.TB();
+ this.Veng = config.Veng();
+ this.offset = config.offset();
+ this.noImage = config.noImage();
+ this.fontStyle = config.fontStyle();
+ this.textSize = config.textSize();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java
index 7c8fbf80ce..bc95d19900 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java
@@ -24,6 +24,7 @@
*/
package net.runelite.client.plugins.freezetimers;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -42,20 +43,20 @@ public enum PlayerSpellEffect
VENG_OTHER("Vengeance Other", 725, 30000, false, 9, TimerType.VENG),
NONE("Nothing", -69, 420, true, 9999, TimerType.THIS_SHIT_BROKE);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final String name;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final int spotAnimId;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final int timerLengthTicks;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private boolean halvable;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final int spriteIdx;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final TimerType type;
- public static PlayerSpellEffect getFromSpotAnim(int spotAnim)
+ static PlayerSpellEffect getFromSpotAnim(int spotAnim)
{
for (PlayerSpellEffect effect : values())
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java
index 475cff14ad..05806a1c24 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java
@@ -71,12 +71,12 @@ public class PrayerTracker
newTick.get(actor).put("SpotAnim", actor.getSpotAnimation());
}
- public int getPrayerIconLastTick(Actor p)
+ int getPrayerIconLastTick(Actor p)
{
return lastTick.getOrDefault(p, new HashMap<>()).getOrDefault("PrayerIcon", -1337);
}
- public int getSpotanimLastTick(Actor p)
+ int getSpotanimLastTick(Actor p)
{
return lastTick.getOrDefault(p, new HashMap<>()).getOrDefault("SpotAnim", -1337);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java
index c74ab74c3d..0d58af3127 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java
@@ -24,28 +24,22 @@
package net.runelite.client.plugins.freezetimers;
import java.util.HashMap;
-import javax.inject.Inject;
import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Actor;
-import net.runelite.api.Client;
@Slf4j
@Singleton
public class Timers
{
-
- @Inject
- private Client client;
-
private HashMap> timerMap = new HashMap<>();
- public void gameTick()
+ void gameTick()
{
}
- public void setTimerEnd(Actor actor, TimerType type, long n)
+ void setTimerEnd(Actor actor, TimerType type, long n)
{
if (!timerMap.containsKey(actor))
{
@@ -54,7 +48,7 @@ public class Timers
timerMap.get(actor).put(type, n);
}
- public long getTimerEnd(Actor actor, TimerType type)
+ long getTimerEnd(Actor actor, TimerType type)
{
if (!timerMap.containsKey(actor))
{
@@ -63,7 +57,7 @@ public class Timers
return timerMap.get(actor).getOrDefault(type, (long) 0);
}
- public boolean areAllTimersZero(Actor actor)
+ boolean areAllTimersZero(Actor actor)
{
for (TimerType type : TimerType.values())
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java
index 355d9db46a..b98b68d7eb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java
@@ -26,6 +26,7 @@
package net.runelite.client.plugins.friendlist;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.VarPlayer;
import net.runelite.api.events.GameTick;
@@ -39,6 +40,7 @@ import net.runelite.client.plugins.PluginDescriptor;
name = "Friend List",
description = "Add extra information to the friend and ignore lists"
)
+@Singleton
public class FriendListPlugin extends Plugin
{
private static final int MAX_FRIENDS_P2P = 400;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java
index 554a823573..acac979de6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java
@@ -30,11 +30,13 @@ package net.runelite.client.plugins.friendnotes;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.tooltip.Tooltip;
import net.runelite.client.ui.overlay.tooltip.TooltipManager;
+@Singleton
class FriendNoteOverlay extends Overlay
{
private final Client client;
@@ -42,7 +44,7 @@ class FriendNoteOverlay extends Overlay
private final TooltipManager tooltipManager;
@Inject
- private FriendNoteOverlay(Client client, FriendNotesPlugin plugin, TooltipManager tooltipManager)
+ private FriendNoteOverlay(final Client client, final FriendNotesPlugin plugin, final TooltipManager tooltipManager)
{
this.client = client;
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
index fe27938a7e..75561cb114 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
@@ -32,6 +32,7 @@ import com.google.common.collect.ObjectArrays;
import java.awt.Color;
import javax.annotation.Nullable;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
@@ -58,6 +59,7 @@ import net.runelite.client.util.Text;
name = "Friend Notes",
description = "Store notes about your friends"
)
+@Singleton
public class FriendNotesPlugin extends Plugin
{
private static final String CONFIG_GROUP = "friendNotes";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java
index 99434bcffe..c4c088aab3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java
@@ -18,6 +18,7 @@ import java.util.HashSet;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
@@ -52,7 +53,7 @@ import org.apache.commons.lang3.ArrayUtils;
type = PluginType.UTILITY,
enabledByDefault = false
)
-
+@Singleton
public class FriendTaggingPlugin extends Plugin
{
public static final ConcurrentHashMap taggedFriends = new ConcurrentHashMap<>();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java
index 2629e81e4b..8c4bf270fc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java
@@ -37,33 +37,33 @@ class GLUtil
private static final int[] buf = new int[1];
private static final float[] fbuf = new float[1];
- static int glGetInteger(GL4 gl, int pname)
+ static int glGetInteger(GL4 gl)
{
- gl.glGetIntegerv(pname, buf, 0);
+ gl.glGetIntegerv(com.jogamp.opengl.GL.GL_MAX_SAMPLES, buf, 0);
return buf[0];
}
- static float glGetFloat(GL4 gl, int pname)
+ static float glGetFloat(GL4 gl)
{
- gl.glGetFloatv(pname, fbuf, 0);
+ gl.glGetFloatv(com.jogamp.opengl.GL.GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, fbuf, 0);
return fbuf[0];
}
- static int glGetShader(GL4 gl, int shader, int pname)
+ private static int glGetShader(GL4 gl, int shader)
{
- gl.glGetShaderiv(shader, pname, buf, 0);
+ gl.glGetShaderiv(shader, com.jogamp.opengl.GL2ES2.GL_COMPILE_STATUS, buf, 0);
assert buf[0] > -1;
return buf[0];
}
- static int glGetProgram(GL4 gl, int program, int pname)
+ private static int glGetProgram(GL4 gl, int program, int pname)
{
gl.glGetProgramiv(program, pname, buf, 0);
assert buf[0] > -1;
return buf[0];
}
- static String glGetShaderInfoLog(GL4 gl, int shader)
+ private static String glGetShaderInfoLog(GL4 gl, int shader)
{
byte[] err = new byte[ERR_LEN];
gl.glGetShaderInfoLog(shader, ERR_LEN, buf, 0, err, 0);
@@ -192,7 +192,7 @@ class GLUtil
gl.glShaderSource(shader, 1, new String[]{source}, null);
gl.glCompileShader(shader);
- if (glGetShader(gl, shader, gl.GL_COMPILE_STATUS) == gl.GL_TRUE)
+ if (glGetShader(gl, shader) == gl.GL_TRUE)
{
gl.glAttachShader(program, shader);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java
index a90d85a16d..a5901d65b2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java
@@ -32,9 +32,9 @@ class GpuFloatBuffer
{
private FloatBuffer buffer = allocateDirect(65536);
- void put(float texture, float u, float v, float pad)
+ void put(float texture, float u, float v)
{
- buffer.put(texture).put(u).put(v).put(pad);
+ buffer.put(texture).put(u).put(v).put((float) 0.0);
}
void flip()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java
index 15ea5461ad..bc85a230b0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java
@@ -32,11 +32,6 @@ class GpuIntBuffer
{
private IntBuffer buffer = allocateDirect(65536);
- void put(int x, int y, int z)
- {
- buffer.put(x).put(y).put(z);
- }
-
void put(int x, int y, int z, int c)
{
buffer.put(x).put(y).put(z).put(c);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
index e437d3cbe9..272ff27c39 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
@@ -48,6 +48,7 @@ import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.util.function.Function;
import javax.inject.Inject;
+import javax.inject.Singleton;
import jogamp.nativewindow.SurfaceScaleUtils;
import jogamp.nativewindow.jawt.x11.X11JAWTWindow;
import jogamp.newt.awt.NewtFactoryAWT;
@@ -65,6 +66,7 @@ import net.runelite.api.SceneTileModel;
import net.runelite.api.SceneTilePaint;
import net.runelite.api.Texture;
import net.runelite.api.TextureProvider;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.hooks.DrawCallbacks;
import net.runelite.client.callback.ClientThread;
@@ -88,6 +90,7 @@ import net.runelite.client.util.OSType;
tags = {"fog", "draw distance"}
)
@Slf4j
+@Singleton
public class GpuPlugin extends Plugin implements DrawCallbacks
{
// This is the maximum number of triangles the compute shaders support
@@ -227,9 +230,38 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
private int uniBlockMain;
private int uniSmoothBanding;
+ private int drawDistance;
+ private boolean smoothBanding;
+ private AntiAliasingMode antiAliasingMode;
+ private AnisotropicFilteringMode anisotropicFilteringMode;
+ private int fogDepth;
+ private int fogCircularity;
+ private int fogDensity;
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (event.getGroup().equals("gpu"))
+ {
+ updateConfig();
+ }
+ }
+
+ private void updateConfig()
+ {
+ this.drawDistance = config.drawDistance();
+ this.smoothBanding = config.smoothBanding();
+ this.antiAliasingMode = config.antiAliasingMode();
+ this.anisotropicFilteringMode = config.anisotropicFilteringMode();
+ this.fogDepth = config.fogDepth();
+ this.fogCircularity = config.fogCircularity();
+ this.fogDensity = config.fogDensity();
+ }
+
@Override
protected void startUp()
{
+ updateConfig();
clientThread.invoke(() ->
{
try
@@ -704,7 +736,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
centerY = client.getCenterY();
final Scene scene = client.getScene();
- final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, config.drawDistance()));
+ final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, this.drawDistance));
scene.setDrawDistance(drawDistance);
}
@@ -794,7 +826,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
}
// Setup anti-aliasing
- final AntiAliasingMode antiAliasingMode = config.antiAliasingMode();
+ final AntiAliasingMode antiAliasingMode = this.antiAliasingMode;
final boolean aaEnabled = antiAliasingMode != AntiAliasingMode.DISABLED;
if (aaEnabled)
@@ -813,7 +845,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
{
shutdownSceneFbo();
- final int maxSamples = glGetInteger(gl, gl.GL_MAX_SAMPLES);
+ final int maxSamples = glGetInteger(gl);
final int samples = Math.min(antiAliasingMode.getSamples(), maxSamples);
initSceneFbo(stretchedCanvasWidth, stretchedCanvasHeight, samples);
@@ -977,8 +1009,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
int renderViewportWidth = viewportWidth;
// Setup anisotropic filtering
- final AnisotropicFilteringMode anisotropicFilteringMode = config.anisotropicFilteringMode();
- final boolean afEnabled = anisotropicFilteringMode != anisotropicFilteringMode.DISABLED;
+ final AnisotropicFilteringMode anisotropicFilteringMode = this.anisotropicFilteringMode;
+ final boolean afEnabled = anisotropicFilteringMode != AnisotropicFilteringMode.DISABLED;
if (lastAnisotropicFilteringMode != anisotropicFilteringMode)
{
@@ -993,7 +1025,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
gl.glTexParameteri(gl.GL_TEXTURE_2D_ARRAY, gl.GL_TEXTURE_MIN_FILTER, gl.GL_LINEAR_MIPMAP_LINEAR);
break;
default:
- final float maxSamples = glGetFloat(gl, gl.GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT);
+ final float maxSamples = glGetFloat(gl);
final float samples = Math.min(anisotropicFilteringMode.getSamples(), maxSamples);
gl.glTexParameteri(gl.GL_TEXTURE_2D_ARRAY, gl.GL_TEXTURE_MIN_FILTER, gl.GL_LINEAR_MIPMAP_LINEAR);
gl.glTexParameterf(gl.GL_TEXTURE_2D_ARRAY, gl.GL_TEXTURE_MAX_ANISOTROPY_EXT, samples);
@@ -1034,19 +1066,19 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
gl.glUseProgram(glProgram);
- final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, config.drawDistance()));
- final int fogDepth = config.fogDepth();
+ final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, this.drawDistance));
+ final int fogDepth = this.fogDepth;
float effectiveDrawDistance = Perspective.LOCAL_TILE_SIZE * Math.min(Constants.SCENE_SIZE / 2, drawDistance);
gl.glUniform1i(uniUseFog, fogDepth > 0 ? 1 : 0);
gl.glUniform4f(uniFogColor, (sky >> 16 & 0xFF) / 255f, (sky >> 8 & 0xFF) / 255f, (sky & 0xFF) / 255f, 1f);
- gl.glUniform1f(uniFogDepth, config.fogDepth() * 0.01f * effectiveDrawDistance);
- gl.glUniform1f(uniFogCornerRadius, config.fogCircularity() * 0.01f * effectiveDrawDistance);
- gl.glUniform1f(uniFogDensity, config.fogDensity() * 0.1f);
+ gl.glUniform1f(uniFogDepth, this.fogDepth * 0.01f * effectiveDrawDistance);
+ gl.glUniform1f(uniFogCornerRadius, this.fogCircularity * 0.01f * effectiveDrawDistance);
+ gl.glUniform1f(uniFogDensity, this.fogDensity * 0.1f);
gl.glUniform1i(uniDrawDistance, drawDistance * Perspective.LOCAL_TILE_SIZE);
// Brightness happens to also be stored in the texture provider, so we use that
gl.glUniform1f(uniBrightness, (float) textureProvider.getBrightness());
- gl.glUniform1f(uniSmoothBanding, config.smoothBanding() ? 0f : 1f);
+ gl.glUniform1f(uniSmoothBanding, this.smoothBanding ? 0f : 1f);
for (int id = 0; id < textures.length; ++id)
{
@@ -1303,7 +1335,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
/**
* Check is a model is visible and should be drawn.
*/
- private boolean isVisible(Model model, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int _x, int _y, int _z, long hash)
+ private boolean isNotVisible(Model model, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int _x, int _y, int _z, long hash)
{
final int XYZMag = model.getXYZMag();
final int zoom = client.get3dZoom();
@@ -1334,12 +1366,12 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
{
int var21 = (pitchCos * modelHeight >> 16) + var19;
int var22 = (var18 - var21) * zoom;
- return var22 / var14 < Rasterizer3D_clipMidY2;
+ return var22 / var14 >= Rasterizer3D_clipMidY2;
}
}
}
}
- return false;
+ return true;
}
/**
@@ -1367,7 +1399,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
model.calculateBoundsCylinder();
model.calculateExtreme(orientation);
- if (!isVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash))
+ if (isNotVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash))
{
return;
}
@@ -1431,7 +1463,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
model.calculateBoundsCylinder();
model.calculateExtreme(orientation);
- if (!isVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash))
+ if (isNotVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash))
{
return;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java
index cb7d283d69..056e32cc39 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java
@@ -292,48 +292,34 @@ class SceneUploader
vertexBuffer.ensureCapacity(24);
uvBuffer.ensureCapacity(24);
- // 0,0
- int vertexDx = localX;
- int vertexDy = localY;
- int vertexDz = swHeight;
- final int c1 = swColor;
-
// 1,0
int vertexCx = localX + Perspective.LOCAL_TILE_SIZE;
- int vertexCy = localY;
- int vertexCz = seHeight;
- final int c2 = seColor;
// 1,1
int vertexAx = localX + Perspective.LOCAL_TILE_SIZE;
int vertexAy = localY + Perspective.LOCAL_TILE_SIZE;
- int vertexAz = neHeight;
- final int c3 = neColor;
// 0,1
- int vertexBx = localX;
int vertexBy = localY + Perspective.LOCAL_TILE_SIZE;
- int vertexBz = nwHeight;
- final int c4 = nwColor;
- vertexBuffer.put(vertexAx, vertexAz, vertexAy, c3);
- vertexBuffer.put(vertexBx, vertexBz, vertexBy, c4);
- vertexBuffer.put(vertexCx, vertexCz, vertexCy, c2);
+ vertexBuffer.put(vertexAx, neHeight, vertexAy, neColor);
+ vertexBuffer.put(localX, nwHeight, vertexBy, nwColor);
+ vertexBuffer.put(vertexCx, seHeight, localY, seColor);
- vertexBuffer.put(vertexDx, vertexDz, vertexDy, c1);
- vertexBuffer.put(vertexCx, vertexCz, vertexCy, c2);
- vertexBuffer.put(vertexBx, vertexBz, vertexBy, c4);
+ vertexBuffer.put(localX, swHeight, localY, swColor);
+ vertexBuffer.put(vertexCx, seHeight, localY, seColor);
+ vertexBuffer.put(localX, nwHeight, vertexBy, nwColor);
if (tile.getTexture() != -1)
{
float tex = tile.getTexture() + 1f;
- uvBuffer.put(tex, 1.0f, 1.0f, 0f);
- uvBuffer.put(tex, 0.0f, 1.0f, 0f);
- uvBuffer.put(tex, 1.0f, 0.0f, 0f);
+ uvBuffer.put(tex, 1.0f, 1.0f);
+ uvBuffer.put(tex, 0.0f, 1.0f);
+ uvBuffer.put(tex, 1.0f, 0.0f);
- uvBuffer.put(tex, 0.0f, 0.0f, 0f);
- uvBuffer.put(tex, 1.0f, 0.0f, 0f);
- uvBuffer.put(tex, 0.0f, 1.0f, 0f);
+ uvBuffer.put(tex, 0.0f, 0.0f);
+ uvBuffer.put(tex, 1.0f, 0.0f);
+ uvBuffer.put(tex, 0.0f, 1.0f);
}
return 6;
@@ -399,15 +385,15 @@ class SceneUploader
if (triangleTextures[i] != -1)
{
float tex = triangleTextures[i] + 1f;
- uvBuffer.put(tex, vertexXA / 128f, vertexZA / 128f, 0f);
- uvBuffer.put(tex, vertexXB / 128f, vertexZB / 128f, 0f);
- uvBuffer.put(tex, vertexXC / 128f, vertexZC / 128f, 0f);
+ uvBuffer.put(tex, vertexXA / 128f, vertexZA / 128f);
+ uvBuffer.put(tex, vertexXB / 128f, vertexZB / 128f);
+ uvBuffer.put(tex, vertexXC / 128f, vertexZC / 128f);
}
else
{
- uvBuffer.put(0, 0, 0, 0f);
- uvBuffer.put(0, 0, 0, 0f);
- uvBuffer.put(0, 0, 0, 0f);
+ uvBuffer.put(0, 0, 0);
+ uvBuffer.put(0, 0, 0);
+ uvBuffer.put(0, 0, 0);
}
}
}
@@ -537,9 +523,9 @@ class SceneUploader
if (faceTextures != null)
{
- uvBuffer.put(0, 0, 0, 0f);
- uvBuffer.put(0, 0, 0, 0f);
- uvBuffer.put(0, 0, 0, 0f);
+ uvBuffer.put(0, 0, 0);
+ uvBuffer.put(0, 0, 0);
+ uvBuffer.put(0, 0, 0);
}
return 3;
}
@@ -572,15 +558,15 @@ class SceneUploader
if (u != null && v != null && (uf = u[face]) != null && (vf = v[face]) != null)
{
float texture = faceTextures[face] + 1f;
- uvBuffer.put(texture, uf[0], vf[0], 0f);
- uvBuffer.put(texture, uf[1], vf[1], 0f);
- uvBuffer.put(texture, uf[2], vf[2], 0f);
+ uvBuffer.put(texture, uf[0], vf[0]);
+ uvBuffer.put(texture, uf[1], vf[1]);
+ uvBuffer.put(texture, uf[2], vf[2]);
}
else
{
- uvBuffer.put(0f, 0f, 0f, 0f);
- uvBuffer.put(0f, 0f, 0f, 0f);
- uvBuffer.put(0f, 0f, 0f, 0f);
+ uvBuffer.put(0f, 0f, 0f);
+ uvBuffer.put(0f, 0f, 0f);
+ uvBuffer.put(0f, 0f, 0f);
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java
index c2533d59e4..56cc228a6e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.grandexchange;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.swing.SwingUtilities;
import net.runelite.api.Client;
import net.runelite.api.MenuEntry;
@@ -35,13 +36,14 @@ import net.runelite.client.input.MouseAdapter;
import static net.runelite.client.plugins.grandexchange.GrandExchangePlugin.SEARCH_GRAND_EXCHANGE;
import net.runelite.client.util.Text;
+@Singleton
public class GrandExchangeInputListener extends MouseAdapter implements KeyListener
{
private final Client client;
private final GrandExchangePlugin plugin;
@Inject
- private GrandExchangeInputListener(Client client, GrandExchangePlugin plugin)
+ private GrandExchangeInputListener(final Client client, final GrandExchangePlugin plugin)
{
this.client = client;
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java
index 9c93d47b0f..c60130e94c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java
@@ -35,6 +35,7 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
+import javax.inject.Singleton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.CompoundBorder;
@@ -48,6 +49,7 @@ import net.runelite.client.util.StackFormatter;
* This panel displays an individual item result in the
* Grand Exchange search plugin.
*/
+@Singleton
class GrandExchangeItemPanel extends JPanel
{
private static final Dimension ICON_SIZE = new Dimension(32, 32);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
index 0f2f75b0de..e311fdc9e1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
@@ -37,6 +37,7 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.image.BufferedImage;
import javax.annotation.Nullable;
+import javax.inject.Singleton;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -54,7 +55,8 @@ import net.runelite.client.util.ColorUtil;
import net.runelite.client.util.ImageUtil;
import net.runelite.client.util.StackFormatter;
-public class GrandExchangeOfferSlot extends JPanel
+@Singleton
+class GrandExchangeOfferSlot extends JPanel
{
private static final String FACE_CARD = "FACE_CARD";
private static final String DETAILS_CARD = "DETAILS_CARD";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java
index 0531651a56..b58e28cbac 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java
@@ -30,6 +30,7 @@ import java.awt.CardLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.image.BufferedImage;
+import javax.inject.Singleton;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
import net.runelite.api.GrandExchangeOffer;
@@ -38,7 +39,8 @@ import net.runelite.api.ItemDefinition;
import net.runelite.client.ui.ColorScheme;
import net.runelite.client.ui.components.PluginErrorPanel;
-public class GrandExchangeOffersPanel extends JPanel
+@Singleton
+class GrandExchangeOffersPanel extends JPanel
{
private static final String ERROR_PANEL = "ERROR_PANEL";
private static final String OFFERS_PANEL = "OFFERS_PANEL";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java
index 68e18cecc0..2544ad2c07 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java
@@ -30,8 +30,10 @@ import java.awt.BorderLayout;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.client.callback.ClientThread;
import net.runelite.client.game.ItemManager;
@@ -40,6 +42,7 @@ import net.runelite.client.ui.PluginPanel;
import net.runelite.client.ui.components.materialtabs.MaterialTab;
import net.runelite.client.ui.components.materialtabs.MaterialTabGroup;
+@Singleton
class GrandExchangePanel extends PluginPanel
{
@@ -49,9 +52,9 @@ class GrandExchangePanel extends PluginPanel
private final MaterialTabGroup tabGroup = new MaterialTabGroup(display);
private final MaterialTab searchTab;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private GrandExchangeSearchPanel searchPanel;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private GrandExchangeOffersPanel offersPanel;
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
index 1cec9f64f1..4ce28688b9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
@@ -37,6 +37,7 @@ import java.io.InputStreamReader;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.swing.SwingUtilities;
import lombok.AccessLevel;
import lombok.Getter;
@@ -90,6 +91,7 @@ import net.runelite.http.api.osbuddy.OSBGrandExchangeResult;
tags = {"external", "integration", "notifications", "panel", "prices", "trade"}
)
@Slf4j
+@Singleton
public class GrandExchangePlugin extends Plugin
{
private static final int OFFER_CONTAINER_ITEM = 21;
@@ -174,6 +176,11 @@ public class GrandExchangePlugin extends Plugin
configManager.unsetConfiguration("geoffer." + client.getUsername().toLowerCase(), Integer.toString(slot));
}
+ private boolean quickLookup;
+ private boolean enableNotifications;
+ private boolean enableOsbPrices;
+ private boolean enableGELimits;
+
@Provides
GrandExchangeConfig provideConfig(ConfigManager configManager)
{
@@ -183,6 +190,8 @@ public class GrandExchangePlugin extends Plugin
@Override
protected void startUp()
{
+ updateConfig();
+
itemGELimits = loadGELimits();
panel = injector.getInstance(GrandExchangePanel.class);
panel.setGELimits(itemGELimits);
@@ -198,7 +207,7 @@ public class GrandExchangePlugin extends Plugin
clientToolbar.addNavigation(button);
- if (config.quickLookup())
+ if (this.quickLookup)
{
mouseManager.registerMouseListener(inputListener);
keyManager.registerKeyListener(inputListener);
@@ -237,6 +246,14 @@ public class GrandExchangePlugin extends Plugin
}
}
+ private void updateConfig()
+ {
+ this.quickLookup = config.quickLookup();
+ this.enableNotifications = config.enableNotifications();
+ this.enableOsbPrices = config.enableOsbPrices();
+ this.enableGELimits = config.enableGELimits();
+ }
+
@Subscribe
public void onSessionClose(SessionClose sessionClose)
{
@@ -248,9 +265,10 @@ public class GrandExchangePlugin extends Plugin
{
if (event.getGroup().equals("grandexchange"))
{
+ updateConfig();
if (event.getKey().equals("quickLookup"))
{
- if (config.quickLookup())
+ if (this.quickLookup)
{
mouseManager.registerMouseListener(inputListener);
keyManager.registerKeyListener(inputListener);
@@ -345,7 +363,7 @@ public class GrandExchangePlugin extends Plugin
@Subscribe
public void onChatMessage(ChatMessage event)
{
- if (!this.config.enableNotifications() || event.getType() != ChatMessageType.GAMEMESSAGE)
+ if (!this.enableNotifications || event.getType() != ChatMessageType.GAMEMESSAGE)
{
return;
}
@@ -490,7 +508,7 @@ public class GrandExchangePlugin extends Plugin
return;
}
- if (config.enableGELimits() && itemGELimits != null && !geTextString.contains(BUY_LIMIT_GE_TEXT))
+ if (this.enableGELimits && itemGELimits != null && !geTextString.contains(BUY_LIMIT_GE_TEXT))
{
final Integer itemLimit = itemGELimits.get(itemId);
@@ -502,7 +520,7 @@ public class GrandExchangePlugin extends Plugin
}
}
- if (!config.enableOsbPrices() || geTextString.contains(OSB_GE_TEXT))
+ if (!this.enableOsbPrices || geTextString.contains(OSB_GE_TEXT))
{
// OSB prices are disabled or price was already looked up, so no need to set it again
return;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java
index b5443be68d..d8d88e3933 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java
@@ -36,10 +36,12 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
+import javax.inject.Singleton;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
import javax.swing.border.EmptyBorder;
+import lombok.AccessLevel;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ItemDefinition;
@@ -56,6 +58,7 @@ import net.runelite.http.api.item.ItemPrice;
* It should display a search bar and either item results or a error panel.
*/
@Slf4j
+@Singleton
class GrandExchangeSearchPanel extends JPanel
{
private static final String ERROR_PANEL = "ERROR_PANEL";
@@ -82,10 +85,10 @@ class GrandExchangeSearchPanel extends JPanel
private final List itemsList = new ArrayList<>();
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private Map itemGELimits = Collections.emptyMap();
- GrandExchangeSearchPanel(ClientThread clientThread, ItemManager itemManager, ScheduledExecutorService executor)
+ GrandExchangeSearchPanel(final ClientThread clientThread, final ItemManager itemManager, final ScheduledExecutorService executor)
{
this.clientThread = clientThread;
this.itemManager = itemManager;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java
index ece52fe62e..afe3107282 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java
@@ -34,7 +34,7 @@ public enum DuskAttack
private final int animation;
private final Prayer prayer;
- DuskAttack(int animation, Prayer prayer)
+ DuskAttack(final int animation, final Prayer prayer)
{
this.animation = animation;
this.prayer = prayer;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java
index 0c02d79b92..ed8602718b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Polygon;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.GraphicsObject;
import net.runelite.api.Perspective;
@@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.ui.overlay.components.TextComponent;
+@Singleton
class GrotesqueGuardiansOverlay extends Overlay
{
private static final int GROTESQUE_GUARDIANS_REGION_ID = 6727;
@@ -51,7 +53,7 @@ class GrotesqueGuardiansOverlay extends Overlay
private static final int GROTESQUE_GUARDIANS_STONE_ORB = 160;
@Inject
- private GrotesqueGuardiansOverlay(Client client, GrotesqueGuardiansPlugin plugin)
+ private GrotesqueGuardiansOverlay(final Client client, final GrotesqueGuardiansPlugin plugin)
{
this.client = client;
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java
index 77332e3c93..1ef158830f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.grotesqueguardians;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
@@ -46,7 +47,7 @@ import static net.runelite.api.NpcID.DUSK_7888;
type = PluginType.PVM,
enabledByDefault = false
)
-
+@Singleton
public class GrotesqueGuardiansPlugin extends Plugin
{
private static final int GARGOYLES_REGION = 6727;
@@ -93,7 +94,7 @@ public class GrotesqueGuardiansPlugin extends Plugin
@Subscribe
public void onGameTick(final GameTick event)
{
- final ArrayList regions = new ArrayList();
+ final ArrayList regions = new ArrayList<>();
for (final int intValue : client.getMapRegions())
{
regions.add(intValue);
@@ -126,14 +127,7 @@ public class GrotesqueGuardiansPlugin extends Plugin
{
prayAgainst = null;
}
- if (dusk.getAnimation() == 7802)
- {
- needingToRun = true;
- }
- else
- {
- needingToRun = false;
- }
+ needingToRun = dusk.getAnimation() == 7802;
}
}
else
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java
index c63c0845da..1de4b29640 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.NPC;
import net.runelite.api.Perspective;
@@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.components.ComponentConstants;
import net.runelite.client.ui.overlay.components.ImageComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
public class GrotesqueGuardiansPrayerOverlay extends Overlay
{
private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150);
@@ -52,7 +54,7 @@ public class GrotesqueGuardiansPrayerOverlay extends Overlay
private final PanelComponent imagePanelComponent = new PanelComponent();
@Inject
- private GrotesqueGuardiansPrayerOverlay(Client client, GrotesqueGuardiansPlugin plugin, SpriteManager spriteManager)
+ private GrotesqueGuardiansPrayerOverlay(final Client client, final GrotesqueGuardiansPlugin plugin, final SpriteManager spriteManager)
{
setLayer(OverlayLayer.ABOVE_SCENE);
setPriority(OverlayPriority.HIGH);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java
index da6c3a80c5..4badf41ef4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java
@@ -30,10 +30,12 @@ import java.awt.event.MouseEvent;
import java.time.Duration;
import java.time.Instant;
import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.swing.SwingUtilities;
import net.runelite.client.input.KeyListener;
import net.runelite.client.input.MouseAdapter;
+@Singleton
public class GroundItemInputListener extends MouseAdapter implements KeyListener
{
private static final int HOTKEY = KeyEvent.VK_ALT;
@@ -43,9 +45,6 @@ public class GroundItemInputListener extends MouseAdapter implements KeyListener
@Inject
private GroundItemsPlugin plugin;
- @Inject
- private GroundItemsConfig config;
-
@Override
public void keyTyped(KeyEvent e)
{
@@ -63,7 +62,7 @@ public class GroundItemInputListener extends MouseAdapter implements KeyListener
plugin.setHotKeyPressed(true);
lastPress = null;
}
- else if (lastPress != null && !plugin.isHotKeyPressed() && config.doubleTapDelay() > 0 && Duration.between(lastPress, Instant.now()).compareTo(Duration.ofMillis(config.doubleTapDelay())) < 0)
+ else if (lastPress != null && !plugin.isHotKeyPressed() && plugin.getDoubleTapDelay() > 0 && Duration.between(lastPress, Instant.now()).compareTo(Duration.ofMillis(plugin.getDoubleTapDelay())) < 0)
{
plugin.setHideAll(true);
lastPress = null;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
index f9ce93dad6..14ff283672 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
@@ -41,6 +41,7 @@ import java.util.Map;
import java.util.List;
import java.util.Comparator;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.Player;
@@ -60,6 +61,7 @@ import net.runelite.client.ui.overlay.components.ProgressPieComponent;
import net.runelite.client.ui.overlay.components.TextComponent;
import net.runelite.client.util.StackFormatter;
+@Singleton
public class GroundItemsOverlay extends Overlay
{
private static final int MAX_DISTANCE = 2500;
@@ -83,7 +85,6 @@ public class GroundItemsOverlay extends Overlay
private final Client client;
private final GroundItemsPlugin plugin;
- private final GroundItemsConfig config;
private final StringBuilder itemStringBuilder = new StringBuilder();
private final BackgroundComponent backgroundComponent = new BackgroundComponent();
private final TextComponent textComponent = new TextComponent();
@@ -91,21 +92,20 @@ public class GroundItemsOverlay extends Overlay
private final Map offsetMap = new HashMap<>();
@Inject
- private GroundItemsOverlay(Client client, GroundItemsPlugin plugin, GroundItemsConfig config)
+ private GroundItemsOverlay(final Client client, final GroundItemsPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
this.client = client;
this.plugin = plugin;
- this.config = config;
}
@Override
public Dimension render(Graphics2D graphics)
{
- final boolean dontShowOverlay = (config.itemHighlightMode() == MENU || plugin.isHideAll()) && !plugin.isHotKeyPressed();
+ final boolean dontShowOverlay = (plugin.getItemHighlightMode() == MENU || plugin.isHideAll()) && !plugin.isHotKeyPressed();
- if (dontShowOverlay && !config.highlightTiles())
+ if (dontShowOverlay && !plugin.isHighlightTiles())
{
return null;
}
@@ -177,13 +177,13 @@ public class GroundItemsOverlay extends Overlay
plugin.setHiddenBoxBounds(null);
plugin.setHighlightBoxBounds(null);
- final boolean onlyShowLoot = config.onlyShowLoot();
+ final boolean onlyShowLoot = plugin.isOnlyShowLoot();
List groundItemListAsList = new ArrayList<>(groundItemList); // make a copy so we can non-destructively modify the list
Comparator compareByHaPrice = Comparator.comparingInt(GroundItem::getHaPrice);
Comparator compareByGePrice = Comparator.comparingInt(GroundItem::getGePrice);
- groundItemListAsList.sort(config.sortByGEPrice() ? compareByGePrice : compareByHaPrice);
+ groundItemListAsList.sort(plugin.isSortByGEPrice() ? compareByGePrice : compareByHaPrice);
for (GroundItem item : groundItemListAsList)
{
@@ -207,7 +207,7 @@ public class GroundItemsOverlay extends Overlay
}
// Do not display non-highlighted items
- if (config.showHighlightedOnly())
+ if (plugin.isShowHighlightedOnly())
{
continue;
}
@@ -215,7 +215,7 @@ public class GroundItemsOverlay extends Overlay
final Color color = plugin.getItemColor(highlighted, hidden);
- if (config.highlightTiles())
+ if (plugin.isHighlightTiles())
{
final Polygon poly = Perspective.getCanvasTilePoly(client, groundPoint);
@@ -246,7 +246,7 @@ public class GroundItemsOverlay extends Overlay
}
}
- if (config.priceDisplayMode() == PriceDisplayMode.BOTH)
+ if (plugin.getPriceDisplayMode() == PriceDisplayMode.BOTH)
{
if (item.getGePrice() > 0)
{
@@ -262,9 +262,9 @@ public class GroundItemsOverlay extends Overlay
.append(" gp)");
}
}
- else if (config.priceDisplayMode() != PriceDisplayMode.OFF)
+ else if (plugin.getPriceDisplayMode() != PriceDisplayMode.OFF)
{
- final int price = config.priceDisplayMode() == PriceDisplayMode.GE
+ final int price = plugin.getPriceDisplayMode() == PriceDisplayMode.GE
? item.getGePrice()
: item.getHaPrice();
@@ -277,7 +277,7 @@ public class GroundItemsOverlay extends Overlay
}
}
- if (item.getTicks() > 0 && config.showTimer())
+ if (item.getTicks() > 0 && plugin.isShowTimer())
{
itemStringBuilder
.append(" - ")
@@ -368,15 +368,15 @@ public class GroundItemsOverlay extends Overlay
drawRectangle(graphics, itemHighlightBox, topItem && mouseInHighlightBox ? Color.GREEN : color, highlighted != null, false);
}
- if (config.showGroundItemDuration() == TimerDisplayMode.ALWAYS
- || (config.showGroundItemDuration() == TimerDisplayMode.HOTKEY_PRESSED && plugin.isHotKeyPressed()))
+ if (plugin.getShowGroundItemDuration() == TimerDisplayMode.ALWAYS
+ || (plugin.getShowGroundItemDuration() == TimerDisplayMode.HOTKEY_PRESSED && plugin.isHotKeyPressed()))
{
drawTimerOverlay(graphics, new java.awt.Point(textX, textY), item);
}
- if (config.toggleOutline())
+ if (plugin.isToggleOutline())
{
- final Color bordercolor = config.bordercolor();
+ final Color bordercolor = plugin.getBordercolor();
graphics.setColor(bordercolor);
graphics.drawString(itemString, textX + 1, textY + 1);
graphics.drawString(itemString, textX - 1, textY - 1);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
index 0754a4616f..f2e70b9fdc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
@@ -46,6 +46,7 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
@@ -82,11 +83,14 @@ import net.runelite.client.input.KeyManager;
import net.runelite.client.input.MouseManager;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
+import net.runelite.client.plugins.grounditems.config.ItemHighlightMode;
import static net.runelite.client.plugins.grounditems.config.ItemHighlightMode.OVERLAY;
import net.runelite.client.plugins.grounditems.config.MenuHighlightMode;
import static net.runelite.client.plugins.grounditems.config.MenuHighlightMode.BOTH;
import static net.runelite.client.plugins.grounditems.config.MenuHighlightMode.NAME;
import static net.runelite.client.plugins.grounditems.config.MenuHighlightMode.OPTION;
+import net.runelite.client.plugins.grounditems.config.PriceDisplayMode;
+import net.runelite.client.plugins.grounditems.config.TimerDisplayMode;
import net.runelite.client.plugins.grounditems.config.ValueCalculationMode;
import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.util.ColorUtil;
@@ -98,6 +102,7 @@ import net.runelite.client.util.Text;
description = "Highlight ground items and/or show price information",
tags = {"grand", "exchange", "high", "alchemy", "prices", "highlight", "overlay"}
)
+@Singleton
public class GroundItemsPlugin extends Plugin
{
// ItemID for coins
@@ -175,12 +180,63 @@ public class GroundItemsPlugin extends Plugin
@Inject
private Notifier notifier;
- @Getter
+ @Getter(AccessLevel.PUBLIC)
public static final Map collectedGroundItems = new LinkedHashMap<>();
private final Map priceChecks = new LinkedHashMap<>();
private LoadingCache highlightedItems;
private LoadingCache hiddenItems;
+ private Color defaultColor;
+ private Color highlightedColor;
+ private Color hiddenColor;
+ private String getHighlightItems;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showHighlightedOnly;
+ private ValueCalculationMode valueCalculationMode;
+ private int getHighlightOverValue;
+ private boolean notifyHighlightedDrops;
+ private boolean dontHideUntradeables;
+ private String getHiddenItems;
+ private boolean recolorMenuHiddenItems;
+ private int getHideUnderValue;
+ private boolean removeIgnored;
+ private boolean rightClickHidden;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean highlightTiles;
+ @Getter(AccessLevel.PACKAGE)
+ private ItemHighlightMode itemHighlightMode;
+ private MenuHighlightMode menuHighlightMode;
+ private Color lowValueColor;
+ private int lowValuePrice;
+ private boolean notifyLowValueDrops;
+ private Color mediumValueColor;
+ private int mediumValuePrice;
+ private boolean notifyMediumValueDrops;
+ private Color highValueColor;
+ private int highValuePrice;
+ private boolean notifyHighValueDrops;
+ private Color insaneValueColor;
+ private int insaneValuePrice;
+ private boolean notifyInsaneValueDrops;
+ @Getter(AccessLevel.PACKAGE)
+ private PriceDisplayMode priceDisplayMode;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean sortByGEPrice;
+ private boolean showMenuItemQuantities;
+ private boolean collapseEntries;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean onlyShowLoot;
+ @Getter(AccessLevel.PACKAGE)
+ private TimerDisplayMode showGroundItemDuration;
+ @Getter(AccessLevel.PACKAGE)
+ private int doubleTapDelay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean toggleOutline;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showTimer;
+ @Getter(AccessLevel.PACKAGE)
+ private Color bordercolor;
+
@Provides
GroundItemsConfig provideConfig(ConfigManager configManager)
{
@@ -190,6 +246,7 @@ public class GroundItemsPlugin extends Plugin
@Override
protected void startUp()
{
+ updateConfig();
overlayManager.add(overlay);
reset();
mouseManager.registerMouseListener(inputListener);
@@ -226,6 +283,7 @@ public class GroundItemsPlugin extends Plugin
{
if (event.getGroup().equals("grounditems"))
{
+ updateConfig();
reset();
}
}
@@ -254,12 +312,12 @@ public class GroundItemsPlugin extends Plugin
existing.setQuantity(existing.getQuantity() + groundItem.getQuantity());
}
- boolean shouldNotify = !config.onlyShowLoot() && config.highlightedColor().equals(getHighlighted(
+ boolean shouldNotify = !this.onlyShowLoot && this.highlightedColor.equals(getHighlighted(
groundItem.getName(),
groundItem.getGePrice(),
groundItem.getHaPrice()));
- if (config.notifyHighlightedDrops() && shouldNotify)
+ if (this.notifyHighlightedDrops && shouldNotify)
{
notifyHighlightedItem(groundItem);
}
@@ -340,23 +398,23 @@ public class GroundItemsPlugin extends Plugin
Color itemColor = getHighlighted(composition.getName(), itemManager.getItemPrice(is.getId()) * is.getQuantity(), itemManager.getAlchValue(is.getId()) * is.getQuantity());
if (itemColor != null)
{
- if (config.notifyHighlightedDrops() && itemColor.equals(config.highlightedColor()))
+ if (this.notifyHighlightedDrops && itemColor.equals(this.highlightedColor))
{
sendLootNotification(composition.getName(), "highlighted");
}
- else if (config.notifyLowValueDrops() && itemColor.equals(config.lowValueColor()))
+ else if (this.notifyLowValueDrops && itemColor.equals(this.lowValueColor))
{
sendLootNotification(composition.getName(), "low value");
}
- else if (config.notifyMediumValueDrops() && itemColor.equals(config.mediumValueColor()))
+ else if (this.notifyMediumValueDrops && itemColor.equals(this.mediumValueColor))
{
sendLootNotification(composition.getName(), "medium value");
}
- else if (config.notifyHighValueDrops() && itemColor.equals(config.highValueColor()))
+ else if (this.notifyHighValueDrops && itemColor.equals(this.highValueColor))
{
sendLootNotification(composition.getName(), "high value");
}
- else if (config.notifyInsaneValueDrops() && itemColor.equals(config.insaneValueColor()))
+ else if (this.notifyInsaneValueDrops && itemColor.equals(this.insaneValueColor))
{
sendLootNotification(composition.getName(), "insane value");
}
@@ -382,7 +440,7 @@ public class GroundItemsPlugin extends Plugin
{
MenuEntry menuEntry = menuEntries[i];
- if (config.collapseEntries())
+ if (this.collapseEntries)
{
int menuType = menuEntry.getType();
if (menuType == FIRST_OPTION || menuType == SECOND_OPTION || menuType == THIRD_OPTION
@@ -427,7 +485,7 @@ public class GroundItemsPlugin extends Plugin
final int bQuantity = getCollapsedItemQuantity(bId, bEntry.getTarget());
// only put items below walk if the config is set for it
- if (config.rightClickHidden())
+ if (this.rightClickHidden)
{
if (aHidden && bMenuType == WALK)
return -1;
@@ -442,8 +500,8 @@ public class GroundItemsPlugin extends Plugin
return 1;
- // RS sorts by alch price by default, so no need to sort if config not set
- if (config.sortByGEPrice())
+ // RS sorts by alch price by private, so no need to sort if config not set
+ if (this.sortByGEPrice)
return (getGePriceFromItemId(aId) * aQuantity) - (getGePriceFromItemId(bId) * bQuantity);
}
}
@@ -455,7 +513,7 @@ public class GroundItemsPlugin extends Plugin
{
final MenuEntry entry = e.getEntry();
- if (config.collapseEntries())
+ if (this.collapseEntries)
{
final int count = e.getCount();
if (count > 1)
@@ -480,12 +538,12 @@ public class GroundItemsPlugin extends Plugin
groundItem.setMine(true);
groundItem.setTicks(200);
- boolean shouldNotify = config.onlyShowLoot() && config.highlightedColor().equals(getHighlighted(
+ boolean shouldNotify = this.onlyShowLoot && this.highlightedColor.equals(getHighlighted(
groundItem.getName(),
groundItem.getGePrice(),
groundItem.getHaPrice()));
- if (config.notifyHighlightedDrops() && shouldNotify)
+ if (this.notifyHighlightedDrops && shouldNotify)
{
notifyHighlightedItem(groundItem);
}
@@ -555,10 +613,10 @@ public class GroundItemsPlugin extends Plugin
private void reset()
{
// gets the hidden items from the text box in the config
- hiddenItemList = Text.fromCSV(config.getHiddenItems());
+ hiddenItemList = Text.fromCSV(this.getHiddenItems);
// gets the highlighted items from the text box in the config
- highlightedItemsList = Text.fromCSV(config.getHighlightItems());
+ highlightedItemsList = Text.fromCSV(this.getHighlightItems);
highlightedItems = CacheBuilder.newBuilder()
.maximumSize(512L)
@@ -573,36 +631,36 @@ public class GroundItemsPlugin extends Plugin
// Cache colors
priceChecks.clear();
- if (config.insaneValuePrice() > 0)
+ if (this.insaneValuePrice > 0)
{
- priceChecks.put(config.insaneValuePrice(), config.insaneValueColor());
+ priceChecks.put(this.insaneValuePrice, this.insaneValueColor);
}
- if (config.highValuePrice() > 0)
+ if (this.highValuePrice > 0)
{
- priceChecks.put(config.highValuePrice(), config.highValueColor());
+ priceChecks.put(this.highValuePrice, this.highValueColor);
}
- if (config.mediumValuePrice() > 0)
+ if (this.mediumValuePrice > 0)
{
- priceChecks.put(config.mediumValuePrice(), config.mediumValueColor());
+ priceChecks.put(this.mediumValuePrice, this.mediumValueColor);
}
- if (config.lowValuePrice() > 0)
+ if (this.lowValuePrice > 0)
{
- priceChecks.put(config.lowValuePrice(), config.lowValueColor());
+ priceChecks.put(this.lowValuePrice, this.lowValueColor);
}
- if (config.getHighlightOverValue() > 0)
+ if (this.getHighlightOverValue > 0)
{
- priceChecks.put(config.getHighlightOverValue(), config.highlightedColor());
+ priceChecks.put(this.getHighlightOverValue, this.highlightedColor);
}
}
@Subscribe
public void onMenuEntryAdded(MenuEntryAdded event)
{
- if (config.itemHighlightMode() != OVERLAY
+ if (this.itemHighlightMode != OVERLAY
&& event.getOption().equals("Take")
&& event.getIdentifier() == THIRD_OPTION)
{
@@ -641,11 +699,11 @@ public class GroundItemsPlugin extends Plugin
final Color hidden = getHidden(itemComposition.getName(), gePrice, haPrice, itemComposition.isTradeable());
final Color highlighted = getHighlighted(itemComposition.getName(), gePrice, haPrice);
final Color color = getItemColor(highlighted, hidden);
- final boolean canBeRecolored = highlighted != null || (hidden != null && config.recolorMenuHiddenItems());
+ final boolean canBeRecolored = highlighted != null || (hidden != null && this.recolorMenuHiddenItems);
- if (color != null && canBeRecolored && !color.equals(config.defaultColor()))
+ if (color != null && canBeRecolored && !color.equals(this.defaultColor))
{
- final MenuHighlightMode mode = config.menuHighlightMode();
+ final MenuHighlightMode mode = this.menuHighlightMode;
if (mode == BOTH || mode == OPTION)
{
@@ -659,12 +717,12 @@ public class GroundItemsPlugin extends Plugin
}
}
- if (config.showMenuItemQuantities() && itemComposition.isStackable() && quantity > 1)
+ if (this.showMenuItemQuantities && itemComposition.isStackable() && quantity > 1)
{
lastEntry.setTarget(lastEntry.getTarget() + " (" + quantity + ")");
}
- if (config.removeIgnored() && event.getOption().equals("Take") && hiddenItemList.contains(Text.removeTags(event.getTarget())))
+ if (this.removeIgnored && event.getOption().equals("Take") && hiddenItemList.contains(Text.removeTags(event.getTarget())))
{
menuEntries = removeOption(event.getOption(), event.getTarget());
}
@@ -718,14 +776,16 @@ public class GroundItemsPlugin extends Plugin
}
config.setHiddenItems(Text.toCSV(hiddenItemSet));
+ this.getHiddenItems = Text.toCSV(hiddenItemSet);
config.setHighlightedItem(Text.toCSV(highlightedItemSet));
+ this.getHighlightItems = Text.toCSV(highlightedItemSet);
}
Color getHighlighted(String item, int gePrice, int haPrice)
{
if (TRUE.equals(highlightedItems.getUnchecked(item)))
{
- return config.highlightedColor();
+ return this.highlightedColor;
}
// Explicit hide takes priority over implicit highlight
@@ -734,7 +794,7 @@ public class GroundItemsPlugin extends Plugin
return null;
}
- ValueCalculationMode mode = config.valueCalculationMode();
+ ValueCalculationMode mode = this.valueCalculationMode;
for (Map.Entry entry : priceChecks.entrySet())
{
switch (mode)
@@ -767,13 +827,13 @@ public class GroundItemsPlugin extends Plugin
{
final boolean isExplicitHidden = TRUE.equals(hiddenItems.getUnchecked(item));
final boolean isExplicitHighlight = TRUE.equals(highlightedItems.getUnchecked(item));
- final boolean canBeHidden = gePrice > 0 || isTradeable || !config.dontHideUntradeables();
- final boolean underGe = gePrice < config.getHideUnderValue();
- final boolean underHa = haPrice < config.getHideUnderValue();
+ final boolean canBeHidden = gePrice > 0 || isTradeable || !this.dontHideUntradeables;
+ final boolean underGe = gePrice < this.getHideUnderValue;
+ final boolean underHa = haPrice < this.getHideUnderValue;
// Explicit highlight takes priority over implicit hide
return isExplicitHidden || (!isExplicitHighlight && canBeHidden && underGe && underHa)
- ? config.hiddenColor()
+ ? this.hiddenColor
: null;
}
@@ -827,7 +887,7 @@ public class GroundItemsPlugin extends Plugin
return hidden;
}
- return config.defaultColor();
+ return this.defaultColor;
}
@Subscribe
@@ -868,4 +928,47 @@ public class GroundItemsPlugin extends Plugin
notificationStringBuilder.append("!");
notifier.notify(notificationStringBuilder.toString());
}
+
+ private void updateConfig()
+ {
+ this.defaultColor = config.defaultColor();
+ this.highlightedColor = config.highlightedColor();
+ this.hiddenColor = config.hiddenColor();
+ this.getHighlightItems = config.getHighlightItems();
+ this.showHighlightedOnly = config.showHighlightedOnly();
+ this.valueCalculationMode = config.valueCalculationMode();
+ this.getHighlightOverValue = config.getHighlightOverValue();
+ this.notifyHighlightedDrops = config.notifyHighlightedDrops();
+ this.dontHideUntradeables = config.dontHideUntradeables();
+ this.getHiddenItems = config.getHiddenItems();
+ this.recolorMenuHiddenItems = config.recolorMenuHiddenItems();
+ this.getHideUnderValue = config.getHideUnderValue();
+ this.removeIgnored = config.removeIgnored();
+ this.rightClickHidden = config.rightClickHidden();
+ this.highlightTiles = config.highlightTiles();
+ this.itemHighlightMode = config.itemHighlightMode();
+ this.menuHighlightMode = config.menuHighlightMode();
+ this.lowValueColor = config.lowValueColor();
+ this.lowValuePrice = config.lowValuePrice();
+ this.notifyLowValueDrops = config.notifyLowValueDrops();
+ this.mediumValueColor = config.mediumValueColor();
+ this.mediumValuePrice = config.mediumValuePrice();
+ this.notifyMediumValueDrops = config.notifyMediumValueDrops();
+ this.highValueColor = config.highValueColor();
+ this.highValuePrice = config.highValuePrice();
+ this.notifyHighValueDrops = config.notifyHighValueDrops();
+ this.insaneValueColor = config.insaneValueColor();
+ this.insaneValuePrice = config.insaneValuePrice();
+ this.notifyInsaneValueDrops = config.notifyInsaneValueDrops();
+ this.priceDisplayMode = config.priceDisplayMode();
+ this.sortByGEPrice = config.sortByGEPrice();
+ this.showMenuItemQuantities = config.showMenuItemQuantities();
+ this.collapseEntries = config.collapseEntries();
+ this.onlyShowLoot = config.onlyShowLoot();
+ this.showGroundItemDuration = config.showGroundItemDuration();
+ this.doubleTapDelay = config.doubleTapDelay();
+ this.toggleOutline = config.toggleOutline();
+ this.showTimer = config.showTimer();
+ this.bordercolor = config.bordercolor();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java
index a8539921c0..172bbc94ee 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java
@@ -24,6 +24,7 @@
*/
package net.runelite.client.plugins.grounditems;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.runelite.api.MenuEntry;
@@ -31,10 +32,10 @@ import net.runelite.api.MenuEntry;
@RequiredArgsConstructor
class MenuEntryWithCount
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final MenuEntry entry;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int count = 1;
void increment()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java
index 7b91067ba4..0aeea2e1dd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java
@@ -34,7 +34,7 @@ class WildcardMatchLoader extends CacheLoader
{
private final List nameFilters;
- WildcardMatchLoader(List nameFilters)
+ WildcardMatchLoader(final List nameFilters)
{
this.nameFilters = nameFilters;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java
index a097d47d29..6a92bb0e99 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java
@@ -27,8 +27,10 @@ package net.runelite.client.plugins.groundmarkers;
import java.awt.event.KeyEvent;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.input.KeyListener;
+@Singleton
public class GroundMarkerInputListener implements KeyListener
{
private static final int HOTKEY = KeyEvent.VK_SHIFT;
@@ -36,7 +38,7 @@ public class GroundMarkerInputListener implements KeyListener
private final GroundMarkerPlugin plugin;
@Inject
- private GroundMarkerInputListener(GroundMarkerPlugin plugin)
+ private GroundMarkerInputListener(final GroundMarkerPlugin plugin)
{
this.plugin = plugin;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java
index 4e53a7d966..b4c3b21d75 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
import static java.lang.Math.floor;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.Point;
@@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
class GroundMarkerMinimapOverlay extends Overlay
{
private static final int MAX_DRAW_DISTANCE = 16;
@@ -48,14 +50,12 @@ class GroundMarkerMinimapOverlay extends Overlay
private static final int TILE_HEIGHT = 4;
private final Client client;
- private final GroundMarkerConfig config;
private final GroundMarkerPlugin plugin;
@Inject
- private GroundMarkerMinimapOverlay(Client client, GroundMarkerConfig config, GroundMarkerPlugin plugin)
+ private GroundMarkerMinimapOverlay(final Client client, final GroundMarkerPlugin plugin)
{
this.client = client;
- this.config = config;
this.plugin = plugin;
setPosition(OverlayPosition.DYNAMIC);
setPriority(OverlayPriority.LOW);
@@ -65,7 +65,7 @@ class GroundMarkerMinimapOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (!config.showMinimap())
+ if (!plugin.isShowMinimap())
{
return null;
}
@@ -79,20 +79,20 @@ class GroundMarkerMinimapOverlay extends Overlay
continue;
}
- Color color = config.markerColor();
+ Color color = plugin.getMarkerColor();
switch (point.getGroundMarkerPoint().getGroup())
{
case 2:
- color = config.markerColor2();
+ color = plugin.getMarkerColor2();
break;
case 3:
- color = config.markerColor3();
+ color = plugin.getMarkerColor3();
break;
case 4:
- color = config.markerColor4();
+ color = plugin.getMarkerColor4();
}
- int opacity = (int) floor(config.minimapOverlayOpacity() * 2.55);
+ int opacity = (int) floor(plugin.getMinimapOverlayOpacity() * 2.55);
Color tileColor = new Color(color.getRed(), color.getGreen(), color.getBlue(), opacity);
drawOnMinimap(graphics, worldPoint, tileColor);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java
index 0d11dbf4a9..cb9b3c2eba 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Graphics2D;
import java.awt.Polygon;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.coords.LocalPoint;
@@ -41,17 +42,16 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
public class GroundMarkerOverlay extends Overlay
{
private final Client client;
- private final GroundMarkerConfig config;
private final GroundMarkerPlugin plugin;
@Inject
- private GroundMarkerOverlay(Client client, GroundMarkerConfig config, GroundMarkerPlugin plugin)
+ private GroundMarkerOverlay(final Client client, final GroundMarkerPlugin plugin)
{
this.client = client;
- this.config = config;
this.plugin = plugin;
setPosition(OverlayPosition.DYNAMIC);
setPriority(OverlayPriority.LOW);
@@ -78,8 +78,6 @@ public class GroundMarkerOverlay extends Overlay
return;
}
- WorldPoint playerLocation = client.getLocalPlayer().getWorldLocation();
-
LocalPoint lp = LocalPoint.fromWorld(client, point);
if (lp == null)
{
@@ -92,17 +90,17 @@ public class GroundMarkerOverlay extends Overlay
return;
}
- Color color = config.markerColor();
+ Color color = plugin.getMarkerColor();
switch (groundMarkerWorldPoint.getGroundMarkerPoint().getGroup())
{
case 2:
- color = config.markerColor2();
+ color = plugin.getMarkerColor2();
break;
case 3:
- color = config.markerColor3();
+ color = plugin.getMarkerColor3();
break;
case 4:
- color = config.markerColor4();
+ color = plugin.getMarkerColor4();
}
OverlayUtil.renderPolygon(graphics, poly, color);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
index 400b01bd52..f5ed119b16 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
@@ -39,6 +39,7 @@ import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
@@ -51,6 +52,7 @@ import net.runelite.api.MenuEntry;
import net.runelite.api.Tile;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.FocusChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.MenuEntryAdded;
@@ -70,6 +72,7 @@ import net.runelite.client.util.Text;
description = "Enable marking of tiles using the Shift key",
tags = {"overlay", "tiles"}
)
+@Singleton
public class GroundMarkerPlugin extends Plugin
{
private static final String CONFIG_GROUP = "groundMarker";
@@ -138,6 +141,19 @@ public class GroundMarkerPlugin extends Plugin
{
}
+ @Getter(AccessLevel.PACKAGE)
+ private Color markerColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color markerColor2;
+ @Getter(AccessLevel.PACKAGE)
+ private Color markerColor3;
+ @Getter(AccessLevel.PACKAGE)
+ private Color markerColor4;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showMinimap;
+ @Getter(AccessLevel.PACKAGE)
+ private int minimapOverlayOpacity;
+
@Provides
GroundMarkerConfig provideConfig(ConfigManager configManager)
{
@@ -339,6 +355,8 @@ public class GroundMarkerPlugin extends Plugin
@Override
protected void startUp()
{
+ updateConfig();
+
overlayManager.add(overlay);
overlayManager.add(minimapOverlay);
keyManager.registerKeyListener(inputListener);
@@ -354,7 +372,7 @@ public class GroundMarkerPlugin extends Plugin
points.clear();
}
- protected void markTile(LocalPoint localPoint, int group)
+ private void markTile(LocalPoint localPoint, int group)
{
if (localPoint == null)
{
@@ -390,19 +408,38 @@ public class GroundMarkerPlugin extends Plugin
private Color getColor(int group)
{
- Color color = config.markerColor();
+ Color color = this.markerColor;
switch (group)
{
case 2:
- color = config.markerColor2();
+ color = this.markerColor2;
break;
case 3:
- color = config.markerColor3();
+ color = this.markerColor3;
break;
case 4:
- color = config.markerColor4();
+ color = this.markerColor4;
}
return color;
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (event.getGroup().equals("groundMarker"))
+ {
+ updateConfig();
+ }
+ }
+
+ private void updateConfig()
+ {
+ this.markerColor = config.markerColor();
+ this.markerColor2 = config.markerColor2();
+ this.markerColor3 = config.markerColor3();
+ this.markerColor4 = config.markerColor4();
+ this.showMinimap = config.showMinimap();
+ this.minimapOverlayOpacity = config.minimapOverlayOpacity();
+ }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java
index e287f44efe..1d4e987862 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java
@@ -26,31 +26,16 @@
package net.runelite.client.plugins.groundmarkers;
+import lombok.EqualsAndHashCode;
import lombok.Value;
@Value
-public class GroundMarkerPoint
+@EqualsAndHashCode(exclude = { "group" })
+class GroundMarkerPoint
{
private int regionId;
private int regionX;
private int regionY;
private int z;
private int group;
-
- @Override
- public String toString()
- {
- return "GroundMarkerPoint(regionId=" + regionId + ",regionX=" + regionX + ",=regionY" + regionY + ",z=" + z + ")";
- }
-
- @Override
- public boolean equals(Object o)
- {
- if (!(o instanceof GroundMarkerPoint))
- {
- return false;
- }
-
- return o.toString().equals(this.toString());
- }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java
index 9ea9915459..57234eeca0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java
@@ -28,7 +28,7 @@ import lombok.Value;
import net.runelite.api.coords.WorldPoint;
@Value
-public class GroundMarkerWorldPoint
+class GroundMarkerWorldPoint
{
private GroundMarkerPoint groundMarkerPoint;
private WorldPoint worldPoint;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java
index fff22cbc39..8e05236ea3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.herbiboars;
import com.google.inject.Inject;
+import com.google.inject.Singleton;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.util.Set;
@@ -34,25 +35,23 @@ import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
-
+@Singleton
public class HerbiboarMinimapOverlay extends Overlay
{
private final HerbiboarPlugin plugin;
- private final HerbiboarConfig config;
@Inject
- public HerbiboarMinimapOverlay(HerbiboarPlugin plugin, HerbiboarConfig config)
+ public HerbiboarMinimapOverlay(final HerbiboarPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_WIDGETS);
this.plugin = plugin;
- this.config = config;
}
@Override
public Dimension render(Graphics2D graphics)
{
- if (config.isTrailShown() && plugin.isInHerbiboarArea())
+ if (plugin.isTrailShown() && plugin.isInHerbiboarArea())
{
HerbiboarTrail currentTrail = plugin.getCurrentTrail();
int finishId = plugin.getFinishId();
@@ -70,7 +69,7 @@ public class HerbiboarMinimapOverlay extends Overlay
if (shownTrailIds.contains(id) && (finishId > 0 || (currentTrail != null && currentTrail.getTrailId() != id && currentTrail.getTrailId() + 1 != id)))
{
- OverlayUtil.renderMinimapLocation(graphics, minimapLocation, config.getTrailColor());
+ OverlayUtil.renderMinimapLocation(graphics, minimapLocation, plugin.getGetTrailColor());
}
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java
index 653228cdb3..ad79b5b9e2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.herbiboars;
import com.google.inject.Inject;
+import com.google.inject.Singleton;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
@@ -37,18 +38,17 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
class HerbiboarOverlay extends Overlay
{
private final HerbiboarPlugin plugin;
- private final HerbiboarConfig config;
@Inject
- public HerbiboarOverlay(HerbiboarPlugin plugin, HerbiboarConfig config)
+ public HerbiboarOverlay(final HerbiboarPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
this.plugin = plugin;
- this.config = config;
}
@Override
@@ -64,16 +64,14 @@ class HerbiboarOverlay extends Overlay
int finishId = plugin.getFinishId();
// Draw start objects
- if (config.isStartShown() && (currentTrail == null && finishId == 0))
+ if (plugin.isStartShown() && (currentTrail == null && finishId == 0))
{
plugin.getStarts().values().forEach((obj) ->
- {
- OverlayUtil.renderTileOverlay(graphics, obj, "", config.getStartColor());
- });
+ OverlayUtil.renderTileOverlay(graphics, obj, "", plugin.getGetStartColor()));
}
// Draw trails
- if (config.isTrailShown())
+ if (plugin.isTrailShown())
{
Set shownTrailIds = plugin.getShownTrails();
plugin.getTrails().values().forEach((x) ->
@@ -81,13 +79,13 @@ class HerbiboarOverlay extends Overlay
int id = x.getId();
if (shownTrailIds.contains(id) && (finishId > 0 || (currentTrail != null && currentTrail.getTrailId() != id && currentTrail.getTrailId() + 1 != id)))
{
- OverlayUtil.renderTileOverlay(graphics, x, "", config.getTrailColor());
+ OverlayUtil.renderTileOverlay(graphics, x, "", plugin.getGetTrailColor());
}
});
}
// Draw trail objects (mushrooms, mud, etc)
- if (config.isObjectShown() && currentTrail != null)
+ if (plugin.isObjectShown() && currentTrail != null)
{
int currentPath = plugin.getCurrentPath();
WorldPoint[] trailLocs = currentTrail.getObjectLocs(currentPath);
@@ -101,12 +99,12 @@ class HerbiboarOverlay extends Overlay
TileObject object = plugin.getTrailObjects().get(trailLoc);
if (object != null)
{
- if (config.showClickBoxes())
+ if (plugin.isShowClickBoxes())
{
Area clickbox = object.getClickbox();
if (clickbox != null)
{
- graphics.setColor(config.getObjectColor());
+ graphics.setColor(plugin.getGetObjectColor());
graphics.draw(clickbox);
graphics.setColor(new Color(255, 0, 255, 20));
graphics.fill(clickbox);
@@ -114,25 +112,25 @@ class HerbiboarOverlay extends Overlay
}
else
{
- OverlayUtil.renderTileOverlay(graphics, object, "", config.getObjectColor());
+ OverlayUtil.renderTileOverlay(graphics, object, "", plugin.getGetObjectColor());
}
}
}
}
// Draw finish tunnels
- if (config.isTunnelShown() && finishId > 0)
+ if (plugin.isTunnelShown() && finishId > 0)
{
WorldPoint finishLoc = plugin.getEndLocations().get(finishId - 1);
TileObject object = plugin.getTunnels().get(finishLoc);
if (object != null)
{
- if (config.showClickBoxes())
+ if (plugin.isShowClickBoxes())
{
Area clickbox = object.getClickbox();
if (clickbox != null)
{
- Color col = config.getObjectColor();
+ Color col = plugin.getGetObjectColor();
graphics.setColor(col);
graphics.draw(clickbox);
graphics.setColor(new Color(col.getRed(), col.getGreen(), col.getBlue(), 20));
@@ -141,7 +139,7 @@ class HerbiboarOverlay extends Overlay
}
else
{
- OverlayUtil.renderTileOverlay(graphics, object, "", config.getTunnelColor());
+ OverlayUtil.renderTileOverlay(graphics, object, "", plugin.getGetTunnelColor());
}
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java
index b921bb5495..cc6dc7258d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.herbiboars;
import com.google.inject.Provides;
+import java.awt.Color;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
@@ -32,6 +33,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.api.Client;
@@ -44,6 +47,7 @@ import net.runelite.api.Tile;
import net.runelite.api.TileObject;
import net.runelite.api.Varbits;
import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameObjectChanged;
import net.runelite.api.events.GameObjectDespawned;
import net.runelite.api.events.GameObjectSpawned;
@@ -63,6 +67,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
description = "Highlight starting rocks, trails, and the objects to search at the end of each trail",
tags = {"herblore", "hunter", "skilling", "overlay"}
)
+@Singleton
public class HerbiboarPlugin extends Plugin
{
private static final List END_LOCATIONS = Arrays.asList(
@@ -104,37 +109,59 @@ public class HerbiboarPlugin extends Plugin
@Inject
private HerbiboarMinimapOverlay minimapOverlay;
- @Getter
+ @Inject
+ private HerbiboarConfig config;
+
+ @Getter(AccessLevel.PACKAGE)
private boolean inHerbiboarArea;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Map trails = new HashMap<>();
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Map tunnels = new HashMap<>();
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Map starts = new HashMap<>();
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Map trailObjects = new HashMap<>();
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private Set shownTrails = new HashSet<>();
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private HerbiboarTrail currentTrail;
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private int currentPath;
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private int finishId;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean isStartShown;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showClickBoxes;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getStartColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean isTunnelShown;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getTunnelColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean isObjectShown;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getObjectColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean isTrailShown;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getTrailColor;
+
@Provides
HerbiboarConfig getConfig(ConfigManager configManager)
{
@@ -144,6 +171,8 @@ public class HerbiboarPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(overlay);
overlayManager.add(minimapOverlay);
inHerbiboarArea = checkArea();
@@ -260,19 +289,19 @@ public class HerbiboarPlugin extends Plugin
@Subscribe
public void onGroundObjectSpawned(GroundObjectSpawned event)
{
- onGroundObject(event.getTile(), null, event.getGroundObject());
+ onGroundObject( null, event.getGroundObject());
}
@Subscribe
public void onGroundObjectChanged(GroundObjectChanged event)
{
- onGroundObject(event.getTile(), event.getPrevious(), event.getGroundObject());
+ onGroundObject(event.getPrevious(), event.getGroundObject());
}
@Subscribe
public void onGroundObjectDespawned(GroundObjectDespawned event)
{
- onGroundObject(event.getTile(), event.getGroundObject(), null);
+ onGroundObject(event.getGroundObject(), null);
}
// Store relevant GameObjects (starts, objects used to trigger next trails, and some tunnels)
@@ -313,7 +342,7 @@ public class HerbiboarPlugin extends Plugin
}
// Store relevant GroundObjects (tracks on trails, and some tunnels)
- private void onGroundObject(Tile tile, TileObject oldObject, TileObject newObject)
+ private void onGroundObject(TileObject oldObject, TileObject newObject)
{
if (oldObject != null)
{
@@ -348,8 +377,30 @@ public class HerbiboarPlugin extends Plugin
.toArray().length > 0;
}
- public List getEndLocations()
+ List getEndLocations()
{
return END_LOCATIONS;
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (event.getGroup().equals("herbiboar"))
+ {
+ updateConfig();
+ }
+ }
+
+ private void updateConfig()
+ {
+ this.isStartShown = config.isStartShown();
+ this.showClickBoxes = config.showClickBoxes();
+ this.getStartColor = config.getStartColor();
+ this.isTunnelShown = config.isTunnelShown();
+ this.getTunnelColor = config.getTunnelColor();
+ this.isObjectShown = config.isObjectShown();
+ this.getObjectColor = config.getObjectColor();
+ this.isTrailShown = config.isTrailShown();
+ this.getTrailColor = config.getTrailColor();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java
index 15ae602352..0fb87507c7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.HashTable;
@@ -50,7 +51,16 @@ import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
+import net.runelite.client.plugins.hideprayers.util.Armadyl;
+import net.runelite.client.plugins.hideprayers.util.Bandos;
+import net.runelite.client.plugins.hideprayers.util.Barrows;
+import net.runelite.client.plugins.hideprayers.util.Cerberus;
+import net.runelite.client.plugins.hideprayers.util.PVPPrayers;
import net.runelite.client.plugins.hideprayers.util.PrayerTabStates;
+import net.runelite.client.plugins.hideprayers.util.Saradomin;
+import net.runelite.client.plugins.hideprayers.util.Vorkath;
+import net.runelite.client.plugins.hideprayers.util.Zamorak;
+import net.runelite.client.plugins.hideprayers.util.Zulrah;
@PluginDescriptor(
name = "Show/Hide Prayers",
@@ -58,7 +68,7 @@ import net.runelite.client.plugins.hideprayers.util.PrayerTabStates;
type = PluginType.UTILITY,
enabledByDefault = false
)
-
+@Singleton
public class HidePrayersPlugin extends Plugin
{
private static final List PRAYER_WIDGET_INFO_LIST = ImmutableList.of(
@@ -99,6 +109,56 @@ public class HidePrayersPlugin extends Plugin
@Inject
private HidePrayersConfig config;
+ private boolean showindividualprayers;
+ private boolean ShowTHICK_SKIN;
+ private boolean ShowBURST_OF_STRENGTH;
+ private boolean ShowCLARITY_OF_THOUGHT;
+ private boolean ShowSHARP_EYE;
+ private boolean ShowMYSTIC_WILL;
+ private boolean ShowROCK_SKIN;
+ private boolean ShowSUPERHUMAN_STRENGTH;
+ private boolean ShowIMPROVED_REFLEXES;
+ private boolean ShowRapidRestore;
+ private boolean ShowRapidHeal;
+ private boolean ShowProtectItem;
+ private boolean ShowHAWK_EYE;
+ private boolean ShowMYSTIC_LORE;
+ private boolean ShowSteelSkin;
+ private boolean ShowUltimateStrength;
+ private boolean ShowIncredibleReflex;
+ private boolean ShowPTFMagic;
+ private boolean ShowPTFRange;
+ private boolean ShowPTFMelee;
+ private boolean ShowEagle;
+ private boolean ShowMystic;
+ private boolean ShowRETRIBUTION;
+ private boolean ShowRedemption;
+ private boolean ShowSmite;
+ private boolean ShowPreserve;
+ private boolean ShowChivalry;
+ private boolean ShowPiety;
+ private boolean ShowRigour;
+ private boolean ShowAugury;
+ private boolean getarmadylprayers;
+ private Armadyl armadyl;
+ private boolean getbarrowsprayers;
+ private Barrows barrows;
+ private boolean getbandosprayers;
+ private Bandos bandos;
+ private boolean getcerberusprayers;
+ private Cerberus cerberus;
+ private boolean getsaradominprayers;
+ private Saradomin saradomin;
+ private boolean getvorkathprayers;
+ private Vorkath vorkath;
+ private boolean getzamorakprayers;
+ private Zamorak zamorak;
+ private boolean getzulrahprayers;
+ private Zulrah zulrah;
+ private boolean getpvpprayers;
+ private PVPPrayers pvpprayers;
+ private boolean HideRapidHealRestore;
+
@Provides
HidePrayersConfig provideConfig(ConfigManager configManager)
{
@@ -108,6 +168,7 @@ public class HidePrayersPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
hidePrayers();
}
@@ -132,6 +193,7 @@ public class HidePrayersPlugin extends Plugin
{
if (event.getGroup().equals("hideprayers"))
{
+ updateConfig();
hidePrayers();
}
}
@@ -233,16 +295,16 @@ public class HidePrayersPlugin extends Plugin
return;
}
- if ( !config.showindividualprayers()
- && !config.getarmadylprayers()
- && !config.getbarrowsprayers()
- && !config.getbandosprayers()
- && !config.getcerberusprayers()
- && !config.getsaradominprayers()
- && !config.getvorkathprayers()
- && !config.getzamorakprayers()
- && !config.getzulrahprayers()
- && !config.getpvpprayers())
+ if ( !this.showindividualprayers
+ && !this.getarmadylprayers
+ && !this.getbarrowsprayers
+ && !this.getbandosprayers
+ && !this.getcerberusprayers
+ && !this.getsaradominprayers
+ && !this.getvorkathprayers
+ && !this.getzamorakprayers
+ && !this.getzulrahprayers
+ && !this.getpvpprayers)
{
restorePrayers();
return;
@@ -250,42 +312,42 @@ public class HidePrayersPlugin extends Plugin
reallyHidePrayers();
- if (config.showindividualprayers())
+ if (this.showindividualprayers)
{
- prayerWidgets.get(0).setHidden(!config.ShowTHICK_SKIN()); // Thick Skin
- prayerWidgets.get(1).setHidden(!config.ShowBURST_OF_STRENGTH()); // Burst of Strength
- prayerWidgets.get(2).setHidden(!config.ShowCLARITY_OF_THOUGHT()); // Clarity of Thought
- prayerWidgets.get(3).setHidden(!config.ShowSHARP_EYE()); // Sharp Eye
- prayerWidgets.get(4).setHidden(!config.ShowMYSTIC_WILL()); // Mystic Will
- prayerWidgets.get(5).setHidden(!config.ShowROCK_SKIN()); // Rock Skin
- prayerWidgets.get(6).setHidden(!config.ShowSUPERHUMAN_STRENGTH()); // Super Human Strength
- prayerWidgets.get(7).setHidden(!config.ShowIMPROVED_REFLEXES()); // Improved_Reflexes
- prayerWidgets.get(8).setHidden(!config.ShowRapidRestore()); // Rapid Restore
- prayerWidgets.get(9).setHidden(!config.ShowRapidHeal()); // Rapid Heal
- prayerWidgets.get(10).setHidden(!config.ShowProtectItem()); // Protect Item
- prayerWidgets.get(11).setHidden(!config.ShowHAWK_EYE()); // Hawk Eye
- prayerWidgets.get(12).setHidden(!config.ShowMYSTIC_LORE()); // Mystic Lore
- prayerWidgets.get(13).setHidden(!config.ShowSteelSkin()); // Steel Skin
- prayerWidgets.get(14).setHidden(!config.ShowUltimateStrength()); // Ultimate Strength
- prayerWidgets.get(15).setHidden(!config.ShowIncredibleReflex()); // Incredible Reflexes
- prayerWidgets.get(16).setHidden(!config.ShowPTFMagic()); // Protect from Magic
- prayerWidgets.get(17).setHidden(!config.ShowPTFRange()); // Protect from Range
- prayerWidgets.get(18).setHidden(!config.ShowPTFMelee()); // Protect from Melee
- prayerWidgets.get(19).setHidden(!config.ShowEagle()); // eagle eye
- prayerWidgets.get(20).setHidden(!config.ShowMystic()); // Mystic Might
- prayerWidgets.get(21).setHidden(!config.ShowRETRIBUTION()); // Retribution
- prayerWidgets.get(22).setHidden(!config.ShowRedemption()); // Redemption
- prayerWidgets.get(23).setHidden(!config.ShowSmite()); // Smite
- prayerWidgets.get(24).setHidden(!config.ShowPreserve()); // Preserve
- prayerWidgets.get(25).setHidden(!config.ShowChivalry()); // Chivalry
- prayerWidgets.get(26).setHidden(!config.ShowPiety()); // Piety
- prayerWidgets.get(27).setHidden(!config.ShowRigour()); // Rigour
- prayerWidgets.get(28).setHidden(!config.ShowAugury()); // Augury
+ prayerWidgets.get(0).setHidden(!this.ShowTHICK_SKIN); // Thick Skin
+ prayerWidgets.get(1).setHidden(!this.ShowBURST_OF_STRENGTH); // Burst of Strength
+ prayerWidgets.get(2).setHidden(!this.ShowCLARITY_OF_THOUGHT); // Clarity of Thought
+ prayerWidgets.get(3).setHidden(!this.ShowSHARP_EYE); // Sharp Eye
+ prayerWidgets.get(4).setHidden(!this.ShowMYSTIC_WILL); // Mystic Will
+ prayerWidgets.get(5).setHidden(!this.ShowROCK_SKIN); // Rock Skin
+ prayerWidgets.get(6).setHidden(!this.ShowSUPERHUMAN_STRENGTH); // Super Human Strength
+ prayerWidgets.get(7).setHidden(!this.ShowIMPROVED_REFLEXES); // Improved_Reflexes
+ prayerWidgets.get(8).setHidden(!this.ShowRapidRestore); // Rapid Restore
+ prayerWidgets.get(9).setHidden(!this.ShowRapidHeal); // Rapid Heal
+ prayerWidgets.get(10).setHidden(!this.ShowProtectItem); // Protect Item
+ prayerWidgets.get(11).setHidden(!this.ShowHAWK_EYE); // Hawk Eye
+ prayerWidgets.get(12).setHidden(!this.ShowMYSTIC_LORE); // Mystic Lore
+ prayerWidgets.get(13).setHidden(!this.ShowSteelSkin); // Steel Skin
+ prayerWidgets.get(14).setHidden(!this.ShowUltimateStrength); // Ultimate Strength
+ prayerWidgets.get(15).setHidden(!this.ShowIncredibleReflex); // Incredible Reflexes
+ prayerWidgets.get(16).setHidden(!this.ShowPTFMagic); // Protect from Magic
+ prayerWidgets.get(17).setHidden(!this.ShowPTFRange); // Protect from Range
+ prayerWidgets.get(18).setHidden(!this.ShowPTFMelee); // Protect from Melee
+ prayerWidgets.get(19).setHidden(!this.ShowEagle); // eagle eye
+ prayerWidgets.get(20).setHidden(!this.ShowMystic); // Mystic Might
+ prayerWidgets.get(21).setHidden(!this.ShowRETRIBUTION); // Retribution
+ prayerWidgets.get(22).setHidden(!this.ShowRedemption); // Redemption
+ prayerWidgets.get(23).setHidden(!this.ShowSmite); // Smite
+ prayerWidgets.get(24).setHidden(!this.ShowPreserve); // Preserve
+ prayerWidgets.get(25).setHidden(!this.ShowChivalry); // Chivalry
+ prayerWidgets.get(26).setHidden(!this.ShowPiety); // Piety
+ prayerWidgets.get(27).setHidden(!this.ShowRigour); // Rigour
+ prayerWidgets.get(28).setHidden(!this.ShowAugury); // Augury
}
- else if (config.getarmadylprayers())
+ else if (this.getarmadylprayers)
{
- switch (config.armadyl())
+ switch (this.armadyl)
{
case DISABLED:
break;
@@ -306,9 +368,9 @@ public class HidePrayersPlugin extends Plugin
}
}
- else if (config.getbandosprayers())
+ else if (this.getbandosprayers)
{
- switch (config.bandos())
+ switch (this.bandos)
{
case DISABLED:
break;
@@ -329,9 +391,9 @@ public class HidePrayersPlugin extends Plugin
}
}
- else if (config.getbarrowsprayers())
+ else if (this.getbarrowsprayers)
{
- switch (config.barrows())
+ switch (this.barrows)
{
case DISABLED:
break;
@@ -356,9 +418,9 @@ public class HidePrayersPlugin extends Plugin
}
}
- else if (config.getcerberusprayers())
+ else if (this.getcerberusprayers)
{
- switch (config.cerberus())
+ switch (this.cerberus)
{
case DISABLED:
break;
@@ -399,9 +461,9 @@ public class HidePrayersPlugin extends Plugin
}
}
- else if (config.getsaradominprayers())
+ else if (this.getsaradominprayers)
{
- switch (config.saradomin())
+ switch (this.saradomin)
{
case DISABLED:
break;
@@ -423,9 +485,9 @@ public class HidePrayersPlugin extends Plugin
break;
}
}
- else if (config.getvorkathprayers())
+ else if (this.getvorkathprayers)
{
- switch (config.vorkath())
+ switch (this.vorkath)
{
case DISABLED:
break;
@@ -446,9 +508,9 @@ public class HidePrayersPlugin extends Plugin
}
}
- else if (config.getzamorakprayers())
+ else if (this.getzamorakprayers)
{
- switch (config.zamorak())
+ switch (this.zamorak)
{
case DISABLED:
break;
@@ -471,9 +533,9 @@ public class HidePrayersPlugin extends Plugin
}
}
- else if (config.getzulrahprayers())
+ else if (this.getzulrahprayers)
{
- switch (config.zulrah())
+ switch (this.zulrah)
{
case DISABLED:
break;
@@ -496,9 +558,9 @@ public class HidePrayersPlugin extends Plugin
}
}
- else if (config.getpvpprayers())
+ else if (this.getpvpprayers)
{
- if (config.HideRapidHealRestore())
+ if (this.HideRapidHealRestore)
{
prayerWidgets.get(8).setHidden(true); // Rapid Restore
prayerWidgets.get(9).setHidden(true); // Rapid Heal
@@ -518,7 +580,7 @@ public class HidePrayersPlugin extends Plugin
prayerWidgets.get(10).setHidden(false); // Protect Item
}
- switch (config.pvpprayers())
+ switch (this.pvpprayers)
{
case DISABLED:
reallyHidePrayers();
@@ -651,4 +713,57 @@ public class HidePrayersPlugin extends Plugin
}
}
}
+
+ private void updateConfig()
+ {
+ this.showindividualprayers = config.showindividualprayers();
+ this.ShowTHICK_SKIN = config.ShowTHICK_SKIN();
+ this.ShowBURST_OF_STRENGTH = config.ShowBURST_OF_STRENGTH();
+ this.ShowCLARITY_OF_THOUGHT = config.ShowCLARITY_OF_THOUGHT();
+ this.ShowSHARP_EYE = config.ShowSHARP_EYE();
+ this.ShowMYSTIC_WILL = config.ShowMYSTIC_WILL();
+ this.ShowROCK_SKIN = config.ShowROCK_SKIN();
+ this.ShowSUPERHUMAN_STRENGTH = config.ShowSUPERHUMAN_STRENGTH();
+ this.ShowIMPROVED_REFLEXES = config.ShowIMPROVED_REFLEXES();
+ this.ShowRapidRestore = config.ShowRapidRestore();
+ this.ShowRapidHeal = config.ShowRapidHeal();
+ this.ShowProtectItem = config.ShowProtectItem();
+ this.ShowHAWK_EYE = config.ShowHAWK_EYE();
+ this.ShowMYSTIC_LORE = config.ShowMYSTIC_LORE();
+ this.ShowSteelSkin = config.ShowSteelSkin();
+ this.ShowUltimateStrength = config.ShowUltimateStrength();
+ this.ShowIncredibleReflex = config.ShowIncredibleReflex();
+ this.ShowPTFMagic = config.ShowPTFMagic();
+ this.ShowPTFRange = config.ShowPTFRange();
+ this.ShowPTFMelee = config.ShowPTFMelee();
+ this.ShowEagle = config.ShowEagle();
+ this.ShowMystic = config.ShowMystic();
+ this.ShowRETRIBUTION = config.ShowRETRIBUTION();
+ this.ShowRedemption = config.ShowRedemption();
+ this.ShowSmite = config.ShowSmite();
+ this.ShowPreserve = config.ShowPreserve();
+ this.ShowChivalry = config.ShowChivalry();
+ this.ShowPiety = config.ShowPiety();
+ this.ShowRigour = config.ShowRigour();
+ this.ShowAugury = config.ShowAugury();
+ this.getarmadylprayers = config.getarmadylprayers();
+ this.armadyl = config.armadyl();
+ this.getbarrowsprayers = config.getbarrowsprayers();
+ this.barrows = config.barrows();
+ this.getbandosprayers = config.getbandosprayers();
+ this.bandos = config.bandos();
+ this.getcerberusprayers = config.getcerberusprayers();
+ this.cerberus = config.cerberus();
+ this.getsaradominprayers = config.getsaradominprayers();
+ this.saradomin = config.saradomin();
+ this.getvorkathprayers = config.getvorkathprayers();
+ this.vorkath = config.vorkath();
+ this.getzamorakprayers = config.getzamorakprayers();
+ this.zamorak = config.zamorak();
+ this.getzulrahprayers = config.getzulrahprayers();
+ this.zulrah = config.zulrah();
+ this.getpvpprayers = config.getpvpprayers();
+ this.pvpprayers = config.pvpprayers();
+ this.HideRapidHealRestore = config.HideRapidHealRestore();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java
index 191b7c9cf9..d4de57b30e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java
@@ -33,6 +33,7 @@ import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.ItemDefinition;
import net.runelite.api.ItemID;
import net.runelite.api.widgets.Widget;
@@ -41,19 +42,18 @@ import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.game.ItemManager;
import net.runelite.client.ui.overlay.WidgetItemOverlay;
+@Singleton
public class HighAlchemyOverlay extends WidgetItemOverlay
{
private final ItemManager itemManager;
- private final HighAlchemyConfig config;
private final HighAlchemyPlugin plugin;
private final int alchPrice;
private final int alchPriceNoStaff;
@Inject
- public HighAlchemyOverlay(ItemManager itemManager, HighAlchemyPlugin plugin, HighAlchemyConfig config)
+ public HighAlchemyOverlay(final ItemManager itemManager, final HighAlchemyPlugin plugin)
{
this.itemManager = itemManager;
- this.config = config;
this.plugin = plugin;
int natPrice = itemManager.getItemPrice(ItemID.NATURE_RUNE);
@@ -78,13 +78,13 @@ public class HighAlchemyOverlay extends WidgetItemOverlay
final int id = getNotedId(itemId);
final int gePrice = getGEPrice(id);
final int haPrice = getHAPrice(id);
- final int materialCost = config.usingFireRunes() ? alchPriceNoStaff : alchPrice;
- final int desiredProfit = config.minProfit();
+ final int materialCost = plugin.isUsingFireRunes() ? alchPriceNoStaff : alchPrice;
+ final int desiredProfit = plugin.getMinProfit();
final int haProfit = getHAProfit(haPrice, gePrice, materialCost);
if (gePrice > 0 && haPrice > 0 && haProfit >= desiredProfit)
{
- final Color color = config.getHighlightColor();
+ final Color color = plugin.getGetHighlightColor();
if (color != null)
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java
index ecfa486fed..79be6bbac4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java
@@ -28,10 +28,12 @@
package net.runelite.client.plugins.highalchemy;
import com.google.inject.Provides;
+import java.awt.Color;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.events.ConfigChanged;
@@ -57,7 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
type = PluginType.UTILITY,
enabledByDefault = false
)
-
+@Singleton
public class HighAlchemyPlugin extends Plugin
{
private static final String CONFIG_GROUP = "highalchemy";
@@ -80,9 +82,19 @@ public class HighAlchemyPlugin extends Plugin
return configManager.getConfig(HighAlchemyConfig.class);
}
+ private boolean showBank;
+ private boolean showInventory;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getHighlightColor;
+ @Getter(AccessLevel.PACKAGE)
+ private int minProfit;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean usingFireRunes;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
buildGroupList();
overlayManager.add(overlay);
}
@@ -98,6 +110,7 @@ public class HighAlchemyPlugin extends Plugin
{
if (event.getGroup().equals(CONFIG_GROUP))
{
+ updateConfig();
buildGroupList();
}
}
@@ -106,12 +119,12 @@ public class HighAlchemyPlugin extends Plugin
{
interfaceGroups.clear();
- if (config.showBank())
+ if (this.showBank)
{
interfaceGroups.add(BANK_GROUP_ID);
}
- if (config.showInventory())
+ if (this.showInventory)
{
Arrays.stream(
new int[]{
@@ -126,4 +139,13 @@ public class HighAlchemyPlugin extends Plugin
).forEach(interfaceGroups::add);
}
}
+
+ private void updateConfig()
+ {
+ this.showBank = config.showBank();
+ this.showInventory = config.showInventory();
+ this.getHighlightColor = config.getHighlightColor();
+ this.minProfit = config.minProfit();
+ this.usingFireRunes = config.usingFireRunes();
+ }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
index cf2de858e9..ec184a1a87 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
@@ -43,6 +43,7 @@ import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.Nullable;
import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -95,6 +96,7 @@ import static net.runelite.http.api.hiscore.HiscoreSkill.WOODCUTTING;
import net.runelite.http.api.hiscore.Skill;
@Slf4j
+@Singleton
public class HiscorePanel extends PluginPanel
{
/* The maximum allowed username length in runescape accounts */
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
index a7f7dd9b4a..a90ca7b8ba 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
@@ -35,6 +35,7 @@ import java.util.regex.Pattern;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Provider;
+import javax.inject.Singleton;
import javax.swing.SwingUtilities;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
@@ -62,6 +63,7 @@ import org.apache.commons.lang3.ArrayUtils;
tags = {"panel", "players"},
loadWhenOutdated = true
)
+@Singleton
public class HiscorePlugin extends Plugin
{
private static final String LOOKUP = "Lookup";
@@ -179,8 +181,6 @@ public class HiscorePlugin extends Plugin
groupId == WidgetInfo.CHATBOX.getGroupId() && !KICK_OPTION.equals(option) || //prevent from adding for Kick option (interferes with the raiding party one)
groupId == WidgetInfo.RAIDING_PARTY.getGroupId() || groupId == WidgetInfo.PRIVATE_CHAT_MESSAGE.getGroupId())
{
- boolean after;
-
if (!AFTER_OPTIONS.contains(option))
{
return;
@@ -194,7 +194,10 @@ public class HiscorePlugin extends Plugin
lookup.setParam1(event.getActionParam1());
lookup.setIdentifier(event.getIdentifier());
- insertMenuEntry(lookup, client.getMenuEntries());
+ if (client != null)
+ {
+ insertMenuEntry(lookup, client.getMenuEntries());
+ }
}
}
@@ -228,7 +231,10 @@ public class HiscorePlugin extends Plugin
MenuEntry[] newMenu = ObjectArrays.concat(entries, newEntry);
int menuEntryCount = newMenu.length;
ArrayUtils.swap(newMenu, menuEntryCount - 1, menuEntryCount - 2);
- client.setMenuEntries(newMenu);
+ if (client != null)
+ {
+ client.setMenuEntries(newMenu);
+ }
}
private void lookupPlayer(String playerName)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java
index 3fd3fbe26d..bf23f9190f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java
@@ -68,7 +68,7 @@ class NameAutocompleter implements KeyListener
private Pattern autocompleteNamePattern;
@Inject
- private NameAutocompleter(@Nullable Client client)
+ private NameAutocompleter(@Nullable final Client client)
{
this.client = client;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java
index 2e307a4992..c287fc1160 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java
@@ -25,11 +25,14 @@
package net.runelite.client.plugins.hunter;
import com.google.inject.Provides;
+import java.awt.Color;
import java.time.Instant;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
@@ -56,6 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
description = "Show the state of your traps",
tags = {"overlay", "skilling", "timers"}
)
+@Singleton
public class HunterPlugin extends Plugin
{
@Inject
@@ -73,14 +77,24 @@ public class HunterPlugin extends Plugin
@Inject
private HunterConfig config;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final Map traps = new HashMap<>();
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Instant lastActionTime = Instant.ofEpochMilli(0);
private WorldPoint lastTickLocalPlayerLocation;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getOpenTrapColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getFullTrapColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getEmptyTrapColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getTransTrapColor;
+ private boolean maniacalMonkeyNotify;
+
@Provides
HunterConfig provideConfig(ConfigManager configManager)
{
@@ -90,6 +104,8 @@ public class HunterPlugin extends Plugin
@Override
protected void startUp()
{
+ updateConfig();
+
overlayManager.add(overlay);
overlay.updateConfig();
}
@@ -210,7 +226,7 @@ public class HunterPlugin extends Plugin
myTrap.resetTimer();
lastActionTime = Instant.now();
- if (config.maniacalMonkeyNotify() && myTrap.getObjectId() == ObjectID.MONKEY_TRAP)
+ if (this.maniacalMonkeyNotify && myTrap.getObjectId() == ObjectID.MONKEY_TRAP)
{
notifier.notify("You've caught part of a monkey's tail.");
}
@@ -384,7 +400,17 @@ public class HunterPlugin extends Plugin
{
if (event.getGroup().equals("hunterplugin"))
{
+ updateConfig();
overlay.updateConfig();
}
}
+
+ private void updateConfig()
+ {
+ this.getOpenTrapColor = config.getOpenTrapColor();
+ this.getFullTrapColor = config.getFullTrapColor();
+ this.getEmptyTrapColor = config.getEmptyTrapColor();
+ this.getTransTrapColor = config.getTransTrapColor();
+ this.maniacalMonkeyNotify = config.maniacalMonkeyNotify();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java
index 4a28288994..3312a5a4f7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.hunter;
import java.time.Duration;
import java.time.Instant;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.api.GameObject;
@@ -44,23 +45,23 @@ class HunterTrap
/**
* The time in milliseconds when the trap was placed.
*/
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Instant placedOn;
/**
* The state of the trap.
*/
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private State state;
/**
* The ID of the game object this is representing
*/
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int objectId;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private WorldPoint worldLocation;
/**
@@ -91,7 +92,7 @@ class HunterTrap
*
* @param gameObject The gameobject thats corresponds with this trap.
*/
- HunterTrap(GameObject gameObject)
+ HunterTrap(final GameObject gameObject)
{
this.state = State.OPEN;
this.placedOn = Instant.now();
@@ -105,7 +106,7 @@ class HunterTrap
* @return Value between 0 and 1. 0 means the trap was laid moments ago.
* 1 is a trap that's about to collapse.
*/
- public double getTrapTimeRelative()
+ double getTrapTimeRelative()
{
Duration duration = Duration.between(placedOn, Instant.now());
return duration.compareTo(TRAP_TIME) < 0 ? (double) duration.toMillis() / TRAP_TIME.toMillis() : 1;
@@ -114,7 +115,7 @@ class HunterTrap
/**
* Resets the time value when the trap was placed.
*/
- public void resetTimer()
+ void resetTimer()
{
placedOn = Instant.now();
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java
index 6c41519726..cb774336d4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.coords.LocalPoint;
@@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.components.ProgressPieComponent;
* Represents the overlay that shows timers on traps that are placed by the
* player.
*/
+@Singleton
public class TrapOverlay extends Overlay
{
/**
@@ -51,7 +53,6 @@ public class TrapOverlay extends Overlay
private final Client client;
private final HunterPlugin plugin;
- private final HunterConfig config;
private Color colorOpen, colorOpenBorder;
private Color colorEmpty, colorEmptyBorder;
@@ -59,12 +60,11 @@ public class TrapOverlay extends Overlay
private Color colorTrans, colorTransBorder;
@Inject
- TrapOverlay(Client client, HunterPlugin plugin, HunterConfig config)
+ TrapOverlay(final Client client, final HunterPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
this.plugin = plugin;
- this.config = config;
this.client = client;
}
@@ -80,13 +80,13 @@ public class TrapOverlay extends Overlay
*/
public void updateConfig()
{
- colorEmptyBorder = config.getEmptyTrapColor();
+ colorEmptyBorder = plugin.getGetEmptyTrapColor();
colorEmpty = new Color(colorEmptyBorder.getRed(), colorEmptyBorder.getGreen(), colorEmptyBorder.getBlue(), 100);
- colorFullBorder = config.getFullTrapColor();
+ colorFullBorder = plugin.getGetFullTrapColor();
colorFull = new Color(colorFullBorder.getRed(), colorFullBorder.getGreen(), colorFullBorder.getBlue(), 100);
- colorOpenBorder = config.getOpenTrapColor();
+ colorOpenBorder = plugin.getGetOpenTrapColor();
colorOpen = new Color(colorOpenBorder.getRed(), colorOpenBorder.getGreen(), colorOpenBorder.getBlue(), 100);
- colorTransBorder = config.getTransTrapColor();
+ colorTransBorder = plugin.getGetTransTrapColor();
colorTrans = new Color(colorTransBorder.getRed(), colorTransBorder.getGreen(), colorTransBorder.getBlue(), 100);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java
index 67523eebe3..610352bd86 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java
@@ -27,12 +27,14 @@ package net.runelite.client.plugins.hydra;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
public class BabyHydraIndicatorOverlay extends Overlay
{
private final BabyHydraPlugin plugin;
@@ -40,7 +42,7 @@ public class BabyHydraIndicatorOverlay extends Overlay
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- private BabyHydraIndicatorOverlay(BabyHydraPlugin plugin)
+ private BabyHydraIndicatorOverlay(final BabyHydraPlugin plugin)
{
this.plugin = plugin;
setPosition(OverlayPosition.BOTTOM_RIGHT);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java
index 08ea0a13c9..58456a4ef3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.NPC;
import net.runelite.api.Point;
@@ -38,19 +39,17 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
public class BabyHydraOverlay extends Overlay
{
- private final BabyHydraConfig config;
private final BabyHydraPlugin plugin;
-
@Inject
private Client client;
@Inject
- private BabyHydraOverlay(BabyHydraConfig config, BabyHydraPlugin plugin)
+ private BabyHydraOverlay(final BabyHydraPlugin plugin)
{
- this.config = config;
this.plugin = plugin;
setLayer(OverlayLayer.ABOVE_SCENE);
setPosition(OverlayPosition.DYNAMIC);
@@ -73,7 +72,7 @@ public class BabyHydraOverlay extends Overlay
int val = plugin.getHydras().get(hydra.getIndex());
if (val != 0)
{
- if (config.BoldText())
+ if (plugin.isBoldText())
{
graphics.setFont(FontManager.getRunescapeBoldFont());
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java
index dfd72f8ee1..c0c6e28536 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java
@@ -28,6 +28,8 @@ import com.google.inject.Provides;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.Actor;
import net.runelite.api.Client;
@@ -50,7 +52,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
type = PluginType.PVM,
enabledByDefault = false
)
-
+@Singleton
public class BabyHydraPlugin extends Plugin
{
@Inject
@@ -77,23 +79,30 @@ public class BabyHydraPlugin extends Plugin
return configManager.getConfig(BabyHydraConfig.class);
}
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Map hydras = new HashMap<>();
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Map hydraattacks = new HashMap<>();
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private NPC hydra;
+ private boolean TextIndicator;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean BoldText;
+ private boolean PrayerHelper;
+
@Override
protected void startUp() throws Exception
{
- if (config.TextIndicator())
+ updateConfig();
+
+ if (this.TextIndicator)
{
overlayManager.add(hydraOverlay);
}
- if (config.PrayerHelper())
+ if (this.PrayerHelper)
{
overlayManager.add(hydraPrayOverlay);
overlayManager.add(hydraIndicatorOverlay);
@@ -118,6 +127,8 @@ public class BabyHydraPlugin extends Plugin
return;
}
+ updateConfig();
+
if (event.getKey().equals("textindicators"))
{
if (Boolean.parseBoolean(event.getNewValue()))
@@ -241,4 +252,11 @@ public class BabyHydraPlugin extends Plugin
}
}
}
+
+ private void updateConfig()
+ {
+ this.TextIndicator = config.TextIndicator();
+ this.BoldText = config.BoldText();
+ this.PrayerHelper = config.PrayerHelper();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java
index f11c6b172d..cf56196e21 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Prayer;
import net.runelite.api.SpriteID;
@@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.components.ComponentConstants;
import net.runelite.client.ui.overlay.components.ImageComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
public class BabyHydraPrayOverlay extends Overlay
{
private final BabyHydraPlugin plugin;
@@ -56,7 +58,7 @@ public class BabyHydraPrayOverlay extends Overlay
private Client client;
@Inject
- private BabyHydraPrayOverlay(BabyHydraPlugin plugin, SpriteManager spriteManager)
+ private BabyHydraPrayOverlay(final BabyHydraPlugin plugin, final SpriteManager spriteManager)
{
this.plugin = plugin;
this.spriteManager = spriteManager;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
index e0d3925cb6..66310c8d41 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
@@ -36,6 +36,10 @@ import java.util.List;
import javax.inject.Inject;
//import javax.sound.sampled.LineUnavailableException;
//import javax.sound.sampled.UnsupportedAudioFileException;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Setter;
+import net.runelite.api.events.ConfigChanged;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -151,6 +155,7 @@ import net.runelite.client.util.PvPUtil;
description = "Send a notification when going idle, or when HP/Prayer reaches a threshold",
tags = {"health", "hitpoints", "notifications", "prayer", "pvp", "pker"}
)
+@Singleton
public class IdleNotifierPlugin extends Plugin
{
private static final Logger logger = LoggerFactory.getLogger(IdleNotifierPlugin.class);
@@ -195,6 +200,32 @@ public class IdleNotifierPlugin extends Plugin
private SkullIcon lastTickSkull = null;
private boolean isFirstTick = true;
+ @Setter(AccessLevel.PACKAGE)
+ private boolean animationIdle;
+ private boolean animationIdleSound;
+ @Setter(AccessLevel.PACKAGE)
+ private boolean interactionIdle;
+ private boolean interactionIdleSound;
+ @Setter(AccessLevel.PACKAGE)
+ private boolean logoutIdle;
+ private boolean outOfCombatSound;
+ private boolean showSkullNotification;
+ private boolean showUnskullNotification;
+ @Setter(AccessLevel.PACKAGE)
+ private int getIdleNotificationDelay;
+ @Setter(AccessLevel.PACKAGE)
+ private int getHitpointsThreshold;
+ private boolean getPlayHealthSound;
+ @Setter(AccessLevel.PACKAGE)
+ private int getPrayerThreshold;
+ private boolean getPlayPrayerSound;
+ private int getOxygenThreshold;
+ @Setter(AccessLevel.PACKAGE)
+ private int getSpecEnergyThreshold;
+ private boolean getSpecSound;
+ private boolean getOverSpecEnergy;
+ private boolean notifyPkers;
+
@Provides
IdleNotifierConfig provideConfig(ConfigManager configManager)
{
@@ -331,7 +362,7 @@ public class IdleNotifierPlugin extends Plugin
private void onPlayerSpawned(PlayerSpawned event)
{
final Player p = event.getPlayer();
- if (config.notifyPkers())
+ if (this.notifyPkers)
{
if (p != null)
{
@@ -473,7 +504,7 @@ public class IdleNotifierPlugin extends Plugin
skullNotifier();
final Player local = client.getLocalPlayer();
- final Duration waitDuration = Duration.ofMillis(config.getIdleNotificationDelay());
+ final Duration waitDuration = Duration.ofMillis(this.getIdleNotificationDelay);
lastCombatCountdown = Math.max(lastCombatCountdown - 1, 0);
if (client.getGameState() != GameState.LOGGED_IN
@@ -486,7 +517,7 @@ public class IdleNotifierPlugin extends Plugin
return;
}
- if (config.logoutIdle() && checkIdleLogout())
+ if (this.logoutIdle && checkIdleLogout())
{
notifier.notify("[" + local.getName() + "] is about to log out from idling too long!");
}
@@ -496,20 +527,20 @@ public class IdleNotifierPlugin extends Plugin
notifier.notify("[" + local.getName() + "] is about to log out from being online for 6 hours!");
}
- if (config.animationIdle() && checkAnimationIdle(waitDuration, local))
+ if (this.animationIdle && checkAnimationIdle(waitDuration, local))
{
notifier.notify("[" + local.getName() + "] is now idle!");
- if (config.animationIdleSound())
+ if (this.animationIdleSound)
{
soundManager.playSound(Sound.IDLE);
}
}
- if (config.interactionIdle() && checkInteractionIdle(waitDuration, local))
+ if (this.interactionIdle && checkInteractionIdle(waitDuration, local))
{
if (lastInteractWasCombat)
{
notifier.notify("[" + local.getName() + "] is now out of combat!");
- if (config.outOfCombatSound())
+ if (this.outOfCombatSound)
{
soundManager.playSound(Sound.OUT_OF_COMBAT);
}
@@ -517,7 +548,7 @@ public class IdleNotifierPlugin extends Plugin
else
{
notifier.notify("[" + local.getName() + "] is now idle!");
- if (config.interactionIdleSound())
+ if (this.interactionIdleSound)
{
soundManager.playSound(Sound.IDLE);
}
@@ -527,7 +558,7 @@ public class IdleNotifierPlugin extends Plugin
if (checkLowHitpoints())
{
notifier.notify("[" + local.getName() + "] has low hitpoints!");
- if (config.getPlayHealthSound())
+ if (this.getPlayHealthSound)
{
soundManager.playSound(Sound.LOW_HEATLH);
}
@@ -536,7 +567,7 @@ public class IdleNotifierPlugin extends Plugin
if (checkLowPrayer())
{
notifier.notify("[" + local.getName() + "] has low prayer!");
- if (config.getPlayPrayerSound())
+ if (this.getPlayPrayerSound)
{
soundManager.playSound(Sound.LOW_PRAYER);
}
@@ -550,7 +581,7 @@ public class IdleNotifierPlugin extends Plugin
if (checkFullSpecEnergy())
{
notifier.notify("[" + local.getName() + "] has restored spec energy!");
- if (config.getSpecSound())
+ if (this.getSpecSound)
{
soundManager.playSound(Sound.RESTORED_SPECIAL_ATTACK);
}
@@ -561,7 +592,7 @@ public class IdleNotifierPlugin extends Plugin
{
int currentSpecEnergy = client.getVar(VarPlayer.SPECIAL_ATTACK_PERCENT);
- int threshold = config.getSpecEnergyThreshold() * 10;
+ int threshold = this.getSpecEnergyThreshold * 10;
if (threshold == 0)
{
lastSpecEnergy = currentSpecEnergy;
@@ -572,7 +603,7 @@ public class IdleNotifierPlugin extends Plugin
// regen was small enough.
boolean notify = lastSpecEnergy < threshold && currentSpecEnergy >= threshold && currentSpecEnergy - lastSpecEnergy <= 100;
- notify = (notify) || ((config.getOverSpecEnergy()) && (currentSpecEnergy >= threshold) && (currentSpecEnergy != lastSpecEnergy) && (currentSpecEnergy - lastSpecEnergy <= 100));
+ notify = (notify) || ((this.getOverSpecEnergy) && (currentSpecEnergy >= threshold) && (currentSpecEnergy != lastSpecEnergy) && (currentSpecEnergy - lastSpecEnergy <= 100));
lastSpecEnergy = currentSpecEnergy;
return notify;
@@ -580,11 +611,11 @@ public class IdleNotifierPlugin extends Plugin
private boolean checkLowOxygen()
{
- if (config.getOxygenThreshold() == 0)
+ if (this.getOxygenThreshold == 0)
{
return false;
}
- if (config.getOxygenThreshold() >= client.getVar(Varbits.OXYGEN_LEVEL) * 0.1)
+ if (this.getOxygenThreshold >= client.getVar(Varbits.OXYGEN_LEVEL) * 0.1)
{
if (!notifyOxygen)
{
@@ -601,13 +632,13 @@ public class IdleNotifierPlugin extends Plugin
private boolean checkLowHitpoints()
{
- if (config.getHitpointsThreshold() == 0)
+ if (this.getHitpointsThreshold == 0)
{
return false;
}
- if (client.getRealSkillLevel(Skill.HITPOINTS) > config.getHitpointsThreshold())
+ if (client.getRealSkillLevel(Skill.HITPOINTS) > this.getHitpointsThreshold)
{
- if (client.getBoostedSkillLevel(Skill.HITPOINTS) + client.getVar(Varbits.NMZ_ABSORPTION) <= config.getHitpointsThreshold())
+ if (client.getBoostedSkillLevel(Skill.HITPOINTS) + client.getVar(Varbits.NMZ_ABSORPTION) <= this.getHitpointsThreshold)
{
if (!notifyHitpoints)
{
@@ -626,13 +657,13 @@ public class IdleNotifierPlugin extends Plugin
private boolean checkLowPrayer()
{
- if (config.getPrayerThreshold() == 0)
+ if (this.getPrayerThreshold == 0)
{
return false;
}
- if (client.getRealSkillLevel(Skill.PRAYER) > config.getPrayerThreshold())
+ if (client.getRealSkillLevel(Skill.PRAYER) > this.getPrayerThreshold)
{
- if (client.getBoostedSkillLevel(Skill.PRAYER) <= config.getPrayerThreshold())
+ if (client.getBoostedSkillLevel(Skill.PRAYER) <= this.getPrayerThreshold)
{
if (!notifyPrayer)
{
@@ -792,11 +823,11 @@ public class IdleNotifierPlugin extends Plugin
{
if (!isFirstTick)
{
- if (config.showSkullNotification() && lastTickSkull == null && currentTickSkull == SkullIcon.SKULL)
+ if (this.showSkullNotification && lastTickSkull == null && currentTickSkull == SkullIcon.SKULL)
{
notifier.notify("[" + local.getName() + "] is now skulled!");
}
- else if (config.showUnskullNotification() && lastTickSkull == SkullIcon.SKULL && currentTickSkull == null)
+ else if (this.showUnskullNotification && lastTickSkull == SkullIcon.SKULL && currentTickSkull == null)
{
notifier.notify("[" + local.getName() + "] is now unskulled!");
}
@@ -809,4 +840,43 @@ public class IdleNotifierPlugin extends Plugin
lastTickSkull = currentTickSkull;
}
}
+
+ @Override
+ protected void startUp() throws Exception
+ {
+ updateConfig();
+ }
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("idlenotifier"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ private void updateConfig()
+ {
+ this.animationIdle = config.animationIdle();
+ this.animationIdleSound = config.animationIdleSound();
+ this.interactionIdle = config.interactionIdle();
+ this.interactionIdleSound = config.interactionIdleSound();
+ this.logoutIdle = config.logoutIdle();
+ this.outOfCombatSound = config.outOfCombatSound();
+ this.showSkullNotification = config.showSkullNotification();
+ this.showUnskullNotification = config.showUnskullNotification();
+ this.getIdleNotificationDelay = config.getIdleNotificationDelay();
+ this.getHitpointsThreshold = config.getHitpointsThreshold();
+ this.getPlayHealthSound = config.getPlayHealthSound();
+ this.getPrayerThreshold = config.getPrayerThreshold();
+ this.getPlayPrayerSound = config.getPlayPrayerSound();
+ this.getOxygenThreshold = config.getOxygenThreshold();
+ this.getSpecEnergyThreshold = config.getSpecEnergyThreshold();
+ this.getSpecSound = config.getSpecSound();
+ this.getOverSpecEnergy = config.getOverSpecEnergy();
+ this.notifyPkers = config.notifyPkers();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java
index c88d433254..a66ee4e270 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java
@@ -4,26 +4,23 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.util.Map;
import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
public class ImplingCounterOverlay extends Overlay
{
- private final Client client;
private final ImplingsPlugin plugin;
- private final ImplingsConfig config;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- public ImplingCounterOverlay(Client client, ImplingsConfig config, ImplingsPlugin plugin)
+ public ImplingCounterOverlay(final ImplingsPlugin plugin)
{
- this.client = client;
- this.config = config;
this.plugin = plugin;
setPosition(OverlayPosition.TOP_LEFT);
}
@@ -31,7 +28,7 @@ public class ImplingCounterOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (!config.showCounter() || plugin.getImplings().isEmpty())
+ if (!plugin.isShowSpawn() || plugin.getImplings().isEmpty())
return null;
panelComponent.getChildren().clear();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java
index ab35f9f945..cb78082865 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.NPC;
import net.runelite.api.Point;
import net.runelite.client.ui.overlay.Overlay;
@@ -36,18 +37,17 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
public class ImplingMinimapOverlay extends Overlay
{
private final ImplingsPlugin plugin;
- private final ImplingsConfig config;
@Inject
- private ImplingMinimapOverlay(ImplingsPlugin plugin, ImplingsConfig config)
+ private ImplingMinimapOverlay(final ImplingsPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_WIDGETS);
this.plugin = plugin;
- this.config = config;
}
@Override
@@ -63,14 +63,14 @@ public class ImplingMinimapOverlay extends Overlay
{
Point impLocation = imp.getMinimapLocation();
Color color = plugin.npcToColor(imp);
- if (!plugin.showNpc(imp) || impLocation == null || color == null)
+ if (plugin.showNpc(imp) || impLocation == null || color == null)
{
continue;
}
OverlayUtil.renderMinimapLocation(graphics, impLocation, color);
- if (config.showName())
+ if (plugin.isShowName())
{
Point textLocation = new Point(impLocation.getX() + 1, impLocation.getY());
OverlayUtil.renderTextLocation(graphics, textLocation, imp.getName(), color);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java
index d624c02682..122c0b5583 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java
@@ -24,6 +24,7 @@
*/
package net.runelite.client.plugins.implings;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.runelite.api.coords.WorldPoint;
@@ -32,7 +33,7 @@ import net.runelite.api.coords.WorldPoint;
* @author Juzzed
*/
@AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
enum ImplingSpawn
{
//Baby spawns
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java
index cacac2f167..787adcc46a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java
@@ -24,11 +24,12 @@
*/
package net.runelite.client.plugins.implings;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
enum ImplingType
{
BABY("Baby"),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java
index d55be9f962..386284a874 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java
@@ -320,15 +320,4 @@ public interface ImplingsConfig extends Config
{
return Color.WHITE;
}
-
- @ConfigItem(
- position = 26,
- keyName = "showCounter",
- name = "Show impling counter overlay",
- description = "Shows how many of each impling there is nearby"
- )
- default boolean showCounter()
- {
- return false;
- }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java
index 8b4e404bd3..47a1e42271 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Polygon;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import net.runelite.api.NPC;
@@ -47,18 +48,17 @@ import net.runelite.client.ui.overlay.OverlayUtil;
/**
* @author robin
*/
+@Singleton
public class ImplingsOverlay extends Overlay
{
private final Client client;
- private final ImplingsConfig config;
private final ImplingsPlugin plugin;
@Inject
- private ImplingsOverlay(Client client, ImplingsConfig config, ImplingsPlugin plugin)
+ private ImplingsOverlay(final Client client, final ImplingsPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
- this.config = config;
this.client = client;
this.plugin = plugin;
}
@@ -76,7 +76,7 @@ public class ImplingsOverlay extends Overlay
for (NPC imp : implings)
{
Color color = plugin.npcToColor(imp);
- if (!plugin.showNpc(imp) || color == null)
+ if (plugin.showNpc(imp) || color == null)
{
continue;
}
@@ -85,7 +85,7 @@ public class ImplingsOverlay extends Overlay
}
//Draw static spawns
- if (config.showSpawn())
+ if (plugin.isShowSpawn())
{
for (ImplingSpawn spawn : ImplingSpawn.values())
{
@@ -95,14 +95,14 @@ public class ImplingsOverlay extends Overlay
}
String impName = spawn.getType().getName();
- drawSpawn(graphics, spawn.getSpawnLocation(), impName, config.getSpawnColor());
+ drawSpawn(graphics, spawn.getSpawnLocation(), impName, plugin.getGetSpawnColor());
}
//Draw dynamic spawns
Map dynamicSpawns = plugin.getDynamicSpawns();
for (Map.Entry dynamicSpawn : dynamicSpawns.entrySet())
{
- drawDynamicSpawn(graphics, dynamicSpawn.getKey(), dynamicSpawn.getValue(), config.getDynamicSpawnColor());
+ drawDynamicSpawn(graphics, dynamicSpawn.getKey(), dynamicSpawn.getValue(), plugin.getGetDynamicSpawnColor());
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java
index 5ec61041da..8458b45735 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java
@@ -31,10 +31,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.GameState;
import net.runelite.api.NPC;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.NpcDespawned;
@@ -53,13 +55,14 @@ import net.runelite.client.ui.overlay.OverlayManager;
description = "Highlight nearby implings on the minimap and on-screen",
tags = {"hunter", "minimap", "overlay"}
)
+@Singleton
public class ImplingsPlugin extends Plugin
{
private static final int DYNAMIC_SPAWN_NATURE_DRAGON = 1618;
private static final int DYNAMIC_SPAWN_ECLECTIC = 1633;
private static final int DYNAMIC_SPAWN_BABY_ESSENCE = 1634;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Map implingCounterMap = new HashMap<>();
@Getter(AccessLevel.PACKAGE)
@@ -84,6 +87,37 @@ public class ImplingsPlugin extends Plugin
@Inject
private ImplingsConfig config;
+ private boolean showBaby;
+ private Color getBabyColor;
+ private boolean showYoung;
+ private Color getYoungColor;
+ private boolean showGourmet;
+ private Color getGourmetColor;
+ private boolean showEarth;
+ private Color getEarthColor;
+ private boolean showEssence;
+ private Color getEssenceColor;
+ private boolean showEclectic;
+ private Color getEclecticColor;
+ private boolean showNature;
+ private Color getNatureColor;
+ private boolean showMagpie;
+ private Color getMagpieColor;
+ private boolean showNinja;
+ private Color getNinjaColor;
+ private boolean showDragon;
+ private Color getDragonColor;
+ private boolean showLucky;
+ private Color getLuckyColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showSpawn;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getSpawnColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showName;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getDynamicSpawnColor;
+
@Provides
ImplingsConfig getConfig(ConfigManager configManager)
{
@@ -93,6 +127,8 @@ public class ImplingsPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
dynamicSpawns.put(DYNAMIC_SPAWN_NATURE_DRAGON, "T3 Nature-Lucky Dynamic");
dynamicSpawns.put(DYNAMIC_SPAWN_ECLECTIC, "T2 Eclectic Dynamic");
dynamicSpawns.put(DYNAMIC_SPAWN_BABY_ESSENCE, "T1 Baby-Essence Dynamic");
@@ -175,10 +211,10 @@ public class ImplingsPlugin extends Plugin
Impling impling = Impling.findImpling(npc.getId());
if (impling == null)
{
- return false;
+ return true;
}
- return showImplingType(impling.getImplingType());
+ return !showImplingType(impling.getImplingType());
}
boolean showImplingType(ImplingType implingType)
@@ -186,27 +222,27 @@ public class ImplingsPlugin extends Plugin
switch (implingType)
{
case BABY:
- return config.showBaby();
+ return this.showBaby;
case YOUNG:
- return config.showYoung();
+ return this.showYoung;
case GOURMET:
- return config.showGourmet();
+ return this.showGourmet;
case EARTH:
- return config.showEarth();
+ return this.showEarth;
case ESSENCE:
- return config.showEssence();
+ return this.showEssence;
case ECLECTIC:
- return config.showEclectic();
+ return this.showEclectic;
case NATURE:
- return config.showNature();
+ return this.showNature;
case MAGPIE:
- return config.showMagpie();
+ return this.showMagpie;
case NINJA:
- return config.showNinja();
+ return this.showNinja;
case DRAGON:
- return config.showDragon();
+ return this.showDragon;
case LUCKY:
- return config.showLucky();
+ return this.showLucky;
default:
return false;
}
@@ -223,35 +259,76 @@ public class ImplingsPlugin extends Plugin
return typeToColor(impling.getImplingType());
}
- Color typeToColor(ImplingType type)
+ private Color typeToColor(ImplingType type)
{
switch (type)
{
case BABY:
- return config.getBabyColor();
+ return this.getBabyColor;
case YOUNG:
- return config.getYoungColor();
+ return this.getYoungColor;
case GOURMET:
- return config.getGourmetColor();
+ return this.getGourmetColor;
case EARTH:
- return config.getEarthColor();
+ return this.getEarthColor;
case ESSENCE:
- return config.getEssenceColor();
+ return this.getEssenceColor;
case ECLECTIC:
- return config.getEclecticColor();
+ return this.getEclecticColor;
case NATURE:
- return config.getNatureColor();
+ return this.getNatureColor;
case MAGPIE:
- return config.getMagpieColor();
+ return this.getMagpieColor;
case NINJA:
- return config.getNinjaColor();
+ return this.getNinjaColor;
case DRAGON:
- return config.getDragonColor();
+ return this.getDragonColor;
case LUCKY:
- return config.getLuckyColor();
+ return this.getLuckyColor;
default:
return null;
}
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("implings"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ private void updateConfig()
+ {
+ this.showBaby = config.showBaby();
+ this.getBabyColor = config.getBabyColor();
+ this.showYoung = config.showYoung();
+ this.getYoungColor = config.getYoungColor();
+ this.showGourmet = config.showGourmet();
+ this.getGourmetColor = config.getGourmetColor();
+ this.showEarth = config.showEarth();
+ this.getEarthColor = config.getEarthColor();
+ this.showEssence = config.showEssence();
+ this.getEssenceColor = config.getEssenceColor();
+ this.showEclectic = config.showEclectic();
+ this.getEclecticColor = config.getEclecticColor();
+ this.showNature = config.showNature();
+ this.getNatureColor = config.getNatureColor();
+ this.showMagpie = config.showMagpie();
+ this.getMagpieColor = config.getMagpieColor();
+ this.showNinja = config.showNinja();
+ this.getNinjaColor = config.getNinjaColor();
+ this.showDragon = config.showDragon();
+ this.getDragonColor = config.getDragonColor();
+ this.showLucky = config.showLucky();
+ this.getLuckyColor = config.getLuckyColor();
+ this.showSpawn = config.showSpawn();
+ this.getSpawnColor = config.getSpawnColor();
+ this.showName = config.showName();
+ this.getDynamicSpawnColor = config.getDynamicSpawnColor();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java
index bd7c2b045e..7e6f0ece3a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java
@@ -24,66 +24,66 @@
*/
package net.runelite.client.plugins.inferno;
+import java.awt.Color;
import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
-import java.awt.Color;
@ConfigGroup("inferno")
public interface InfernoConfig extends Config
- {
+{
@ConfigItem(
- position = 0,
- keyName = "Nibbler Overlay",
- name = "Nibbler Overlay",
- description = "Shows if there are any Nibblers left"
+ position = 0,
+ keyName = "Nibbler Overlay",
+ name = "Nibbler Overlay",
+ description = "Shows if there are any Nibblers left"
)
default boolean displayNibblerOverlay()
- {
- return false;
- }
+ {
+ return false;
+ }
@ConfigItem(
- position = 1,
- keyName = "Prayer Helper",
- name = "Prayer Helper",
- description = "Tells you what to flick in how many ticks"
+ position = 1,
+ keyName = "Prayer Helper",
+ name = "Prayer Helper",
+ description = "Tells you what to flick in how many ticks"
)
default boolean showPrayerHelp()
- {
- return false;
- }
+ {
+ return false;
+ }
@ConfigItem(
- position = 2,
- keyName = "waveDisplay",
- name = "Wave display",
- description = "Shows monsters that will spawn on the selected wave(s)."
+ position = 2,
+ keyName = "waveDisplay",
+ name = "Wave display",
+ description = "Shows monsters that will spawn on the selected wave(s)."
)
default InfernoWaveDisplayMode waveDisplay()
- {
- return InfernoWaveDisplayMode.BOTH;
- }
+ {
+ return InfernoWaveDisplayMode.BOTH;
+ }
@ConfigItem(
- position = 3,
- keyName = "getWaveOverlayHeaderColor",
- name = "Wave Header",
- description = "Color for Wave Header"
+ position = 3,
+ keyName = "getWaveOverlayHeaderColor",
+ name = "Wave Header",
+ description = "Color for Wave Header"
)
default Color getWaveOverlayHeaderColor()
- {
- return Color.ORANGE;
- }
+ {
+ return Color.ORANGE;
+ }
@ConfigItem(
- position = 4,
- keyName = "getWaveTextColor",
- name = "Wave Text Color",
- description = "Color for Wave Texts"
+ position = 4,
+ keyName = "getWaveTextColor",
+ name = "Wave Text Color",
+ description = "Color for Wave Texts"
)
default Color getWaveTextColor()
- {
- return Color.WHITE;
- }
- }
\ No newline at end of file
+ {
+ return Color.WHITE;
+ }
+}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java
index 12b4571b09..9e1af9a978 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java
@@ -27,26 +27,26 @@ package net.runelite.client.plugins.inferno;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
+import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
-import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
public class InfernoInfobox extends Overlay
{
private final Client client;
private final InfernoPlugin plugin;
- private final InfernoConfig config;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- public InfernoInfobox(Client client, InfernoConfig config, InfernoPlugin plugin)
+ public InfernoInfobox(final Client client, final InfernoPlugin plugin)
{
this.client = client;
- this.config = config;
this.plugin = plugin;
setPosition(OverlayPosition.TOP_LEFT);
}
@@ -54,7 +54,10 @@ public class InfernoInfobox extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (!config.showPrayerHelp() || client.getMapRegions()[0] != 9043) return null;
+ if (!plugin.isShowPrayerHelp() || client.getMapRegions()[0] != 9043)
+ {
+ return null;
+ }
panelComponent.getChildren().clear();
TableComponent tableComponent = new TableComponent();
@@ -68,7 +71,7 @@ public class InfernoInfobox extends Overlay
}
else
{
- tableComponent.addRow(plugin.getPriorityNPC()[i - 1].getName(), plugin.getPriorityNPC()[i - 1 ].getAttackstyle().getName());
+ tableComponent.addRow(plugin.getPriorityNPC()[i - 1].getName(), plugin.getPriorityNPC()[i - 1].getAttackstyle().getName());
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java
index 28ae29c1cd..1451a96216 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java
@@ -28,26 +28,26 @@ import net.runelite.api.AnimationID;
import net.runelite.api.Prayer;
public enum InfernoJadAttack
- {
- MAGIC(AnimationID.JALTOK_JAD_MAGE_ATTACK, Prayer.PROTECT_FROM_MAGIC),
- RANGE(AnimationID.JALTOK_JAD_RANGE_ATTACK, Prayer.PROTECT_FROM_MISSILES);
+{
+ MAGIC(AnimationID.JALTOK_JAD_MAGE_ATTACK, Prayer.PROTECT_FROM_MAGIC),
+ RANGE(AnimationID.JALTOK_JAD_RANGE_ATTACK, Prayer.PROTECT_FROM_MISSILES);
private final int animation;
private final Prayer prayer;
- InfernoJadAttack(int animation, Prayer prayer)
- {
- this.animation = animation;
- this.prayer = prayer;
- }
+ InfernoJadAttack(final int animation, final Prayer prayer)
+ {
+ this.animation = animation;
+ this.prayer = prayer;
+ }
public int getAnimation()
- {
- return animation;
- }
+ {
+ return animation;
+ }
public Prayer getPrayer()
- {
- return prayer;
- }
+ {
+ return prayer;
}
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java
index 43252b4c95..50af2fb664 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java
@@ -29,7 +29,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
-
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.SpriteID;
import net.runelite.client.game.SpriteManager;
@@ -40,8 +40,9 @@ import net.runelite.client.ui.overlay.components.ComponentConstants;
import net.runelite.client.ui.overlay.components.ImageComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
public class InfernoJadOverlay extends Overlay
- {
+{
private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150);
private final Client client;
private final InfernoPlugin plugin;
@@ -49,39 +50,39 @@ public class InfernoJadOverlay extends Overlay
private final PanelComponent imagePanelComponent = new PanelComponent();
@Inject
- private InfernoJadOverlay(Client client, InfernoPlugin plugin, SpriteManager spriteManager)
- {
- setPosition(OverlayPosition.BOTTOM_RIGHT);
- setPriority(OverlayPriority.HIGH);
- this.client = client;
- this.plugin = plugin;
- this.spriteManager = spriteManager;
- }
+ private InfernoJadOverlay(final Client client, final InfernoPlugin plugin, final SpriteManager spriteManager)
+ {
+ setPosition(OverlayPosition.BOTTOM_RIGHT);
+ setPriority(OverlayPriority.HIGH);
+ this.client = client;
+ this.plugin = plugin;
+ this.spriteManager = spriteManager;
+ }
@Override
public Dimension render(Graphics2D graphics)
+ {
+ final InfernoJadAttack attack = plugin.getAttack();
+
+ if (attack == null)
{
- final InfernoJadAttack attack = plugin.getAttack();
-
- if (attack == null)
- {
- return null;
- }
-
- final BufferedImage prayerImage = getPrayerImage(attack);
-
- imagePanelComponent.getChildren().clear();
- imagePanelComponent.getChildren().add(new ImageComponent(prayerImage));
- imagePanelComponent.setBackgroundColor(client.isPrayerActive(attack.getPrayer())
- ? ComponentConstants.STANDARD_BACKGROUND_COLOR
- : NOT_ACTIVATED_BACKGROUND_COLOR);
-
- return imagePanelComponent.render(graphics);
+ return null;
}
+ final BufferedImage prayerImage = getPrayerImage(attack);
+
+ imagePanelComponent.getChildren().clear();
+ imagePanelComponent.getChildren().add(new ImageComponent(prayerImage));
+ imagePanelComponent.setBackgroundColor(client.isPrayerActive(attack.getPrayer())
+ ? ComponentConstants.STANDARD_BACKGROUND_COLOR
+ : NOT_ACTIVATED_BACKGROUND_COLOR);
+
+ return imagePanelComponent.render(graphics);
+ }
+
private BufferedImage getPrayerImage(InfernoJadAttack attack)
- {
- final int prayerSpriteID = attack == InfernoJadAttack.MAGIC ? SpriteID.PRAYER_PROTECT_FROM_MAGIC : SpriteID.PRAYER_PROTECT_FROM_MISSILES;
- return spriteManager.getSprite(prayerSpriteID, 0);
- }
+ {
+ final int prayerSpriteID = attack == InfernoJadAttack.MAGIC ? SpriteID.PRAYER_PROTECT_FROM_MAGIC : SpriteID.PRAYER_PROTECT_FROM_MISSILES;
+ return spriteManager.getSprite(prayerSpriteID, 0);
}
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java
index 392ec4bad6..3208dba7df 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.inferno;
import java.awt.Color;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.api.NPC;
@@ -39,10 +40,10 @@ public class InfernoNPC
MELEE("Melee", Color.WHITE),
RANDOM("Random", Color.ORANGE);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private String name = "";
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Color color;
Attackstyle(String s, Color c)
@@ -52,44 +53,44 @@ public class InfernoNPC
}
}
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private NPC npc;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private String name;
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private Attackstyle attackstyle;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int attackTicks;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int priority;
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private int ticksTillAttack = -1;
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private boolean attacking = false;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int attackAnimation;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private boolean isMidAttack = false;
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private int distanceToPlayer = 0;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
int textLocHeight;
- public InfernoNPC(NPC npc)
+ InfernoNPC(NPC npc)
{
this.npc = npc;
textLocHeight = npc.getLogicalHeight() + 40;
@@ -177,7 +178,7 @@ public class InfernoNPC
return info;
}
- public void attacked()
+ void attacked()
{
ticksTillAttack = attackTicks;
attacking = true;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java
index 12d88ef2af..a55b0f9f2e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.inferno;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
@@ -34,29 +35,29 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
+@Singleton
public class InfernoNibblerOverlay extends Overlay
{
private final Client client;
private final InfernoPlugin plugin;
- private final InfernoConfig config;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- public InfernoNibblerOverlay(Client client, InfernoConfig config, InfernoPlugin plugin)
+ public InfernoNibblerOverlay(final Client client, final InfernoPlugin plugin)
{
this.client = client;
- this.config = config;
this.plugin = plugin;
setPosition(OverlayPosition.TOP_LEFT);
}
-
@Override
public Dimension render(Graphics2D graphics)
{
- if (!config.displayNibblerOverlay() || plugin.getNibblers().size() == 0 || client.getMapRegions()[0] != 9043)
- return null;
+ if (!plugin.isDisplayNibblerOverlay() || plugin.getNibblers().size() == 0 || client.getMapRegions()[0] != 9043)
+ {
+ return null;
+ }
panelComponent.getChildren().clear();
TableComponent tableComponent = new TableComponent();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java
index 0175e1f751..0d374137f7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.NPC;
import net.runelite.api.Perspective;
@@ -38,29 +39,29 @@ import net.runelite.api.coords.LocalPoint;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
-import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
public class InfernoOverlay extends Overlay
{
private final Client client;
private final InfernoPlugin plugin;
- private final InfernoConfig config;
- private final PanelComponent panelComponent = new PanelComponent();
@Inject
- public InfernoOverlay(Client client, InfernoConfig config, InfernoPlugin plugin)
+ public InfernoOverlay(final Client client, final InfernoPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
this.client = client;
- this.config = config;
this.plugin = plugin;
}
@Override
public Dimension render(Graphics2D graphics)
{
- if (!client.isInInstancedRegion() || client.getMapRegions()[0] != 9043) return null;
+ if (!client.isInInstancedRegion() || client.getMapRegions()[0] != 9043)
+ {
+ return null;
+ }
for (InfernoNPC monster : plugin.getMonsters().values())
{
@@ -96,13 +97,16 @@ public class InfernoOverlay extends Overlay
return;
}
- int x = textLocation.getX();
- int y = textLocation.getY();
+ if (textLocation != null)
+ {
+ int x = textLocation.getX();
+ int y = textLocation.getY();
- graphics.setColor(Color.BLACK);
- graphics.drawString(text, x + 1, y + 1);
+ graphics.setColor(Color.BLACK);
+ graphics.drawString(text, x + 1, y + 1);
- graphics.setColor(color);
- graphics.drawString(text, x, y);
+ graphics.setColor(color);
+ graphics.drawString(text, x, y);
+ }
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java
index 8a8549c4d5..4b0112a94f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java
@@ -25,13 +25,14 @@
package net.runelite.client.plugins.inferno;
import com.google.inject.Provides;
-
+import java.awt.Color;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@@ -58,12 +59,13 @@ import net.runelite.client.ui.overlay.OverlayManager;
import org.apache.commons.lang3.ArrayUtils;
@PluginDescriptor(
- name = "Inferno",
- description = "Inferno helper",
- tags = {"combat", "overlay", "pve", "pvm"},
- type = PluginType.PVM
+ name = "Inferno",
+ description = "Inferno helper",
+ tags = {"combat", "overlay", "pve", "pvm"},
+ type = PluginType.PVM
)
@Slf4j
+@Singleton
public class InfernoPlugin extends Plugin
{
private static final int INFERNO_REGION = 9043;
@@ -92,22 +94,21 @@ public class InfernoPlugin extends Plugin
@Inject
private InfernoConfig config;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int currentWave = -1;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Map monsters;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Map> monsterCurrentAttackMap;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private List nibblers;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private InfernoNPC[] priorityNPC;
-
@Getter(AccessLevel.PACKAGE)
@Nullable
private InfernoJadAttack attack;
@@ -120,20 +121,29 @@ public class InfernoPlugin extends Plugin
private List waveMonsters;
public InfernoPlugin()
- {
- waveMonsters = new ArrayList<>();
- }
+ {
+ waveMonsters = new ArrayList<>();
+ }
+
+ @Getter(AccessLevel.PACKAGE)
+ private boolean displayNibblerOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showPrayerHelp;
+ private InfernoWaveDisplayMode waveDisplay;
+ private Color getWaveOverlayHeaderColor;
+ private Color getWaveTextColor;
@Provides
InfernoConfig provideConfig(ConfigManager configManager)
- {
- return configManager.getConfig(InfernoConfig.class);
- }
+ {
+ return configManager.getConfig(InfernoConfig.class);
+ }
@Override
protected void startUp() throws Exception
{
- waveOverlay.setDisplayMode(config.waveDisplay());
+ updateConfig();
+ waveOverlay.setDisplayMode(this.waveDisplay);
if (isInInferno())
{
@@ -141,7 +151,7 @@ public class InfernoPlugin extends Plugin
overlayManager.add(infernoInfobox);
overlayManager.add(nibblerOverlay);
- if (config.waveDisplay() != InfernoWaveDisplayMode.NONE)
+ if (this.waveDisplay != InfernoWaveDisplayMode.NONE)
{
overlayManager.add(waveOverlay);
}
@@ -149,8 +159,8 @@ public class InfernoPlugin extends Plugin
overlayManager.add(jadOverlay);
}
- waveOverlay.setWaveHeaderColor(config.getWaveOverlayHeaderColor());
- waveOverlay.setWaveTextColor(config.getWaveTextColor());
+ waveOverlay.setWaveHeaderColor(this.getWaveOverlayHeaderColor);
+ waveOverlay.setWaveTextColor(this.getWaveTextColor);
monsters = new HashMap<>();
monsterCurrentAttackMap = new HashMap<>(6);
@@ -177,6 +187,7 @@ public class InfernoPlugin extends Plugin
monsters = null;
currentWaveNumber = -1;
}
+
@Subscribe
private void onConfigChanged(ConfigChanged event)
{
@@ -185,18 +196,20 @@ public class InfernoPlugin extends Plugin
return;
}
+ updateConfig();
+
if (event.getKey().endsWith("color"))
{
- waveOverlay.setWaveHeaderColor(config.getWaveOverlayHeaderColor());
- waveOverlay.setWaveTextColor(config.getWaveTextColor());
+ waveOverlay.setWaveHeaderColor(this.getWaveOverlayHeaderColor);
+ waveOverlay.setWaveTextColor(this.getWaveTextColor);
}
else if ("waveDisplay".equals(event.getKey()))
{
overlayManager.remove(waveOverlay);
- waveOverlay.setDisplayMode(config.waveDisplay());
+ waveOverlay.setDisplayMode(this.waveDisplay);
- if (isInInferno() && config.waveDisplay() != InfernoWaveDisplayMode.NONE)
+ if (isInInferno() && this.waveDisplay != InfernoWaveDisplayMode.NONE)
{
overlayManager.add(waveOverlay);
}
@@ -205,40 +218,46 @@ public class InfernoPlugin extends Plugin
@Subscribe
public void onNpcSpawned(NpcSpawned event)
+ {
+ if (client.getMapRegions()[0] != 9043)
{
- if (client.getMapRegions()[0] != 9043) return;
-
- NPC npc = event.getNpc();
- if (isValidInfernoMob(npc))
- {
- monsters.put(npc, new InfernoNPC(npc));
- 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);
- }
+ return;
}
+ NPC npc = event.getNpc();
+ if (isValidInfernoMob(npc))
+ {
+ monsters.put(npc, new InfernoNPC(npc));
+ 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;
+ if (client.getMapRegions()[0] != 9043)
+ {
+ return;
+ }
NPC npc = event.getNpc();
if (monsters.containsKey(npc))
@@ -288,7 +307,7 @@ public class InfernoPlugin extends Plugin
overlayManager.add(infernoInfobox);
overlayManager.add(nibblerOverlay);
- if (config.waveDisplay() != InfernoWaveDisplayMode.NONE)
+ if (this.waveDisplay != InfernoWaveDisplayMode.NONE)
{
overlayManager.add(waveOverlay);
}
@@ -317,7 +336,10 @@ public class InfernoPlugin extends Plugin
@Subscribe
public void onGameTick(GameTick event)
{
- if (client.getMapRegions()[0] != 9043) return;
+ if (client.getMapRegions()[0] != 9043)
+ {
+ return;
+ }
clearMapAndPriority();
@@ -405,7 +427,10 @@ public class InfernoPlugin extends Plugin
{
ArrayList monsters = monsterCurrentAttackMap.get(i + 1);
- if (monsters.size() == 0) continue;
+ if (monsters.size() == 0)
+ {
+ continue;
+ }
int priority = monsters.get(0).getPriority();
@@ -474,4 +499,13 @@ public class InfernoPlugin extends Plugin
{
return currentWaveNumber == -1 || currentWaveNumber == 69 ? -1 : currentWaveNumber + 1;
}
+
+ private void updateConfig()
+ {
+ this.displayNibblerOverlay = config.displayNibblerOverlay();
+ this.showPrayerHelp = config.showPrayerHelp();
+ this.waveDisplay = config.waveDisplay();
+ this.getWaveOverlayHeaderColor = config.getWaveOverlayHeaderColor();
+ this.getWaveTextColor = config.getWaveTextColor();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java
index 0e87b0c13b..eb079846cf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java
@@ -28,16 +28,17 @@ package net.runelite.client.plugins.inferno;
import com.google.common.collect.ImmutableMap;
import java.awt.Color;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent;
class InfernoWaveMappings
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private static final ImmutableMap waveMapping;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private static final ImmutableMap npcNameMapping;
static
@@ -88,7 +89,7 @@ class InfernoWaveMappings
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(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});
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java
index 88e3e32766..03d86509c0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java
@@ -1,28 +1,31 @@
package net.runelite.client.plugins.inferno;
-import java.awt.Color;
import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import lombok.AccessLevel;
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.client.ui.overlay.Overlay;
+import net.runelite.client.ui.overlay.OverlayPosition;
+import net.runelite.client.ui.overlay.OverlayPriority;
+import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
public class InfernoWaveOverlay extends Overlay
- {
+{
private final InfernoPlugin plugin;
private final PanelComponent panelComponent;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private Color waveHeaderColor;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private Color waveTextColor;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private InfernoWaveDisplayMode displayMode;
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java
index 4311fd23e8..1578ee408b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.info;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.ClientToolbar;
@@ -37,6 +38,7 @@ import net.runelite.client.util.ImageUtil;
description = "Enable the Info panel",
loadWhenOutdated = true
)
+@Singleton
public class InfoPlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java
index f24df49e17..b3e88b6a60 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.info;
import java.awt.Desktop;
import java.io.IOException;
import java.net.URISyntaxException;
+import javax.inject.Singleton;
import javax.swing.BorderFactory;
import javax.swing.JEditorPane;
import javax.swing.event.HyperlinkEvent;
@@ -35,6 +36,7 @@ import javax.swing.text.html.HTMLEditorKit;
import lombok.extern.slf4j.Slf4j;
@Slf4j
+@Singleton
public class JRichTextPane extends JEditorPane
{
private HyperlinkListener linkHandler;
@@ -58,7 +60,7 @@ public class JRichTextPane extends JEditorPane
setText(text);
}
- public void enableAutoLinkHandler(boolean enable)
+ void enableAutoLinkHandler(boolean enable)
{
if (enable == (linkHandler == null))
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java
index 87d164b78f..2ef28d51b1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.api.Client;
@@ -56,7 +57,7 @@ class InstanceMapOverlay extends Overlay
* this value to be 4. Changing this will break the method for rendering
* complex tiles
*/
- static final int TILE_SIZE = 4;
+ private static final int TILE_SIZE = 4;
/**
* The size of the player's position marker on the map
@@ -85,9 +86,9 @@ class InstanceMapOverlay extends Overlay
private volatile boolean showMap = false;
private final BackgroundComponent backgroundComponent = new BackgroundComponent();
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private boolean isCloseButtonHovered;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Rectangle closeButtonBounds;
private BufferedImage closeButtonImage;
private BufferedImage closeButtonHoveredImage;
@@ -103,7 +104,7 @@ class InstanceMapOverlay extends Overlay
backgroundComponent.setFill(false);
}
- public boolean isMapShown()
+ boolean isMapShown()
{
return showMap;
}
@@ -114,7 +115,7 @@ class InstanceMapOverlay extends Overlay
*
* @param show Whether or not the map should be shown.
*/
- public synchronized void setShowMap(boolean show)
+ synchronized void setShowMap(boolean show)
{
showMap = show;
if (showMap)
@@ -128,7 +129,7 @@ class InstanceMapOverlay extends Overlay
/**
* Increases the viewed plane. The maximum viewedPlane is 3
*/
- public synchronized void onAscend()
+ synchronized void onAscend()
{
if (viewedPlane >= MAX_PLANE)
{
@@ -142,7 +143,7 @@ class InstanceMapOverlay extends Overlay
/**
* Decreases the viewed plane. The minimum viewedPlane is 0
*/
- public synchronized void onDescend()
+ synchronized void onDescend()
{
if (viewedPlane <= MIN_PLANE)
{
@@ -235,7 +236,7 @@ class InstanceMapOverlay extends Overlay
*
* @param event The game state change event
*/
- public void onGameStateChange(GameStateChanged event)
+ void onGameStateChange(GameStateChanged event)
{
mapImage = null;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java
index 38803e3c1b..d6f4cb3e17 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.instancemap;
import com.google.inject.Binder;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.WidgetMenuOptionClicked;
import net.runelite.api.widgets.WidgetInfo;
@@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
name = "Instance Map",
description = "Add an instanced map, accessible by right-clicking the map button"
)
+@Singleton
public class InstanceMapPlugin extends Plugin
{
private final WidgetMenuOption openMapOption = new WidgetMenuOption("Show", "Instance Map", WidgetInfo.WORLD_MAP_OPTION);
@@ -134,24 +136,24 @@ public class InstanceMapPlugin extends Plugin
}
}
- public void showMap()
+ private void showMap()
{
overlay.setShowMap(true);
openMapOption.setMenuOption("Hide");
}
- public void closeMap()
+ void closeMap()
{
overlay.setShowMap(false);
openMapOption.setMenuOption("Show");
}
- public void ascendMap()
+ void ascendMap()
{
overlay.onAscend();
}
- public void descendMap()
+ void descendMap()
{
overlay.onDescend();
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java
index c0e844939a..500661a8ff 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.interfacestyles;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import static net.runelite.api.SpriteID.*;
@@ -52,12 +53,12 @@ enum HealthbarOverride implements SpriteOverride
FRONT_140PX(HEALTHBAR_DEFAULT_FRONT_140PX, "front_90px.png"),
FRONT_160PX(HEALTHBAR_DEFAULT_FRONT_160PX, "front_90px.png");
- @Getter
+ @Getter(AccessLevel.PUBLIC)
private final int spriteId;
private final String fileName;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int padding = 1;
private static final Map MAP;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
index 6944a982d7..9758434681 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
@@ -29,6 +29,7 @@ package net.runelite.client.plugins.interfacestyles;
import com.google.inject.Provides;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
@@ -57,6 +58,7 @@ import net.runelite.client.util.ImageUtil;
tags = {"2005", "2010", "skin", "theme", "ui"},
enabledByDefault = false
)
+@Singleton
public class InterfaceStylesPlugin extends Plugin
{
@Inject
@@ -73,6 +75,11 @@ public class InterfaceStylesPlugin extends Plugin
private Sprite[] defaultCrossSprites;
+ private Skin skin;
+ private boolean hdHealthBars;
+ private boolean hdMenu;
+ private boolean rsCrossSprites;
+
@Provides
InterfaceStylesConfig provideConfig(ConfigManager configManager)
{
@@ -82,6 +89,7 @@ public class InterfaceStylesPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
clientThread.invoke(this::updateAllOverrides);
}
@@ -102,6 +110,7 @@ public class InterfaceStylesPlugin extends Plugin
{
if (config.getGroup().equals("interfaceStyles"))
{
+ updateConfig();
clientThread.invoke(this::updateAllOverrides);
}
}
@@ -115,7 +124,7 @@ public class InterfaceStylesPlugin extends Plugin
@Subscribe
public void onPostHealthBar(PostHealthBar postHealthBar)
{
- if (!config.hdHealthBars())
+ if (!this.hdHealthBars)
{
return;
}
@@ -161,7 +170,7 @@ public class InterfaceStylesPlugin extends Plugin
@Subscribe
public void onBeforeMenuRender(BeforeMenuRender event)
{
- if (config.hdMenu())
+ if (this.hdMenu)
{
client.draw2010Menu();
event.consume();
@@ -174,9 +183,9 @@ public class InterfaceStylesPlugin extends Plugin
{
for (Skin skin : spriteOverride.getSkin())
{
- if (skin == config.skin())
+ if (skin == this.skin)
{
- String file = config.skin().toString() + "/" + spriteOverride.getSpriteID() + ".png";
+ String file = this.skin.toString() + "/" + spriteOverride.getSpriteID() + ".png";
Sprite spritePixels = getFileSpritePixels(file);
if (spriteOverride.getSpriteID() == SpriteID.COMPASS_TEXTURE)
@@ -206,9 +215,9 @@ public class InterfaceStylesPlugin extends Plugin
{
for (WidgetOverride widgetOverride : WidgetOverride.values())
{
- if (widgetOverride.getSkin() == config.skin())
+ if (widgetOverride.getSkin() == this.skin)
{
- String file = config.skin().toString() + "/widget/" + widgetOverride.getName() + ".png";
+ String file = this.skin.toString() + "/widget/" + widgetOverride.getName() + ".png";
Sprite spritePixels = getFileSpritePixels(file);
if (spritePixels != null)
@@ -253,7 +262,7 @@ public class InterfaceStylesPlugin extends Plugin
{
for (WidgetOffset widgetOffset : WidgetOffset.values())
{
- if (widgetOffset.getSkin() != config.skin())
+ if (widgetOffset.getSkin() != this.skin)
{
continue;
}
@@ -287,7 +296,7 @@ public class InterfaceStylesPlugin extends Plugin
private void overrideHealthBars()
{
- if (config.hdHealthBars())
+ if (this.hdHealthBars)
{
spriteManager.addSpriteOverrides(HealthbarOverride.values());
// Reset health bar caches to apply the override
@@ -307,7 +316,7 @@ public class InterfaceStylesPlugin extends Plugin
private void overrideCrossSprites()
{
- if (config.rsCrossSprites())
+ if (this.rsCrossSprites)
{
// If we've already replaced them,
// we don't need to replace them again
@@ -387,4 +396,12 @@ public class InterfaceStylesPlugin extends Plugin
client.setCompass(compass);
}
}
+
+ private void updateConfig()
+ {
+ this.skin = config.skin();
+ this.hdHealthBars = config.hdHealthBars();
+ this.hdMenu = config.hdMenu();
+ this.rsCrossSprites = config.rsCrossSprites();
+ }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java
index c041ffedc2..3e9aad9be9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java
@@ -26,10 +26,11 @@
*/
package net.runelite.client.plugins.interfacestyles;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
-@Getter
+@Getter(AccessLevel.PACKAGE)
@AllArgsConstructor
public enum Skin
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java
index b5db7bb69c..f46a3bd50c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java
@@ -26,12 +26,13 @@
*/
package net.runelite.client.plugins.interfacestyles;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.SpriteID;
import static net.runelite.client.plugins.interfacestyles.Skin.AROUND_2005;
import static net.runelite.client.plugins.interfacestyles.Skin.AROUND_2010;
-@Getter
+@Getter(AccessLevel.PACKAGE)
enum SpriteOverride
{
TAB_COMBAT(SpriteID.TAB_COMBAT, AROUND_2005, AROUND_2010),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java
index 9edf17165e..920aa0a818 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java
@@ -26,10 +26,11 @@
*/
package net.runelite.client.plugins.interfacestyles;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.widgets.WidgetInfo;
-@Getter
+@Getter(AccessLevel.PACKAGE)
enum WidgetOffset
{
RESIZABLE_2010_COMBAT_HIGHLIGHT(Skin.AROUND_2010, WidgetInfo.RESIZABLE_VIEWPORT_COMBAT_TAB, -4, 1, null, null),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java
index 1998fb3808..0a83eb372d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java
@@ -26,10 +26,11 @@
*/
package net.runelite.client.plugins.interfacestyles;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.widgets.WidgetInfo;
-@Getter
+@Getter(AccessLevel.PACKAGE)
enum WidgetOverride
{
FIXED_CORNER_TOP_LEFT_2005(Skin.AROUND_2005, "1026", WidgetInfo.FIXED_VIEWPORT_COMBAT_TAB),
@@ -47,7 +48,7 @@ enum WidgetOverride
private String name;
private WidgetInfo[] widgetInfo;
- WidgetOverride(Skin skin, String name, WidgetInfo... widgetInfo)
+ WidgetOverride(final Skin skin, final String name, final WidgetInfo... widgetInfo)
{
this.skin = skin;
this.name = name;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java
index f9f66e10b8..4e86d634ff 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java
@@ -26,6 +26,7 @@
package net.runelite.client.plugins.inventorygrid;
import com.google.inject.Inject;
+import com.google.inject.Singleton;
import java.awt.AlphaComposite;
import java.awt.Dimension;
import java.awt.Graphics2D;
@@ -42,20 +43,21 @@ import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
+@Singleton
class InventoryGridOverlay extends Overlay
{
private static final int INVENTORY_SIZE = 28;
- private final InventoryGridConfig config;
+ private final InventoryGridPlugin plugin;
private final Client client;
private final ItemManager itemManager;
@Inject
- private InventoryGridOverlay(InventoryGridConfig config, Client client, ItemManager itemManager)
+ private InventoryGridOverlay(final InventoryGridPlugin plugin, final Client client, final ItemManager itemManager)
{
this.itemManager = itemManager;
this.client = client;
- this.config = config;
+ this.plugin = plugin;
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_WIDGETS);
@@ -68,7 +70,7 @@ class InventoryGridOverlay extends Overlay
final Widget inventoryWidget = client.getWidget(WidgetInfo.INVENTORY);
if (if1DraggingWidget == null || if1DraggingWidget != inventoryWidget
- || client.getItemPressedDuration() < config.dragDelay() / Constants.CLIENT_TICK_LENGTH)
+ || client.getItemPressedDuration() < plugin.getDragDelay() / Constants.CLIENT_TICK_LENGTH)
{
return null;
}
@@ -83,7 +85,7 @@ class InventoryGridOverlay extends Overlay
final Rectangle bounds = widgetItem.getCanvasBounds();
boolean inBounds = bounds.contains(mousePoint);
- if (config.showItem() && inBounds)
+ if (plugin.isShowItem() && inBounds)
{
final WidgetItem draggedItem = inventoryWidget.getWidgetItem(client.getIf1DraggedItemIndex());
final BufferedImage draggedItemImage = itemManager.getImage(draggedItem.getId());
@@ -95,14 +97,14 @@ class InventoryGridOverlay extends Overlay
graphics.setComposite(AlphaComposite.SrcOver);
}
- if (config.showHighlight() && inBounds)
+ if (plugin.isShowHighlight() && inBounds)
{
- graphics.setColor(config.highlightColor());
+ graphics.setColor(plugin.getHighlightColor());
graphics.fill(bounds);
}
- else if (config.showGrid())
+ else if (plugin.isShowGrid())
{
- graphics.setColor(config.gridColor());
+ graphics.setColor(plugin.getGridColor());
graphics.fill(bounds);
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java
index dc6b0ae372..0ab7d78067 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java
@@ -27,7 +27,13 @@ package net.runelite.client.plugins.inventorygrid;
import com.google.inject.Inject;
import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import java.awt.Color;
+import lombok.AccessLevel;
+import lombok.Getter;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.overlay.OverlayManager;
@@ -38,6 +44,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
tags = {"items", "overlay"},
enabledByDefault = false
)
+@Singleton
public class InventoryGridPlugin extends Plugin
{
@Inject
@@ -46,9 +53,26 @@ public class InventoryGridPlugin extends Plugin
@Inject
private OverlayManager overlayManager;
+ @Inject
+ private InventoryGridConfig config;
+
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showItem;
+ @Getter(AccessLevel.PACKAGE)
+ boolean showGrid;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showHighlight;
+ @Getter(AccessLevel.PACKAGE)
+ private int dragDelay;
+ @Getter(AccessLevel.PACKAGE)
+ private Color gridColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color highlightColor;
+
@Override
public void startUp()
{
+ updateConfig();
overlayManager.add(overlay);
}
@@ -63,4 +87,23 @@ public class InventoryGridPlugin extends Plugin
{
return configManager.getConfig(InventoryGridConfig.class);
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged config)
+ {
+ if (config.getGroup().equals("inventorygrid"))
+ {
+ updateConfig();
+ }
+ }
+
+ private void updateConfig()
+ {
+ this.showItem = config.showItem();
+ this.showGrid = config.showGrid();
+ this.showHighlight = config.showHighlight();
+ this.dragDelay = config.dragDelay();
+ this.gridColor = config.gridColor();
+ this.highlightColor = config.highlightColor();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java
index 1b0be390fb..95d4276a52 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java
@@ -42,21 +42,19 @@ public class InventorySetupBankOverlay extends WidgetItemOverlay
{
private final ItemManager itemManager;
private final InventorySetupPlugin plugin;
- private final InventorySetupConfig config;
@Inject
- public InventorySetupBankOverlay(ItemManager itemManager, InventorySetupPlugin plugin, InventorySetupConfig config)
+ public InventorySetupBankOverlay(ItemManager itemManager, InventorySetupPlugin plugin)
{
this.itemManager = itemManager;
this.plugin = plugin;
- this.config = config;
showOnBank();
}
@Override
public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget)
{
- if (config.getBankHighlight())
+ if (plugin.isGetBankHighlight())
{
int[] ids = plugin.getCurrentInventorySetupIds();
if (ids == null)
@@ -70,7 +68,7 @@ public class InventorySetupBankOverlay extends WidgetItemOverlay
}
- final Color color = config.getBankHighlightColor();
+ final Color color = plugin.getGetBankHighlightColor();
if (color != null)
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java
index fa35f2718e..a9c0b01929 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.inventorysetups;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Provides;
+import java.awt.Color;
import java.awt.image.BufferedImage;
import java.lang.reflect.Type;
import java.util.ArrayList;
@@ -35,8 +36,11 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
+import lombok.AccessLevel;
+import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
@@ -70,6 +74,7 @@ import net.runelite.client.util.ImageUtil;
)
@Slf4j
+@Singleton
public class InventorySetupPlugin extends Plugin
{
private static final String CONFIG_GROUP = "inventorysetups";
@@ -109,9 +114,23 @@ public class InventorySetupPlugin extends Plugin
private boolean highlightDifference;
+ private boolean getHighlightDifferences;
+ @Getter(AccessLevel.PUBLIC)
+ private Color getHighlightColor;
+ @Getter(AccessLevel.PUBLIC)
+ private boolean getStackDifference;
+ @Getter(AccessLevel.PUBLIC)
+ private boolean getVariationDifference;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean getBankHighlight;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getBankHighlightColor;
+
@Override
public void startUp()
{
+ updateConfigOptions();
+
overlayManager.add(overlay);
panel = new InventorySetupPluginPanel(this, itemManager);
@@ -242,8 +261,9 @@ public class InventorySetupPlugin extends Plugin
{
if (event.getGroup().equals(CONFIG_GROUP))
{
+ updateConfigOptions();
// only allow highlighting if the config is enabled and the player is logged in
- highlightDifference = config.getHighlightDifferences() && client.getGameState() == GameState.LOGGED_IN;
+ highlightDifference = this.getHighlightDifferences && client.getGameState() == GameState.LOGGED_IN;
final String setupName = panel.getSelectedInventorySetup();
if (highlightDifference && !setupName.isEmpty())
{
@@ -338,7 +358,7 @@ public class InventorySetupPlugin extends Plugin
// set highlighting
case LOGGED_IN:
- highlightDifference = config.getHighlightDifferences();
+ highlightDifference = this.getHighlightDifferences;
break;
default:
@@ -433,4 +453,14 @@ public class InventorySetupPlugin extends Plugin
.filter(id -> id != -1)
.toArray();
}
+
+ private void updateConfigOptions()
+ {
+ this.getHighlightDifferences = config.getHighlightDifferences();
+ this.getHighlightColor = config.getHighlightColor();
+ this.getStackDifference = config.getHighlightDifferences();
+ this.getVariationDifference = config.getVariationDifference();
+ this.getBankHighlight = config.getBankHighlight();
+ this.getBankHighlightColor = config.getBankHighlightColor();
+ }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java
index 0d5cb02f4d..6e0b8b99ba 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java
@@ -28,16 +28,17 @@ package net.runelite.client.plugins.inventorysetups.ui;
import java.awt.BorderLayout;
import java.awt.Color;
import java.util.ArrayList;
+import javax.inject.Singleton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import net.runelite.client.game.AsyncBufferedImage;
import net.runelite.client.game.ItemManager;
import net.runelite.client.game.ItemVariationMapping;
-import net.runelite.client.plugins.inventorysetups.InventorySetupConfig;
import net.runelite.client.plugins.inventorysetups.InventorySetupItem;
import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin;
import net.runelite.client.ui.ColorScheme;
+@Singleton
public abstract class InventorySetupContainerPanel extends JPanel
{
protected ItemManager itemManager;
@@ -99,10 +100,9 @@ public abstract class InventorySetupContainerPanel extends JPanel
// important note: do not use item names for comparisons
// they are all empty to avoid clientThread usage when highlighting
- final InventorySetupConfig config = plugin.getConfig();
- final Color highlightColor = config.getHighlightColor();
+ final Color highlightColor = plugin.getGetHighlightColor();
- if (config.getStackDifference() && currItem.getQuantity() != savedItem.getQuantity())
+ if (plugin.isGetStackDifference() && currItem.getQuantity() != savedItem.getQuantity())
{
containerSlot.setBackground(highlightColor);
return;
@@ -111,7 +111,7 @@ public abstract class InventorySetupContainerPanel extends JPanel
int currId = currItem.getId();
int checkId = savedItem.getId();
- if (!config.getVariationDifference())
+ if (!plugin.isGetVariationDifference())
{
currId = ItemVariationMapping.map(currId);
checkId = ItemVariationMapping.map(checkId);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java
index b964a205eb..2ca6687660 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.inventorysetups.ui;
import java.awt.GridLayout;
import java.util.ArrayList;
import java.util.HashMap;
+import javax.inject.Singleton;
import javax.swing.JPanel;
import net.runelite.api.EquipmentInventorySlot;
import net.runelite.client.game.ItemManager;
@@ -36,6 +37,7 @@ import net.runelite.client.plugins.inventorysetups.InventorySetupItem;
import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin;
import net.runelite.client.ui.ColorScheme;
+@Singleton
public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel
{
private HashMap equipmentSlots;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java
index 689773b517..3310b2f25c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java
@@ -27,13 +27,14 @@ package net.runelite.client.plugins.inventorysetups.ui;
import java.awt.GridLayout;
import java.util.ArrayList;
+import javax.inject.Singleton;
import javax.swing.JPanel;
import net.runelite.client.game.ItemManager;
import net.runelite.client.plugins.inventorysetups.InventorySetup;
import net.runelite.client.plugins.inventorysetups.InventorySetupItem;
import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin;
import net.runelite.client.ui.ColorScheme;
-
+@Singleton
public class InventorySetupInventoryPanel extends InventorySetupContainerPanel
{
private static final int ITEMS_PER_ROW = 4;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java
index 73f0033819..339ba435a3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java
@@ -34,6 +34,7 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
+import javax.inject.Singleton;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.ImageIcon;
@@ -51,6 +52,7 @@ import net.runelite.client.ui.PluginPanel;
import net.runelite.client.ui.components.PluginErrorPanel;
import net.runelite.client.util.ImageUtil;
+@Singleton
public class InventorySetupPluginPanel extends PluginPanel
{
private static ImageIcon ADD_ICON;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java
index 0af6a142cb..bf05e88178 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java
@@ -27,16 +27,18 @@ package net.runelite.client.plugins.inventorysetups.ui;
import java.awt.Color;
import java.awt.Dimension;
+import javax.inject.Singleton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import net.runelite.client.game.AsyncBufferedImage;
-public class InventorySetupSlot extends JPanel
+@Singleton
+class InventorySetupSlot extends JPanel
{
private final JLabel imageLabel;
- public InventorySetupSlot(Color color)
+ InventorySetupSlot(Color color)
{
imageLabel = new JLabel();
imageLabel.setVerticalAlignment(SwingConstants.CENTER);
@@ -46,7 +48,7 @@ public class InventorySetupSlot extends JPanel
}
- public void setImageLabel(String toolTip, AsyncBufferedImage itemImage)
+ void setImageLabel(String toolTip, AsyncBufferedImage itemImage)
{
if (itemImage == null || toolTip == null)
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java
index de7d786eb6..85560e0133 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java
@@ -29,17 +29,19 @@ import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.game.ItemManager;
import net.runelite.client.ui.overlay.WidgetItemOverlay;
+@Singleton
public class InventoryTagsOverlay extends WidgetItemOverlay
{
private final ItemManager itemManager;
private final InventoryTagsPlugin plugin;
@Inject
- private InventoryTagsOverlay(ItemManager itemManager, InventoryTagsPlugin plugin)
+ private InventoryTagsOverlay(final ItemManager itemManager, final InventoryTagsPlugin plugin)
{
this.itemManager = itemManager;
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java
index 23e518e1f5..4438f22e34 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java
@@ -30,9 +30,11 @@ import com.google.inject.Provides;
import java.awt.Color;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.MenuAction;
import net.runelite.api.MenuEntry;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.MenuOpened;
import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.events.WidgetMenuOptionClicked;
@@ -53,6 +55,7 @@ import net.runelite.client.util.Text;
tags = {"highlight", "items", "overlay", "tagging"},
enabledByDefault = false
)
+@Singleton
public class InventoryTagsPlugin extends Plugin
{
private static final String ITEM_KEY_PREFIX = "item_";
@@ -103,6 +106,11 @@ public class InventoryTagsPlugin extends Plugin
private boolean editorMode;
+ private Color group1Color;
+ private Color group2Color;
+ private Color group3Color;
+ private Color group4Color;
+
@Provides
InventoryTagsConfig provideConfig(ConfigManager configManager)
{
@@ -133,6 +141,7 @@ public class InventoryTagsPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
refreshInventoryMenuOptions();
overlayManager.add(overlay);
}
@@ -227,13 +236,13 @@ public class InventoryTagsPlugin extends Plugin
switch (name)
{
case SETNAME_GROUP_1:
- return config.getGroup1Color();
+ return this.group1Color;
case SETNAME_GROUP_2:
- return config.getGroup2Color();
+ return this.group2Color;
case SETNAME_GROUP_3:
- return config.getGroup3Color();
+ return this.group3Color;
case SETNAME_GROUP_4:
- return config.getGroup4Color();
+ return this.group4Color;
}
return null;
@@ -265,4 +274,21 @@ public class InventoryTagsPlugin extends Plugin
menuManager.addManagedCustomMenu(RESIZABLE_BOTTOM_LINE_INVENTORY_TAB_CONFIGURE);
}
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (event.getGroup().equals("inventorytags"))
+ {
+ updateConfig();
+ }
+ }
+
+ private void updateConfig()
+ {
+ this.group1Color = config.getGroup1Color();
+ this.group2Color = config.getGroup2Color();
+ this.group3Color = config.getGroup3Color();
+ this.group4Color = config.getGroup4Color();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java
index 18405155ee..c6707f8701 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java
@@ -24,10 +24,11 @@
*/
package net.runelite.client.plugins.inventoryviewer;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-@Getter
+@Getter(AccessLevel.PACKAGE)
@RequiredArgsConstructor
public enum InventoryViewerMode
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
index efe6df33a0..c4d82e5a90 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
@@ -33,6 +33,7 @@ import java.awt.Point;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Constants;
import net.runelite.api.InventoryID;
@@ -50,6 +51,7 @@ import net.runelite.client.ui.overlay.components.ImageComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent;
+@Singleton
class InventoryViewerOverlay extends Overlay
{
private static final int INVENTORY_SIZE = 28;
@@ -58,14 +60,14 @@ class InventoryViewerOverlay extends Overlay
private final Client client;
private final ItemManager itemManager;
- private final InventoryViewerConfig config;
+ private final InventoryViewerPlugin plugin;
private final PanelComponent wrapperComponent = new PanelComponent();
private final PanelComponent inventoryComponent = new PanelComponent();
private final TitleComponent freeSlotsComponent = TitleComponent.builder().build();
@Inject
- private InventoryViewerOverlay(Client client, ItemManager itemManager, InventoryViewerConfig config)
+ private InventoryViewerOverlay(final Client client, final ItemManager itemManager, final InventoryViewerPlugin plugin)
{
setPosition(OverlayPosition.BOTTOM_RIGHT);
@@ -89,13 +91,13 @@ class InventoryViewerOverlay extends Overlay
this.itemManager = itemManager;
this.client = client;
- this.config = config;
+ this.plugin = plugin;
}
@Override
public Dimension render(Graphics2D graphics)
{
- if (config.hideWhenInvOpen()
+ if (plugin.isHideWhenInvOpen()
&& client.getVar(VarClientInt.PLAYER_INVENTORY_OPENED) == 3)
{
return null;
@@ -113,7 +115,7 @@ class InventoryViewerOverlay extends Overlay
final Item[] items = itemContainer.getItems();
- if (config.viewerMode() == InventoryViewerMode.GROUPED)
+ if (plugin.getViewerMode() == InventoryViewerMode.GROUPED)
{
Multiset totals = HashMultiset.create();
for (Item item : items)
@@ -140,7 +142,7 @@ class InventoryViewerOverlay extends Overlay
}
wrapperComponent.getChildren().add(inventoryComponent);
- if (config.showFreeSlots())
+ if (plugin.isShowFreeSlots())
{
freeSlotsComponent.setText(remaining + " free");
wrapperComponent.setPreferredSize(new Dimension(Math.min(totals.elementSet().size(), 4) * (PLACEHOLDER_WIDTH + 6) + ComponentConstants.STANDARD_BORDER * 2, 0));
@@ -175,7 +177,7 @@ class InventoryViewerOverlay extends Overlay
wrapperComponent.getChildren().add(inventoryComponent);
- if (config.showFreeSlots())
+ if (plugin.isShowFreeSlots())
{
freeSlotsComponent.setText(remaining + " free");
wrapperComponent.setPreferredSize(new Dimension(4 * (PLACEHOLDER_WIDTH + 6) + ComponentConstants.STANDARD_BORDER * 2, 0));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java
index 71032a10c7..114809287e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java
@@ -26,7 +26,12 @@ package net.runelite.client.plugins.inventoryviewer;
import com.google.inject.Provides;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.overlay.OverlayManager;
@@ -37,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
tags = {"alternate", "items", "overlay", "second"},
enabledByDefault = false
)
+@Singleton
public class InventoryViewerPlugin extends Plugin
{
static final String CONFIG_GROUP_KEY = "inventoryviewer";
@@ -47,6 +53,16 @@ public class InventoryViewerPlugin extends Plugin
@Inject
private OverlayManager overlayManager;
+ @Inject
+ private InventoryViewerConfig config;
+
+ @Getter(AccessLevel.PACKAGE)
+ private InventoryViewerMode viewerMode;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showFreeSlots;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean hideWhenInvOpen;
+
@Provides
InventoryViewerConfig provideConfig(ConfigManager configManager)
{
@@ -56,12 +72,29 @@ public class InventoryViewerPlugin extends Plugin
@Override
public void startUp()
{
+ updateConfig();
overlayManager.add(overlay);
}
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (event.getGroup().equals(CONFIG_GROUP_KEY))
+ {
+ updateConfig();
+ }
+ }
+
@Override
public void shutDown()
{
overlayManager.remove(overlay);
}
+
+ private void updateConfig()
+ {
+ this.viewerMode = config.viewerMode();
+ this.showFreeSlots = config.showFreeSlots();
+ this.hideWhenInvOpen = config.hideWhenInvOpen();
+ }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
index 18b9d6386b..a866064623 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
@@ -284,8 +284,8 @@ public interface ItemChargeConfig extends Config
{
return false;
}
-
-
+
+
@ConfigItem(
keyName = "showSlayerBracelets",
name = "Show Slayer Bracelets Charges",
@@ -298,12 +298,11 @@ public interface ItemChargeConfig extends Config
}
-
@ConfigItem(
- keyName = "expeditious",
- name = "",
- description = "",
- hidden = true
+ keyName = "expeditious",
+ name = "",
+ description = "",
+ hidden = true
)
default int expeditious()
{
@@ -311,9 +310,9 @@ public interface ItemChargeConfig extends Config
}
@ConfigItem(
- keyName = "expeditious",
- name = "",
- description = ""
+ keyName = "expeditious",
+ name = "",
+ description = ""
)
void expeditious(int expeditious);
@@ -337,10 +336,10 @@ public interface ItemChargeConfig extends Config
@ConfigItem(
- keyName = "xericTalisman",
- name = "",
- description = "",
- hidden = true
+ keyName = "xericTalisman",
+ name = "",
+ description = "",
+ hidden = true
)
default int xericTalisman()
{
@@ -348,17 +347,17 @@ public interface ItemChargeConfig extends Config
}
@ConfigItem(
- keyName = "xericTalisman",
- name = "",
- description = ""
+ keyName = "xericTalisman",
+ name = "",
+ description = ""
)
void xericTalisman(int xericTalisman);
@ConfigItem(
- keyName = "showSoulBearerCharges",
- name = "Show Soul Bearer Charges",
- description = "Configures if Soul Bearer item charge is shown",
- position = 19
+ keyName = "showSoulBearerCharges",
+ name = "Show Soul Bearer Charges",
+ description = "Configures if Soul Bearer item charge is shown",
+ position = 19
)
default boolean showSoulBearerCharges()
{
@@ -366,10 +365,10 @@ public interface ItemChargeConfig extends Config
}
@ConfigItem(
- keyName = "soulBearer",
- name = "",
- description = "",
- hidden = true
+ keyName = "soulBearer",
+ name = "",
+ description = "",
+ hidden = true
)
default int soulBearer()
{
@@ -377,17 +376,17 @@ public interface ItemChargeConfig extends Config
}
@ConfigItem(
- keyName = "soulBearer",
- name = "",
- description = ""
+ keyName = "soulBearer",
+ name = "",
+ description = ""
)
void soulBearer(int soulBearer);
@ConfigItem(
- keyName = "showChronicleCharges",
- name = "Show Chronicle Charges",
- description = "Configures if Chronicle item charge is shown",
- position = 20
+ keyName = "showChronicleCharges",
+ name = "Show Chronicle Charges",
+ description = "Configures if Chronicle item charge is shown",
+ position = 20
)
default boolean showChronicleCharges()
{
@@ -395,23 +394,21 @@ public interface ItemChargeConfig extends Config
}
@ConfigItem(
- keyName = "showXericTalismanCharges",
- name = "Show Xeric's Talisman Charges",
- description = "Configures if Xeric's Talisman item charge is shown",
- position = 21
+ keyName = "showXericTalismanCharges",
+ name = "Show Xeric's Talisman Charges",
+ description = "Configures if Xeric's Talisman item charge is shown",
+ position = 21
)
default boolean showXericTalismanCharges()
{
return false;
}
-
-
@ConfigItem(
- keyName = "showrecoil",
- name = "Show If Recoil is activated",
- description = "Configures if Recoil is activated",
- position = 22
+ keyName = "showrecoil",
+ name = "Show If Recoil is activated",
+ description = "Configures if Recoil is activated",
+ position = 22
)
default boolean showrecoil()
{
@@ -419,10 +416,10 @@ public interface ItemChargeConfig extends Config
}
@ConfigItem(
- keyName = "chronicle",
- name = "",
- description = "",
- hidden = true
+ keyName = "chronicle",
+ name = "",
+ description = "",
+ hidden = true
)
default int chronicle()
{
@@ -430,9 +427,9 @@ public interface ItemChargeConfig extends Config
}
@ConfigItem(
- keyName = "chronicle",
- name = "",
- description = ""
+ keyName = "chronicle",
+ name = "",
+ description = ""
)
void chronicle(int chronicle);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java
index 7ee70d44b5..82bd2e411a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java
@@ -26,11 +26,12 @@ package net.runelite.client.plugins.itemcharges;
import java.awt.Color;
import java.awt.image.BufferedImage;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.EquipmentInventorySlot;
import net.runelite.client.ui.overlay.infobox.Counter;
-@Getter
+@Getter(AccessLevel.PACKAGE)
class ItemChargeInfobox extends Counter
{
private final ItemChargePlugin plugin;
@@ -38,12 +39,12 @@ class ItemChargeInfobox extends Counter
private final EquipmentInventorySlot slot;
ItemChargeInfobox(
- ItemChargePlugin plugin,
- BufferedImage image,
- String name,
- int charges,
- ItemWithSlot item,
- EquipmentInventorySlot slot)
+ final ItemChargePlugin plugin,
+ final BufferedImage image,
+ final String name,
+ final int charges,
+ final ItemWithSlot item,
+ final EquipmentInventorySlot slot)
{
super(image, plugin, charges);
setTooltip(name);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
index 31db7daad1..6253985981 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.ItemID;
import net.runelite.api.widgets.WidgetItem;
import static net.runelite.client.plugins.itemcharges.ItemChargeType.ABYSSAL_BRACELET;
@@ -42,16 +43,15 @@ import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.WidgetItemOverlay;
import net.runelite.client.ui.overlay.components.TextComponent;
+@Singleton
class ItemChargeOverlay extends WidgetItemOverlay
{
- private final ItemChargePlugin itemChargePlugin;
- private final ItemChargeConfig config;
+ private final ItemChargePlugin plugin;
@Inject
- ItemChargeOverlay(ItemChargePlugin itemChargePlugin, ItemChargeConfig config)
+ ItemChargeOverlay(final ItemChargePlugin itemChargePlugin)
{
- this.itemChargePlugin = itemChargePlugin;
- this.config = config;
+ this.plugin = itemChargePlugin;
showOnInventory();
showOnEquipment();
}
@@ -69,72 +69,72 @@ class ItemChargeOverlay extends WidgetItemOverlay
int charges;
if (itemId == ItemID.DODGY_NECKLACE)
{
- if (!config.showDodgyCount())
+ if (!plugin.isShowDodgyCount())
{
return;
}
- charges = config.dodgyNecklace();
+ charges = plugin.getDodgyNecklace();
}
else if (itemId == ItemID.BRACELET_OF_SLAUGHTER)
{
- if (!config.showSlayerBracelets())
+ if (!plugin.isShowSlayerBracelets())
{
return;
}
- charges = config.slaughter();
+ charges = plugin.getSlaughter();
}
else if (itemId == ItemID.EXPEDITIOUS_BRACELET)
{
- if (!config.showSlayerBracelets())
+ if (!plugin.isShowSlayerBracelets())
{
return;
}
- charges = config.expeditious();
+ charges = plugin.getExpeditious();
}
else if (itemId == ItemID.BINDING_NECKLACE)
{
- if (!config.showBindingNecklaceCharges())
+ if (!plugin.isShowBindingNecklaceCharges())
{
return;
}
- charges = config.bindingNecklace();
+ charges = plugin.getBindingNecklace();
}
else if (itemId == ItemID.XERICS_TALISMAN)
{
- if (!config.showXericTalismanCharges())
+ if (!plugin.isShowXericTalismanCharges())
{
return;
}
- charges = config.xericTalisman();
+ charges = plugin.getXericTalisman();
}
else if (itemId == ItemID.SOUL_BEARER)
{
- if (!config.showSoulBearerCharges())
+ if (!plugin.isShowSoulBearerCharges())
{
return;
}
- charges = config.soulBearer();
+ charges = plugin.getSoulBearer();
}
else if (itemId == ItemID.CHRONICLE)
{
- if (!config.showChronicleCharges())
+ if (!plugin.isShowChronicleCharges())
{
return;
}
- charges = config.chronicle();
+ charges = plugin.getChronicle();
}
else if (itemId >= ItemID.EXPLORERS_RING_1 && itemId <= ItemID.EXPLORERS_RING_4)
{
- if (!config.showExplorerRingCharges())
+ if (!plugin.isShowExplorerRingCharges())
{
return;
}
- charges = config.explorerRing();
+ charges = plugin.getExplorerRing();
}
else
@@ -146,13 +146,13 @@ class ItemChargeOverlay extends WidgetItemOverlay
}
ItemChargeType type = chargeItem.getType();
- if ((type == TELEPORT && !config.showTeleportCharges())
- || (type == FUNGICIDE_SPRAY && !config.showFungicideCharges())
- || (type == IMPBOX && !config.showImpCharges())
- || (type == WATERCAN && !config.showWateringCanCharges())
- || (type == WATERSKIN && !config.showWaterskinCharges())
- || (type == BELLOWS && !config.showBellowCharges())
- || (type == ABYSSAL_BRACELET && !config.showAbyssalBraceletCharges()))
+ if ((type == TELEPORT && !plugin.isShowTeleportCharges())
+ || (type == FUNGICIDE_SPRAY && !plugin.isShowFungicideCharges())
+ || (type == IMPBOX && !plugin.isShowImpCharges())
+ || (type == WATERCAN && !plugin.isShowWateringCanCharges())
+ || (type == WATERSKIN && !plugin.isShowWaterskinCharges())
+ || (type == BELLOWS && !plugin.isShowBellowCharges())
+ || (type == ABYSSAL_BRACELET && !plugin.isShowAbyssalBraceletCharges()))
{
return;
}
@@ -164,14 +164,14 @@ class ItemChargeOverlay extends WidgetItemOverlay
final TextComponent textComponent = new TextComponent();
textComponent.setPosition(new Point(bounds.x, bounds.y + 1 + graphics.getFontMetrics().getMaxAscent() - graphics.getFontMetrics().getMaxDescent()));
textComponent.setText(charges < 0 ? "?" : String.valueOf(charges));
- textComponent.setColor(itemChargePlugin.getColor(charges));
+ textComponent.setColor(plugin.getColor(charges));
textComponent.render(graphics);
}
private boolean displayOverlay()
{
- return config.showTeleportCharges() || config.showDodgyCount() || config.showFungicideCharges()
- || config.showImpCharges() || config.showWateringCanCharges() || config.showWaterskinCharges()
- || config.showBellowCharges() || config.showAbyssalBraceletCharges() || config.showExplorerRingCharges();
+ return plugin.isShowTeleportCharges() || plugin.isShowDodgyCount() || plugin.isShowFungicideCharges()
+ || plugin.isShowImpCharges() || plugin.isShowWateringCanCharges() || plugin.isShowWaterskinCharges()
+ || plugin.isShowBellowCharges() || plugin.isShowAbyssalBraceletCharges() || plugin.isShowExplorerRingCharges();
}
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
index 5267d8c0f4..16f7184da9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
@@ -32,6 +32,7 @@ import java.awt.image.BufferedImage;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.ChatMessageType;
@@ -69,6 +70,7 @@ import static net.runelite.api.ItemID.RING_OF_RECOIL;
description = "Show number of item charges remaining",
tags = {"inventory", "notifications", "overlay"}
)
+@Singleton
public class ItemChargePlugin extends Plugin
{
private static final Pattern DODGY_CHECK_PATTERN = Pattern.compile(
@@ -126,8 +128,6 @@ public class ItemChargePlugin extends Plugin
private static final int MAX_BINDING_CHARGES = 16;
private static final int MAX_EXPLORER_RING_CHARGES = 30;
- private int lastExplorerRingCharge = -1;
-
@Getter(AccessLevel.PACKAGE)
private boolean ringOfRecoilAvailable = false;
@@ -164,6 +164,65 @@ public class ItemChargePlugin extends Plugin
// Limits destroy callback to once per tick
private int lastCheckTick;
+ private Color veryLowWarningColor;
+ private Color lowWarningolor;
+ private int veryLowWarning;
+ private int lowWarning;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showTeleportCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showDodgyCount;
+ private boolean dodgyNotification;
+ @Getter(AccessLevel.PACKAGE)
+ private int dodgyNecklace;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showImpCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showFungicideCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showWateringCanCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showWaterskinCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showBellowCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showBasketCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showSackCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showAbyssalBraceletCharges;
+ private boolean recoilNotification;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showBindingNecklaceCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private int bindingNecklace;
+ private boolean bindingNotification;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showExplorerRingCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private int explorerRing;
+ private boolean showInfoboxes;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showSlayerBracelets;
+ @Getter(AccessLevel.PACKAGE)
+ private int expeditious;
+ @Getter(AccessLevel.PACKAGE)
+ private int slaughter;
+ @Getter(AccessLevel.PACKAGE)
+ private int xericTalisman;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showSoulBearerCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private int soulBearer;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showChronicleCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showXericTalismanCharges;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showrecoil;
+ @Getter(AccessLevel.PACKAGE)
+ private int chronicle;
+
@Provides
ItemChargeConfig getConfig(ConfigManager configManager)
{
@@ -173,6 +232,8 @@ public class ItemChargePlugin extends Plugin
@Override
protected void startUp()
{
+ updateConfig();
+
overlayManager.add(overlay);
overlayManager.add(recoilOverlay);
recoilRingImage = itemManager.getImage(RING_OF_RECOIL);
@@ -195,39 +256,41 @@ public class ItemChargePlugin extends Plugin
return;
}
- if (!config.showInfoboxes())
+ updateConfig();
+
+ if (!this.showInfoboxes)
{
infoBoxManager.removeIf(ItemChargeInfobox.class::isInstance);
return;
}
- if (!config.showTeleportCharges())
+ if (!this.showTeleportCharges)
{
removeInfobox(ItemWithSlot.TELEPORT);
}
- if (!config.showAbyssalBraceletCharges())
+ if (!this.showAbyssalBraceletCharges)
{
removeInfobox(ItemWithSlot.ABYSSAL_BRACELET);
}
- if (!config.showDodgyCount())
+ if (!this.showDodgyCount)
{
removeInfobox(ItemWithSlot.DODGY_NECKLACE);
}
- if (!config.showSlayerBracelets())
+ if (!this.showSlayerBracelets)
{
removeInfobox(ItemWithSlot.BRACELET_OF_SLAUGHTER);
removeInfobox(ItemWithSlot.EXPEDITIOUS_BRACELET);
}
- if (!config.showBindingNecklaceCharges())
+ if (!this.showBindingNecklaceCharges)
{
removeInfobox(ItemWithSlot.BINDING_NECKLACE);
}
- if (!config.showExplorerRingCharges())
+ if (!this.showExplorerRingCharges)
{
removeInfobox(ItemWithSlot.EXPLORER_RING);
}
@@ -256,7 +319,7 @@ public class ItemChargePlugin extends Plugin
if (event.getType() == ChatMessageType.GAMEMESSAGE || event.getType() == ChatMessageType.SPAM)
{
- if (config.recoilNotification() && message.contains(RING_OF_RECOIL_BREAK_MESSAGE))
+ if (this.recoilNotification && message.contains(RING_OF_RECOIL_BREAK_MESSAGE))
{
notifier.notify("Your Ring of Recoil has shattered");
}
@@ -286,7 +349,7 @@ public class ItemChargePlugin extends Plugin
}
else if (dodgyBreakMatcher.find())
{
- if (config.dodgyNotification())
+ if (this.dodgyNotification)
{
notifier.notify("Your dodgy necklace has crumbled to dust.");
}
@@ -295,7 +358,7 @@ public class ItemChargePlugin extends Plugin
}
else if (message.contains(BINDING_BREAK_TEXT))
{
- if (config.bindingNotification())
+ if (this.bindingNotification)
{
notifier.notify(BINDING_BREAK_TEXT);
}
@@ -305,7 +368,7 @@ public class ItemChargePlugin extends Plugin
}
else if (bindingNecklaceUsedMatcher.find())
{
- updateBindingNecklaceCharges(config.bindingNecklace() - 1);
+ updateBindingNecklaceCharges(this.bindingNecklace - 1);
}
else if (bindingNecklaceCheckMatcher.find())
{
@@ -360,40 +423,40 @@ public class ItemChargePlugin extends Plugin
@Subscribe
public void onItemContainerChanged(ItemContainerChanged event)
{
- if (event.getItemContainer() != client.getItemContainer(InventoryID.EQUIPMENT) || !config.showInfoboxes())
+ if (event.getItemContainer() != client.getItemContainer(InventoryID.EQUIPMENT) || !this.showInfoboxes)
{
return;
}
final Item[] items = event.getItemContainer().getItems();
- if (config.showTeleportCharges())
+ if (this.showTeleportCharges)
{
updateJewelleryInfobox(ItemWithSlot.TELEPORT, items);
}
- if (config.showDodgyCount())
+ if (this.showDodgyCount)
{
updateJewelleryInfobox(ItemWithSlot.DODGY_NECKLACE, items);
}
- if (config.showAbyssalBraceletCharges())
+ if (this.showAbyssalBraceletCharges)
{
updateJewelleryInfobox(ItemWithSlot.ABYSSAL_BRACELET, items);
}
- if (config.showSlayerBracelets())
+ if (this.showSlayerBracelets)
{
updateJewelleryInfobox(ItemWithSlot.BRACELET_OF_SLAUGHTER, items);
updateJewelleryInfobox(ItemWithSlot.EXPEDITIOUS_BRACELET, items);
}
- if (config.showBindingNecklaceCharges())
+ if (this.showBindingNecklaceCharges)
{
updateJewelleryInfobox(ItemWithSlot.BINDING_NECKLACE, items);
}
- if (config.showExplorerRingCharges())
+ if (this.showExplorerRingCharges)
{
updateJewelleryInfobox(ItemWithSlot.EXPLORER_RING, items);
}
@@ -410,10 +473,12 @@ public class ItemChargePlugin extends Plugin
if (braceletText.contains("bracelet of slaughter"))
{
config.slaughter(MAX_SLAUGHTER_CHARGES);
+ this.slaughter = MAX_SLAUGHTER_CHARGES;
}
else if (braceletText.contains("expeditious bracelet"))
{
config.expeditious(MAX_EXPEDITIOUS_CHARGES);
+ this.expeditious = MAX_EXPEDITIOUS_CHARGES;
}
}
@@ -506,7 +571,7 @@ public class ItemChargePlugin extends Plugin
{
if (client.getLocalPlayer().getSpotAnimation() == GraphicID.XERIC_TELEPORT)
{
- final int xericCharges = Math.max(config.xericTalisman() - 1, 0);
+ final int xericCharges = Math.max(this.xericTalisman - 1, 0);
updateXericCharges(xericCharges);
}
}
@@ -531,6 +596,7 @@ public class ItemChargePlugin extends Plugin
private void onVarbitChanged(VarbitChanged event)
{
int explorerRingCharge = client.getVar(Varbits.EXPLORER_RING_ALCHS);
+ int lastExplorerRingCharge = -1;
if (lastExplorerRingCharge != explorerRingCharge)
{
updateExplorerRingCharges(explorerRingCharge);
@@ -540,8 +606,9 @@ public class ItemChargePlugin extends Plugin
private void updateDodgyNecklaceCharges(final int value)
{
config.dodgyNecklace(value);
+ this.dodgyNecklace = value;
- if (config.showInfoboxes() && config.showDodgyCount())
+ if (this.showInfoboxes && this.showDodgyCount)
{
final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT);
@@ -557,8 +624,9 @@ public class ItemChargePlugin extends Plugin
private void updateBraceletOfSlaughterCharges(final int value)
{
config.slaughter(value);
+ this.slaughter = value;
- if (config.showInfoboxes() && config.showSlayerBracelets())
+ if (this.showInfoboxes && this.showSlayerBracelets)
{
final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT);
@@ -574,8 +642,9 @@ public class ItemChargePlugin extends Plugin
private void updateExpeditiousCharges(final int value)
{
config.expeditious(value);
+ this.expeditious = value;
- if (config.showInfoboxes() && config.showSlayerBracelets())
+ if (this.showInfoboxes && this.showSlayerBracelets)
{
final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT);
@@ -591,8 +660,9 @@ public class ItemChargePlugin extends Plugin
private void updateBindingNecklaceCharges(final int value)
{
config.bindingNecklace(value);
+ this.bindingNecklace = value;
- if (config.showInfoboxes() && config.showBindingNecklaceCharges())
+ if (this.showInfoboxes && this.showBindingNecklaceCharges)
{
final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT);
@@ -608,24 +678,28 @@ public class ItemChargePlugin extends Plugin
private void updateXericCharges(int xericCharges)
{
config.xericTalisman(xericCharges);
+ this.xericTalisman = xericCharges;
}
private void updateSoulBearerCharges(int soulBearerCharges)
{
config.soulBearer(soulBearerCharges);
+ this.soulBearer = soulBearerCharges;
}
private void updateChronicleCharges(int chronicleCharges)
{
config.chronicle(chronicleCharges);
+ this.chronicle = chronicleCharges;
}
private void updateExplorerRingCharges(final int value)
{
// Note: Varbit counts upwards. We count down from the maximum charges.
config.explorerRing(MAX_EXPLORER_RING_CHARGES - value);
+ this.explorerRing = MAX_EXPLORER_RING_CHARGES - value;
- if (config.showInfoboxes() && config.showExplorerRingCharges())
+ if (this.showInfoboxes && this.showExplorerRingCharges)
{
final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT);
@@ -694,23 +768,23 @@ public class ItemChargePlugin extends Plugin
{
if (id == ItemID.DODGY_NECKLACE && type == ItemWithSlot.DODGY_NECKLACE)
{
- charges = config.dodgyNecklace();
+ charges = this.dodgyNecklace;
}
else if (id == ItemID.BRACELET_OF_SLAUGHTER && type == ItemWithSlot.BRACELET_OF_SLAUGHTER)
{
- charges = config.slaughter();
+ charges = this.slaughter;
}
else if (id == ItemID.EXPEDITIOUS_BRACELET && type == ItemWithSlot.EXPEDITIOUS_BRACELET)
{
- charges = config.expeditious();
+ charges = this.expeditious;
}
else if (id == ItemID.BINDING_NECKLACE && type == ItemWithSlot.BINDING_NECKLACE)
{
- charges = config.bindingNecklace();
+ charges = this.bindingNecklace;
}
else if ((id >= ItemID.EXPLORERS_RING_1 && id <= ItemID.EXPLORERS_RING_4) && type == ItemWithSlot.EXPLORER_RING)
{
- charges = config.explorerRing();
+ charges = this.explorerRing;
}
}
else if (itemWithCharge.getType() == type.getType())
@@ -751,14 +825,49 @@ public class ItemChargePlugin extends Plugin
Color getColor(int charges)
{
Color color = Color.WHITE;
- if (charges <= config.veryLowWarning())
+ if (charges <= this.veryLowWarning)
{
- color = config.veryLowWarningColor();
+ color = this.veryLowWarningColor;
}
- else if (charges <= config.lowWarning())
+ else if (charges <= this.lowWarning)
{
- color = config.lowWarningolor();
+ color = this.lowWarningolor;
}
return color;
}
+
+ private void updateConfig()
+ {
+ this.veryLowWarningColor = config.veryLowWarningColor();
+ this.lowWarningolor = config.lowWarningolor();
+ this.veryLowWarning = config.veryLowWarning();
+ this.lowWarning = config.lowWarning();
+ this.showTeleportCharges = config.showTeleportCharges();
+ this.showDodgyCount = config.showDodgyCount();
+ this.dodgyNotification = config.dodgyNotification();
+ this.dodgyNecklace = config.dodgyNecklace();
+ this.showImpCharges = config.showImpCharges();
+ this.showFungicideCharges = config.showFungicideCharges();
+ this.showWateringCanCharges = config.showWateringCanCharges();
+ this.showWaterskinCharges = config.showWaterskinCharges();
+ this.showBellowCharges = config.showBellowCharges();
+ this.showAbyssalBraceletCharges = config.showAbyssalBraceletCharges();
+ this.recoilNotification = config.recoilNotification();
+ this.showBindingNecklaceCharges = config.showBindingNecklaceCharges();
+ this.bindingNecklace = config.bindingNecklace();
+ this.bindingNotification = config.bindingNotification();
+ this.showExplorerRingCharges = config.showExplorerRingCharges();
+ this.explorerRing = config.explorerRing();
+ this.showInfoboxes = config.showInfoboxes();
+ this.showSlayerBracelets = config.showSlayerBracelets();
+ this.expeditious = config.expeditious();
+ this.slaughter = config.slaughter();
+ this.xericTalisman = config.xericTalisman();
+ this.showSoulBearerCharges = config.showSoulBearerCharges();
+ this.soulBearer = config.soulBearer();
+ this.showChronicleCharges = config.showChronicleCharges();
+ this.showXericTalismanCharges = config.showXericTalismanCharges();
+ this.showrecoil = config.showrecoil();
+ this.chronicle = config.chronicle();
+ }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java
index af55d54fe7..57e00c2f64 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java
@@ -30,7 +30,7 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.ImageComponent;
@@ -38,20 +38,19 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
+@Singleton
class ItemRecoilOverlay extends Overlay
{
private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150);
private static final Color ACTIVATED_BACKGROUND_COLOR = new Color(0, 150, 0, 150);
private final ItemChargePlugin plugin;
- private final ItemChargeConfig config;
private final PanelComponent imagePanelComponent = new PanelComponent();
@Inject
- public ItemRecoilOverlay(Client client, ItemChargePlugin plugin, ItemChargeConfig config)
+ public ItemRecoilOverlay(final ItemChargePlugin plugin)
{
setPosition(OverlayPosition.TOP_LEFT);
this.plugin = plugin;
- this.config = config;
}
@Override
@@ -61,7 +60,7 @@ class ItemRecoilOverlay extends Overlay
tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
this.imagePanelComponent.getChildren().clear();
- if (config.showrecoil())
+ if (plugin.isShowrecoil())
{
if (plugin.isRingOfRecoilAvailable())
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java
index 2f2fe76469..6df317f5c6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.itemcharges;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
import javax.annotation.Nullable;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import static net.runelite.api.ItemID.ABYSSAL_BRACELET1;
@@ -165,7 +166,7 @@ import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERCAN;
import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERSKIN;
@AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
enum ItemWithCharge
{
ABRACE1(ABYSSAL_BRACELET, ABYSSAL_BRACELET1, 1),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java
index 4e7aec6b52..01d37630ae 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java
@@ -27,10 +27,11 @@ package net.runelite.client.plugins.itemcharges;
import com.google.common.collect.Sets;
import java.util.Set;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.EquipmentInventorySlot;
-@Getter
+@Getter(AccessLevel.PACKAGE)
enum ItemWithSlot
{
ABYSSAL_BRACELET(ItemChargeType.ABYSSAL_BRACELET, EquipmentInventorySlot.GLOVES),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java
index 588a51173d..416073704f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.itemidentification;
import com.google.inject.Inject;
+import com.google.inject.Singleton;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
@@ -38,14 +39,15 @@ import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.WidgetItemOverlay;
import net.runelite.client.ui.overlay.components.TextComponent;
+@Singleton
class ItemIdentificationOverlay extends WidgetItemOverlay
{
- private final ItemIdentificationConfig config;
+ private final ItemIdentificationPlugin plugin;
@Inject
- ItemIdentificationOverlay(ItemIdentificationConfig config)
+ ItemIdentificationOverlay(final ItemIdentificationPlugin plugin)
{
- this.config = config;
+ this.plugin = plugin;
showOnInventory();
showOnBank();
showOnInterfaces(KEPT_ON_DEATH_GROUP_ID, GUIDE_PRICE_GROUP_ID, LOOTING_BAG_GROUP_ID, SEED_BOX_GROUP_ID, KINGDOM_GROUP_ID);
@@ -63,19 +65,19 @@ class ItemIdentificationOverlay extends WidgetItemOverlay
switch (iden.type)
{
case SEED:
- if (!config.showSeeds())
+ if (!plugin.isShowSeeds())
{
return;
}
break;
case HERB:
- if (!config.showHerbs())
+ if (!plugin.isShowHerbs())
{
return;
}
break;
case SAPLING:
- if (!config.showSaplings())
+ if (!plugin.isShowSaplings())
{
return;
}
@@ -91,8 +93,8 @@ class ItemIdentificationOverlay extends WidgetItemOverlay
{
final TextComponent textComponent = new TextComponent();
textComponent.setPosition(new Point(bounds.x - 1, bounds.y + bounds.height - 1));
- textComponent.setColor(config.textColor());
- switch (config.identificationType())
+ textComponent.setColor(plugin.getTextColor());
+ switch (plugin.getIdentificationType())
{
case SHORT:
textComponent.setText(iden.shortName);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java
index 6e4f331765..1a8e9fa293 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java
@@ -25,8 +25,14 @@
package net.runelite.client.plugins.itemidentification;
import com.google.inject.Provides;
+import java.awt.Color;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.overlay.OverlayManager;
@@ -36,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
description = "Show identifying text over items with difficult to distinguish sprites",
enabledByDefault = false
)
+@Singleton
public class ItemIdentificationPlugin extends Plugin
{
@Inject
@@ -44,6 +51,20 @@ public class ItemIdentificationPlugin extends Plugin
@Inject
private ItemIdentificationOverlay overlay;
+ @Inject
+ private ItemIdentificationConfig config;
+
+ @Getter(AccessLevel.PACKAGE)
+ private ItemIdentificationMode identificationType;
+ @Getter(AccessLevel.PACKAGE)
+ private Color textColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showSeeds;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showHerbs;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showSaplings;
+
@Provides
ItemIdentificationConfig getConfig(ConfigManager configManager)
{
@@ -53,6 +74,7 @@ public class ItemIdentificationPlugin extends Plugin
@Override
protected void startUp()
{
+ updateConfig();
overlayManager.add(overlay);
}
@@ -61,4 +83,24 @@ public class ItemIdentificationPlugin extends Plugin
{
overlayManager.remove(overlay);
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("itemidentification"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ private void updateConfig()
+ {
+ this.identificationType = config.identificationType();
+ this.textColor = config.textColor();
+ this.showSeeds = config.showSeeds();
+ this.showHerbs = config.showHerbs();
+ this.showSaplings = config.showSaplings();
+ }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
index c252bc054c..cd28fbfda6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Constants;
import net.runelite.api.InventoryID;
@@ -47,6 +48,7 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager;
import net.runelite.client.util.ColorUtil;
import net.runelite.client.util.StackFormatter;
+@Singleton
class ItemPricesOverlay extends Overlay
{
private static final int INVENTORY_ITEM_WIDGETID = WidgetInfo.INVENTORY.getPackedId();
@@ -54,7 +56,7 @@ class ItemPricesOverlay extends Overlay
private static final int BANK_ITEM_WIDGETID = WidgetInfo.BANK_ITEM_CONTAINER.getPackedId();
private final Client client;
- private final ItemPricesConfig config;
+ private final ItemPricesPlugin plugin;
private final TooltipManager tooltipManager;
private final StringBuilder itemStringBuilder = new StringBuilder();
@@ -62,11 +64,11 @@ class ItemPricesOverlay extends Overlay
ItemManager itemManager;
@Inject
- ItemPricesOverlay(Client client, ItemPricesConfig config, TooltipManager tooltipManager)
+ ItemPricesOverlay(final Client client, final ItemPricesPlugin plugin, final TooltipManager tooltipManager)
{
setPosition(OverlayPosition.DYNAMIC);
this.client = client;
- this.config = config;
+ this.plugin = plugin;
this.tooltipManager = tooltipManager;
}
@@ -95,7 +97,7 @@ class ItemPricesOverlay extends Overlay
switch (action)
{
case ITEM_USE_ON_WIDGET:
- if (!menuEntry.getTarget().contains("High Level Alchemy") || !config.showAlchProfit()) return null;
+ if (!menuEntry.getTarget().contains("High Level Alchemy") || !plugin.isShowAlchProfit()) return null;
case WIDGET_DEFAULT:
case ITEM_USE:
case ITEM_FIRST_OPTION:
@@ -107,7 +109,7 @@ class ItemPricesOverlay extends Overlay
switch (groupId)
{
case WidgetID.INVENTORY_GROUP_ID:
- if (config.hideInventory())
+ if (plugin.isHideInventory())
{
return null;
}
@@ -130,7 +132,7 @@ class ItemPricesOverlay extends Overlay
private String makeValueTooltip(MenuEntry menuEntry)
{
// Disabling both disables all value tooltips
- if (!config.showGEPrice() && !config.showHAValue())
+ if (!plugin.isShowGEPrice() && !plugin.isShowHAValue())
{
return null;
}
@@ -199,15 +201,15 @@ class ItemPricesOverlay extends Overlay
int haProfit = 0;
final int itemHaPrice = Math.round(itemDef.getPrice() * Constants.HIGH_ALCHEMY_MULTIPLIER);
- if (config.showGEPrice())
+ if (plugin.isShowGEPrice())
{
gePrice = itemManager.getItemPrice(id);
}
- if (config.showHAValue())
+ if (plugin.isShowHAValue())
{
haPrice = itemManager.getAlchValue(id);
}
- if (gePrice > 0 && itemHaPrice > 0 && config.showAlchProfit())
+ if (gePrice > 0 && itemHaPrice > 0 && plugin.isShowAlchProfit())
{
haProfit = calculateHAProfit(itemHaPrice, gePrice);
}
@@ -227,7 +229,7 @@ class ItemPricesOverlay extends Overlay
itemStringBuilder.append("EX: ")
.append(StackFormatter.quantityToStackSize(gePrice * qty))
.append(" gp");
- if (config.showEA() && qty > 1)
+ if (plugin.isShowEA() && qty > 1)
{
itemStringBuilder.append(" (")
.append(StackFormatter.quantityToStackSize(gePrice))
@@ -244,7 +246,7 @@ class ItemPricesOverlay extends Overlay
itemStringBuilder.append("HA: ")
.append(StackFormatter.quantityToStackSize(haValue * qty))
.append(" gp");
- if (config.showEA() && qty > 1)
+ if (plugin.isShowEA() && qty > 1)
{
itemStringBuilder.append(" (")
.append(StackFormatter.quantityToStackSize(haValue))
@@ -260,7 +262,7 @@ class ItemPricesOverlay extends Overlay
itemStringBuilder.append("HA Profit: ")
.append(ColorUtil.wrapWithColorTag(String.valueOf(haProfit * qty), haColor))
.append(" gp");
- if (config.showEA() && qty > 1)
+ if (plugin.isShowEA() && qty > 1)
{
itemStringBuilder.append(" (")
.append(ColorUtil.wrapWithColorTag(String.valueOf(haProfit), haColor))
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java
index 2434faade3..302c9d8728 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java
@@ -26,7 +26,12 @@ package net.runelite.client.plugins.itemprices;
import com.google.inject.Provides;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.overlay.OverlayManager;
@@ -37,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
tags = {"bank", "inventory", "overlay", "high", "alchemy", "grand", "exchange", "tooltips"},
enabledByDefault = false
)
+@Singleton
public class ItemPricesPlugin extends Plugin
{
@Inject
@@ -45,6 +51,20 @@ public class ItemPricesPlugin extends Plugin
@Inject
private ItemPricesOverlay overlay;
+ @Inject
+ private ItemPricesConfig config;
+
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showGEPrice;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showHAValue;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showEA;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean hideInventory;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showAlchProfit;
+
@Provides
ItemPricesConfig getConfig(ConfigManager configManager)
{
@@ -54,6 +74,7 @@ public class ItemPricesPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
overlayManager.add(overlay);
}
@@ -62,4 +83,24 @@ public class ItemPricesPlugin extends Plugin
{
overlayManager.remove(overlay);
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("itemprices"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ private void updateConfig()
+ {
+ this.showGEPrice = config.showGEPrice();
+ this.showHAValue = config.showHAValue();
+ this.showEA = config.showEA();
+ this.hideInventory = config.hideInventory();
+ this.showAlchProfit = config.showAlchProfit();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java
index 37066622bc..2e9ac325cc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.itemskeptondeath;
import com.google.common.collect.ImmutableMap;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.runelite.api.ItemID;
@@ -36,7 +37,7 @@ import net.runelite.api.ItemID;
* The white outline will be added to these items when they are lost on death.
*/
@AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
enum AlwaysLostItem
{
RUNE_POUCH(ItemID.RUNE_POUCH, true),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java
index a40851dc65..5afb14c931 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.itemskeptondeath;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
import javax.annotation.Nullable;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.runelite.api.ItemID;
@@ -37,7 +38,7 @@ import net.runelite.api.ItemID;
* These are typically imbued items, such as Berserker ring (i), to help it protect over the non-imbued variants.
*/
@AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
enum FixedPriceItem
{
IMBUED_BLACK_MASK_I(ItemID.BLACK_MASK_I, 5000),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java
index ee761ad9a9..f6d817b54c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.Constants;
@@ -64,6 +65,7 @@ import net.runelite.client.util.StackFormatter;
enabledByDefault = false
)
@Slf4j
+@Singleton
public class ItemsKeptOnDeathPlugin extends Plugin
{
private static final int DEEP_WILDY = 20;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
index 209e86aa41..28b3e555a2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
@@ -53,25 +53,26 @@ public class ItemStatOverlay extends Overlay
.aspeed(6)
.build());
- @Inject
private Client client;
-
- @Inject
private ItemManager itemManager;
-
- @Inject
private TooltipManager tooltipManager;
-
- @Inject
private ItemStatChanges statChanges;
+ private ItemStatPlugin plugin;
@Inject
- private ItemStatConfig config;
+ ItemStatOverlay(Client client, ItemStatPlugin plugin, ItemManager itemManager, TooltipManager tooltipManager, ItemStatChanges itemStatChanges)
+ {
+ this.client = client;
+ this.itemManager = itemManager;
+ this.tooltipManager = tooltipManager;
+ this.statChanges = itemStatChanges;
+ this.plugin = plugin;
+ }
@Override
public Dimension render(Graphics2D graphics)
{
- if (client.isMenuOpen() || (!config.relative() && !config.absolute() && !config.theoretical()))
+ if (client.isMenuOpen() || (!plugin.isRelative() && !plugin.isAbsolute() && !plugin.isTheoretical()))
{
return null;
}
@@ -115,7 +116,7 @@ public class ItemStatOverlay extends Overlay
}
}
- if (config.consumableStats())
+ if (plugin.isConsumableStats())
{
final Effect change = statChanges.get(itemId);
if (change != null)
@@ -137,7 +138,7 @@ public class ItemStatOverlay extends Overlay
}
}
- if (config.equipmentStats())
+ if (plugin.isEquipmentStats())
{
final ItemStats stats = itemManager.getItemStats(itemId, false);
@@ -161,8 +162,8 @@ public class ItemStatOverlay extends Overlay
final boolean inverse,
final boolean showPercent)
{
- final Color plus = Positivity.getColor(config, Positivity.BETTER_UNCAPPED);
- final Color minus = Positivity.getColor(config, Positivity.WORSE);
+ final Color plus = Positivity.getColor(plugin, Positivity.BETTER_UNCAPPED);
+ final Color minus = Positivity.getColor(plugin, Positivity.WORSE);
if (value == 0)
{
@@ -189,7 +190,7 @@ public class ItemStatOverlay extends Overlay
private String buildStatBonusString(ItemStats s)
{
final StringBuilder b = new StringBuilder();
- if (config.showWeight())
+ if (plugin.isShowWeight())
{
b.append(getChangeString("Weight", s.getWeight(), true, false));
}
@@ -257,32 +258,32 @@ public class ItemStatOverlay extends Overlay
private String buildStatChangeString(StatChange c)
{
StringBuilder b = new StringBuilder();
- b.append(ColorUtil.colorTag(Positivity.getColor(config, c.getPositivity())));
+ b.append(ColorUtil.colorTag(Positivity.getColor(plugin, c.getPositivity())));
- if (config.relative())
+ if (plugin.isRelative())
{
b.append(c.getFormattedRelative());
}
- if (config.theoretical())
+ if (plugin.isTheoretical())
{
- if (config.relative())
+ if (plugin.isRelative())
{
b.append("/");
}
b.append(c.getFormattedTheoretical());
}
- if (config.absolute() && (config.relative() || config.theoretical()))
+ if (plugin.isAbsolute() && (plugin.isRelative() || plugin.isTheoretical()))
{
b.append(" (");
}
- if (config.absolute())
+ if (plugin.isAbsolute())
{
b.append(c.getAbsolute());
}
- if (config.absolute() && (config.relative() || config.theoretical()))
+ if (plugin.isAbsolute() && (plugin.isRelative() || plugin.isTheoretical()))
{
b.append(")");
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java
index 2b0e476677..f94a17df0c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java
@@ -30,10 +30,13 @@ import com.google.common.collect.ImmutableSet;
import com.google.inject.Binder;
import com.google.inject.Inject;
import com.google.inject.Provides;
+import java.awt.Color;
import java.awt.FontMetrics;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import lombok.AccessLevel;
+import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.Constants;
import net.runelite.api.FontID;
@@ -97,6 +100,30 @@ public class ItemStatPlugin extends Plugin
private Widget itemInformationTitle;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean consumableStats;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean equipmentStats;
+ private boolean geStats;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean relative;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean absolute;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean theoretical;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showWeight;
+ @Getter(AccessLevel.PACKAGE)
+ private Color colorBetterUncapped;
+ @Getter(AccessLevel.PACKAGE)
+ private Color colorBetterSomeCapped;
+ @Getter(AccessLevel.PACKAGE)
+ private Color colorBetterCapped;
+ @Getter(AccessLevel.PACKAGE)
+ private Color colorNoChange;
+ @Getter(AccessLevel.PACKAGE)
+ private Color colorWorse;
+
@Provides
ItemStatConfig getConfig(ConfigManager configManager)
{
@@ -112,6 +139,7 @@ public class ItemStatPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
overlayManager.add(overlay);
}
@@ -127,6 +155,7 @@ public class ItemStatPlugin extends Plugin
{
if (event.getKey().equals("geStats"))
{
+ updateConfig();
clientThread.invokeLater(this::resetGEInventory);
}
}
@@ -134,7 +163,7 @@ public class ItemStatPlugin extends Plugin
@Subscribe
public void onGameTick(GameTick event)
{
- if (itemInformationTitle != null && config.geStats()
+ if (itemInformationTitle != null && this.geStats
&& (client.getWidget(WidgetInfo.GRAND_EXCHANGE_WINDOW_CONTAINER) == null
|| client.getWidget(WidgetInfo.GRAND_EXCHANGE_WINDOW_CONTAINER).isHidden()))
{
@@ -145,7 +174,7 @@ public class ItemStatPlugin extends Plugin
@Subscribe
public void onVarbitChanged(VarbitChanged event)
{
- if (client.getVar(VarPlayer.CURRENT_GE_ITEM) == -1 && config.geStats())
+ if (client.getVar(VarPlayer.CURRENT_GE_ITEM) == -1 && this.geStats)
{
resetGEInventory();
}
@@ -154,7 +183,7 @@ public class ItemStatPlugin extends Plugin
@Subscribe
public void onScriptCallbackEvent(ScriptCallbackEvent event)
{
- if (event.getEventName().equals("geBuilt") && config.geStats())
+ if (event.getEventName().equals("geBuilt") && this.geStats)
{
int currentGeItem = client.getVar(VarPlayer.CURRENT_GE_ITEM);
if (currentGeItem != -1 && client.getVar(Varbits.GE_OFFER_CREATION_TYPE) == 0)
@@ -431,4 +460,20 @@ public class ItemStatPlugin extends Plugin
return client.getWidget(WidgetInfo.FIXED_VIEWPORT_INVENTORY_CONTAINER);
}
}
+
+ private void updateConfig()
+ {
+ this.consumableStats = config.consumableStats();
+ this.equipmentStats = config.equipmentStats();
+ this.geStats = config.geStats();
+ this.relative = config.relative();
+ this.absolute = config.absolute();
+ this.theoretical = config.theoretical();
+ this.showWeight = config.showWeight();
+ this.colorBetterUncapped = config.colorBetterUncapped();
+ this.colorBetterSomeCapped = config.colorBetterSomeCapped();
+ this.colorBetterCapped = config.colorBetterCapped();
+ this.colorNoChange = config.colorNoChange();
+ this.colorWorse = config.colorWorse();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java
index d1da3c8176..ea83360a9b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java
@@ -56,20 +56,20 @@ public enum Positivity
*/
BETTER_UNCAPPED;
- public static Color getColor(ItemStatConfig config, Positivity positivity)
+ public static Color getColor(ItemStatPlugin plugin, Positivity positivity)
{
switch (positivity)
{
case BETTER_UNCAPPED:
- return config.colorBetterUncapped();
+ return plugin.getColorBetterUncapped();
case BETTER_SOMECAPPED:
- return config.colorBetterSomeCapped();
+ return plugin.getColorBetterSomeCapped();
case BETTER_CAPPED:
- return config.colorBetterCapped();
+ return plugin.getColorBetterCapped();
case NO_CHANGE:
- return config.colorNoChange();
+ return plugin.getColorNoChange();
case WORSE:
- return config.colorWorse();
+ return plugin.getColorWorse();
default:
return Color.WHITE;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
index 56cf3bbedc..d4a493769f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
@@ -30,6 +30,7 @@ import java.awt.event.KeyEvent;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.VarClientStr;
@@ -39,6 +40,7 @@ import net.runelite.client.config.ModifierlessKeybind;
import net.runelite.client.input.KeyListener;
import net.runelite.client.input.MouseAdapter;
+@Singleton
class KeyRemappingListener extends MouseAdapter implements KeyListener
{
private static final Keybind ONE = new ModifierlessKeybind(KeyEvent.VK_1, 0);
@@ -57,9 +59,6 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener
@Inject
private KeyRemappingPlugin plugin;
- @Inject
- private KeyRemappingConfig config;
-
@Inject
private Client client;
@@ -83,24 +82,24 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener
if (!plugin.isTyping())
{
- if (config.cameraRemap())
+ if (plugin.isCameraRemap())
{
- if (config.up().matches(e))
+ if (plugin.getUp().matches(e))
{
modified.put(e.getKeyCode(), KeyEvent.VK_UP);
e.setKeyCode(KeyEvent.VK_UP);
}
- else if (config.down().matches(e))
+ else if (plugin.getDown().matches(e))
{
modified.put(e.getKeyCode(), KeyEvent.VK_DOWN);
e.setKeyCode(KeyEvent.VK_DOWN);
}
- else if (config.left().matches(e))
+ else if (plugin.getLeft().matches(e))
{
modified.put(e.getKeyCode(), KeyEvent.VK_LEFT);
e.setKeyCode(KeyEvent.VK_LEFT);
}
- else if (config.right().matches(e))
+ else if (plugin.getRight().matches(e))
{
modified.put(e.getKeyCode(), KeyEvent.VK_RIGHT);
e.setKeyCode(KeyEvent.VK_RIGHT);
@@ -110,7 +109,7 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener
// In addition to the above checks, the F-key remapping shouldn't
// activate when dialogs are open which listen for number keys
// to select options
- if (config.fkeyRemap() && !plugin.isDialogOpen())
+ if (plugin.isFkeyRemap() && !plugin.isDialogOpen())
{
if (ONE.matches(e))
{
@@ -219,27 +218,27 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener
{
modified.remove(e.getKeyCode());
- if (config.cameraRemap())
+ if (plugin.isCameraRemap())
{
- if (config.up().matches(e))
+ if (plugin.getUp().matches(e))
{
e.setKeyCode(KeyEvent.VK_UP);
}
- else if (config.down().matches(e))
+ else if (plugin.getDown().matches(e))
{
e.setKeyCode(KeyEvent.VK_DOWN);
}
- else if (config.left().matches(e))
+ else if (plugin.getLeft().matches(e))
{
e.setKeyCode(KeyEvent.VK_LEFT);
}
- else if (config.right().matches(e))
+ else if (plugin.getRight().matches(e))
{
e.setKeyCode(KeyEvent.VK_RIGHT);
}
}
- if (config.fkeyRemap())
+ if (plugin.isFkeyRemap())
{
if (ONE.matches(e))
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java
index 5b38cbdc25..2d94b6e4d1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.keyremapping;
import com.google.inject.Provides;
import java.awt.Color;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
@@ -43,6 +44,7 @@ import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.callback.ClientThread;
import net.runelite.client.config.ConfigManager;
+import net.runelite.client.config.ModifierlessKeybind;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.input.KeyManager;
import net.runelite.client.plugins.Plugin;
@@ -56,6 +58,7 @@ import net.runelite.client.util.ColorUtil;
tags = {"enter", "chat", "wasd", "camera"},
enabledByDefault = false
)
+@Singleton
public class KeyRemappingPlugin extends Plugin
{
private static final String PRESS_ENTER_TO_CHAT = "Press Enter to Chat...";
@@ -81,9 +84,25 @@ public class KeyRemappingPlugin extends Plugin
@Setter(AccessLevel.PACKAGE)
private boolean typing;
+ private boolean hideDisplayName;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean cameraRemap;
+ @Getter(AccessLevel.PACKAGE)
+ private ModifierlessKeybind up;
+ @Getter(AccessLevel.PACKAGE)
+ private ModifierlessKeybind down;
+ @Getter(AccessLevel.PACKAGE)
+ private ModifierlessKeybind left;
+ @Getter(AccessLevel.PACKAGE)
+ private ModifierlessKeybind right;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean fkeyRemap;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
typing = false;
keyManager.registerKeyListener(inputListener);
@@ -153,11 +172,13 @@ public class KeyRemappingPlugin extends Plugin
@Subscribe
public void onConfigChanged(ConfigChanged configChanged)
{
- if (!configChanged.getGroup().equals("keyremapping") || !configChanged.getKey().equals("hideDisplayName"))
+ if (!configChanged.getGroup().equals("keyremapping"))
{
return;
}
+ updateConfig();
+
clientThread.invoke(() ->
{
Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT);
@@ -242,7 +263,7 @@ public class KeyRemappingPlugin extends Plugin
private String getWaitingText()
{
- if (config.hideDisplayName())
+ if (this.hideDisplayName)
{
return PRESS_ENTER_TO_CHAT;
}
@@ -251,4 +272,15 @@ public class KeyRemappingPlugin extends Plugin
return getPlayerNameWithIcon() + ": " + PRESS_ENTER_TO_CHAT;
}
}
+
+ private void updateConfig()
+ {
+ this.hideDisplayName = config.hideDisplayName();
+ this.cameraRemap = config.cameraRemap();
+ this.up = config.up();
+ this.down = config.down();
+ this.left = config.left();
+ this.right = config.right();
+ this.fkeyRemap = config.fkeyRemap();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java
index 8a2871125f..7c3dc3b56a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java
@@ -25,14 +25,16 @@
package net.runelite.client.plugins.kingdomofmiscellania;
import java.awt.image.BufferedImage;
+import javax.inject.Singleton;
import net.runelite.client.ui.overlay.infobox.Counter;
import net.runelite.client.util.StackFormatter;
+@Singleton
public class KingdomCounter extends Counter
{
private final KingdomPlugin plugin;
- KingdomCounter(BufferedImage image, KingdomPlugin plugin)
+ KingdomCounter(final BufferedImage image, final KingdomPlugin plugin)
{
super(image, plugin, plugin.getFavor());
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java
index 17347b3aac..e0445d6576 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java
@@ -26,6 +26,8 @@ package net.runelite.client.plugins.kingdomofmiscellania;
import com.google.common.collect.ImmutableSet;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
@@ -48,6 +50,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
enabledByDefault = false
)
@Slf4j
+@Singleton
public class KingdomPlugin extends Plugin
{
private static final ImmutableSet KINGDOM_REGION = ImmutableSet.of(10044, 10300);
@@ -61,7 +64,7 @@ public class KingdomPlugin extends Plugin
@Inject
private ItemManager itemManager;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int favor = 0, coffer = 0;
private KingdomCounter counter;
@@ -75,9 +78,12 @@ public class KingdomPlugin extends Plugin
@Subscribe
public void onVarbitChanged(VarbitChanged event)
{
- favor = client.getVar(Varbits.KINGDOM_FAVOR);
- coffer = client.getVar(Varbits.KINGDOM_COFFER);
- processInfobox();
+ if (isInKingdom())
+ {
+ favor = client.getVar(Varbits.KINGDOM_FAVOR);
+ coffer = client.getVar(Varbits.KINGDOM_COFFER);
+ processInfobox();
+ }
}
@Subscribe
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java
index 49f6ccf7f9..43b31e52aa 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.kourendlibrary;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.ItemID;
import net.runelite.client.game.AsyncBufferedImage;
@@ -99,22 +100,22 @@ enum Book
return BY_NAME.get(name);
}
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final int item;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final String name;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final String shortName;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private AsyncBufferedImage icon;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final boolean isDarkManuscript;
- Book(int id, String shortName, String name)
+ Book(final int id, final String shortName, final String name)
{
this.item = id;
this.isDarkManuscript = false;
@@ -122,7 +123,7 @@ enum Book
this.name = name;
}
- Book(int id)
+ Book(final int id)
{
this.item = id;
this.isDarkManuscript = true;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java
index 29976bc0bb..fe11faac3b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.kourendlibrary;
import java.awt.Color;
+import javax.inject.Singleton;
import javax.swing.GroupLayout;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -32,11 +33,12 @@ import javax.swing.border.EmptyBorder;
import net.runelite.client.ui.ColorScheme;
import net.runelite.client.ui.FontManager;
+@Singleton
class BookPanel extends JPanel
{
private JLabel location = new JLabel();
- BookPanel(Book b)
+ BookPanel(final Book b)
{
setBorder(new EmptyBorder(3, 3, 3, 3));
setBackground(ColorScheme.DARK_GRAY_COLOR);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java
index ee7d7d295d..c4a95d7215 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java
@@ -29,37 +29,38 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.coords.WorldPoint;
class Bookcase
{
- Bookcase(WorldPoint location)
+ Bookcase(final WorldPoint location)
{
this.location = location;
this.index = new ArrayList<>();
}
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final WorldPoint location;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final List index;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private boolean isBookSet;
/**
* Book in this bookcase as found by the player.
* Will be correct as long as isBookSet is true, unless the library has reset;
*/
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Book book;
/**
* Books that can be in this slot. Will only be populated if library.state != SolvedState.NO_DATA
*/
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Set possibleBooks = new HashSet<>();
void clearBook()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java
index 5cf7910ee6..9af693fed2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.kourendlibrary;
import com.google.inject.Inject;
+import com.google.inject.Singleton;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FontMetrics;
@@ -50,23 +51,22 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
class KourendLibraryOverlay extends Overlay
{
private final static int MAXIMUM_DISTANCE = 24;
private final Library library;
private final Client client;
- private final KourendLibraryConfig config;
private final KourendLibraryPlugin plugin;
@Setter(AccessLevel.PACKAGE)
private boolean hidden;
@Inject
- private KourendLibraryOverlay(Library library, Client client, KourendLibraryConfig config, KourendLibraryPlugin plugin)
+ private KourendLibraryOverlay(final Library library, final Client client, final KourendLibraryPlugin plugin)
{
this.library = library;
this.client = client;
- this.config = config;
this.plugin = plugin;
setPosition(OverlayPosition.DYNAMIC);
@@ -238,7 +238,7 @@ class KourendLibraryOverlay extends Overlay
private boolean shouldHideOverlayIfDuplicateBook(@Nullable Book book)
{
- return config.hideDuplicateBook()
+ return plugin.isHideDuplicateBook()
&& book != null
&& !book.isDarkManuscript()
&& plugin.doesPlayerContainBook(book);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
index aea8d9b034..54e60eb415 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
@@ -30,7 +30,10 @@ import java.util.EnumSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.swing.SwingUtilities;
+import lombok.AccessLevel;
+import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.AnimationID;
import net.runelite.api.ChatMessageType;
@@ -65,6 +68,7 @@ import net.runelite.client.util.ImageUtil;
tags = {"arceuus", "magic", "runecrafting", "overlay", "panel"}
)
@Slf4j
+@Singleton
public class KourendLibraryPlugin extends Plugin
{
private static final Pattern BOOK_EXTRACTOR = Pattern.compile("'(.*)'");
@@ -101,6 +105,10 @@ public class KourendLibraryPlugin extends Plugin
private WorldPoint lastBookcaseAnimatedOn = null;
private EnumSet playerBooks = null;
+ private boolean hideButton;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean hideDuplicateBook;
+
@Provides
KourendLibraryConfig provideConfig(ConfigManager configManager)
{
@@ -110,6 +118,9 @@ public class KourendLibraryPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ hideButton = config.hideButton();
+ hideDuplicateBook = config.hideDuplicateBook();
+
Book.fillImages(itemManager);
panel = injector.getInstance(KourendLibraryPanel.class);
@@ -128,7 +139,7 @@ public class KourendLibraryPlugin extends Plugin
updatePlayerBooks();
- if (!config.hideButton())
+ if (!this.hideButton)
{
clientToolbar.addNavigation(navButton);
}
@@ -154,9 +165,12 @@ public class KourendLibraryPlugin extends Plugin
return;
}
+ this.hideButton = config.hideButton();
+ this.hideDuplicateBook = config.hideDuplicateBook();
+
SwingUtilities.invokeLater(() ->
{
- if (!config.hideButton())
+ if (!this.hideButton)
{
clientToolbar.addNavigation(navButton);
}
@@ -213,7 +227,7 @@ public class KourendLibraryPlugin extends Plugin
public void onGameTick(GameTick tick)
{
boolean inRegion = client.getLocalPlayer().getWorldLocation().getRegionID() == REGION;
- if (config.hideButton() && inRegion != buttonAttached)
+ if (this.hideButton && inRegion != buttonAttached)
{
SwingUtilities.invokeLater(() ->
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java
index 23afd804a5..85103e8135 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.IntStream;
import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.coords.WorldPoint;
@@ -91,13 +92,13 @@ class Library
private final int step;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private SolvedState state;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Book customerBook;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private LibraryCustomer customer;
Library()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java
index 04cb4829a1..9de04a826a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.kourendlibrary;
import java.util.HashMap;
import java.util.Map;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.NpcID;
@@ -35,10 +36,10 @@ enum LibraryCustomer
PROFESSOR_GRACKLEBONE(NpcID.PROFESSOR_GRACKLEBONE, "Prof. Gracklebone"),
SAM(NpcID.SAM_7049, "Sam");
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final int id;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final String name;
private static final Map byId = buildIdMap();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java
index cea339008b..94d1aa6c18 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java
@@ -13,6 +13,7 @@ package net.runelite.client.plugins.learntoclick;
import com.google.common.collect.ImmutableList;
import com.google.inject.Provides;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.MenuEntry;
@@ -29,7 +30,6 @@ import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
import org.apache.commons.lang3.ArrayUtils;
-
@PluginDescriptor(
name = "Learn to Click",
description = "A few modifications to prevent misclicks",
@@ -37,8 +37,8 @@ import org.apache.commons.lang3.ArrayUtils;
type = PluginType.PVP,
enabledByDefault = false
)
-
@Slf4j
+@Singleton
public class LearnToClickPlugin extends Plugin
{
private static final ImmutableList ORB_WIDGETS = ImmutableList.of(WidgetInfo.MINIMAP_WORLDMAP_ORB,
@@ -50,6 +50,12 @@ public class LearnToClickPlugin extends Plugin
@Inject
private Client client;
+ private boolean shouldBlockCompass;
+ private boolean shouldRightClickMap;
+ private boolean shouldRightClickXp;
+ private boolean shouldRightClickRetaliate;
+ private boolean hideOrbs;
+
@Provides
LearnToClickConfig provideConfig(ConfigManager configManager)
{
@@ -59,6 +65,7 @@ public class LearnToClickPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
}
@Override
@@ -71,11 +78,14 @@ public class LearnToClickPlugin extends Plugin
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
- if (!event.getGroup().equals("learntoclick") && !event.getKey().equals("hideOrbs"))
+ if (!event.getGroup().equals("learntoclick"))
{
return;
}
- if (config.hideOrbs())
+
+ updateConfig();
+
+ if (this.hideOrbs)
{
hideOrbWidgets(true);
}
@@ -89,7 +99,7 @@ public class LearnToClickPlugin extends Plugin
@Subscribe
public void onWidgetLoaded(WidgetLoaded event)
{
- if (!config.hideOrbs())
+ if (!this.hideOrbs)
{
return;
}
@@ -110,10 +120,10 @@ public class LearnToClickPlugin extends Plugin
MenuEntry[] menuEntries = client.getMenuEntries();
for (MenuEntry entry : menuEntries)
{
- if ((entry.getOption().equals("Floating") && config.shouldRightClickMap()) ||
- (entry.getOption().equals("Hide") && config.shouldRightClickXp()) || (entry.getOption().equals("Show")
- && config.shouldRightClickXp()) || (entry.getOption().equals("Auto retaliate")
- && config.shouldRightClickRetaliate()))
+ if ((entry.getOption().equals("Floating") && this.shouldRightClickMap) ||
+ (entry.getOption().equals("Hide") && this.shouldRightClickXp) || (entry.getOption().equals("Show")
+ && this.shouldRightClickXp) || (entry.getOption().equals("Auto retaliate")
+ && this.shouldRightClickRetaliate))
{
event.setForceRightClick(true);
return;
@@ -124,14 +134,14 @@ public class LearnToClickPlugin extends Plugin
@Subscribe
public void onMenuEntryAdded(MenuEntryAdded event)
{
- if ((event.getOption().equals("Floating") && config.shouldRightClickMap()) || (event.getOption().equals("Hide")
- && config.shouldRightClickXp()) || (event.getOption().equals("Show") && config.shouldRightClickXp()) ||
- (event.getOption().equals("Auto retaliate") && config.shouldRightClickRetaliate()))
+ if ((event.getOption().equals("Floating") && this.shouldRightClickMap) || (event.getOption().equals("Hide")
+ && this.shouldRightClickXp) || (event.getOption().equals("Show") && this.shouldRightClickXp) ||
+ (event.getOption().equals("Auto retaliate") && this.shouldRightClickRetaliate))
{
forceRightClickFlag = true;
}
MenuEntry[] entries = client.getMenuEntries();
- if (config.shouldBlockCompass())
+ if (this.shouldBlockCompass)
{
for (int i = entries.length - 1; i >= 0; i--)
{
@@ -153,4 +163,13 @@ public class LearnToClickPlugin extends Plugin
{
ORB_WIDGETS.forEach(widgetInfo -> client.getWidget(widgetInfo).setHidden(hidden));
}
+
+ private void updateConfig()
+ {
+ this.shouldBlockCompass = config.shouldBlockCompass();
+ this.shouldRightClickMap = config.shouldRightClickMap();
+ this.shouldRightClickXp = config.shouldRightClickXp();
+ this.shouldRightClickRetaliate = config.shouldRightClickRetaliate();
+ this.hideOrbs = config.hideOrbs();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java
index e9eb807ca8..e850169cbf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java
@@ -28,14 +28,15 @@ import com.google.inject.Provides;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Actor;
-import net.runelite.api.Client;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.client.Notifier;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
@@ -51,8 +52,8 @@ import net.runelite.client.ui.overlay.OverlayManager;
type = PluginType.PVM,
enabledByDefault = false
)
-
@Slf4j
+@Singleton
public class LizardmenShamanPlugin extends Plugin
{
private static final String SHAMAN = "Lizardman shaman";
@@ -73,8 +74,8 @@ public class LizardmenShamanPlugin extends Plugin
@Inject
private Notifier notifier;
- @Inject
- private Client client;
+ private boolean showTimer;
+ private boolean notifyOnSpawn;
@Provides
LizardmenShamanConfig getConfig(ConfigManager configManager)
@@ -85,6 +86,9 @@ public class LizardmenShamanPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ this.showTimer = config.showTimer();
+ this.notifyOnSpawn = config.notifyOnSpawn();
+
overlayManager.add(overlay);
}
@@ -98,7 +102,7 @@ public class LizardmenShamanPlugin extends Plugin
@Subscribe
public void onChatMessage(ChatMessage event)
{
- if (config.notifyOnSpawn())
+ if (this.notifyOnSpawn)
{
if (event.getMessage().contains(MESSAGE))
{
@@ -118,10 +122,22 @@ public class LizardmenShamanPlugin extends Plugin
if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157)
{
- if (config.showTimer())
+ if (this.showTimer)
{
spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null));
}
}
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("shaman"))
+ {
+ return;
+ }
+
+ this.showTimer = config.showTimer();
+ this.notifyOnSpawn = config.notifyOnSpawn();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java
index ac52b75fce..627af82c31 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java
@@ -25,13 +25,14 @@
package net.runelite.client.plugins.lizardmenshaman;
import java.time.Instant;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
-@Getter
-@Setter
+@Getter(AccessLevel.PACKAGE)
+@Setter(AccessLevel.PACKAGE)
@RequiredArgsConstructor
@AllArgsConstructor
class LizardmenShamanSpawn
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java
index 58f5c6a73a..9d60355d6d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
import java.time.Duration;
import java.time.Instant;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.Point;
@@ -38,13 +39,14 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.ProgressPieComponent;
+@Singleton
class ShamanSpawnOverlay extends Overlay
{
private final Client client;
private final LizardmenShamanPlugin plugin;
@Inject
- private ShamanSpawnOverlay(Client client, LizardmenShamanPlugin plugin)
+ private ShamanSpawnOverlay(final Client client, final LizardmenShamanPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
index b99efb6e62..dbf0a6df64 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
@@ -32,9 +32,11 @@ import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.event.KeyEvent;
import java.io.IOException;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.client.events.SessionOpen;
import net.runelite.client.config.ConfigManager;
@@ -50,6 +52,7 @@ import net.runelite.client.util.OSType;
description = "Provides various enhancements for login screen"
)
@Slf4j
+@Singleton
public class LoginScreenPlugin extends Plugin implements KeyListener
{
private static final int MAX_USERNAME_LENGTH = 254;
@@ -67,9 +70,14 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
private String usernameCache;
+ private boolean syncUsername;
+ private boolean pasteEnabled;
+ private String username;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
applyUsername();
keyManager.registerKeyListener(this);
}
@@ -77,7 +85,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
@Override
protected void shutDown() throws Exception
{
- if (config.syncUsername())
+ if (this.syncUsername)
{
client.getPreferences().setRememberedUsername(usernameCache);
}
@@ -94,7 +102,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
@Subscribe
public void onGameStateChanged(GameStateChanged event)
{
- if (!config.syncUsername())
+ if (!this.syncUsername)
{
return;
}
@@ -112,13 +120,14 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
username = client.getUsername();
}
- if (config.username().equals(username))
+ if (this.username.equals(username))
{
return;
}
log.debug("Saving username: {}", username);
config.username(username);
+ this.username = username;
}
}
@@ -131,7 +140,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
private void applyUsername()
{
- if (!config.syncUsername())
+ if (!this.syncUsername)
{
return;
}
@@ -139,7 +148,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
GameState gameState = client.getGameState();
if (gameState == GameState.LOGIN_SCREEN)
{
- String username = config.username();
+ String username = this.username;
if (Strings.isNullOrEmpty(username))
{
@@ -164,7 +173,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
@Override
public void keyPressed(KeyEvent e)
{
- if (!config.pasteEnabled() || (
+ if (!this.pasteEnabled || (
client.getGameState() != GameState.LOGIN_SCREEN &&
client.getGameState() != GameState.LOGIN_SCREEN_AUTHENTICATOR))
{
@@ -220,4 +229,22 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
{
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("loginscreen"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ private void updateConfig()
+ {
+ this.syncUsername = config.syncUsername();
+ this.pasteEnabled = config.pasteEnabled();
+ this.username = config.username();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java
index 132c98e33c..8041ef36b0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java
@@ -7,6 +7,7 @@ import java.awt.Polygon;
import java.text.DecimalFormat;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.Point;
@@ -18,13 +19,14 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
public class LootAssistOverlay extends Overlay
{
private Client client;
private DecimalFormat d = new DecimalFormat("##.#");
@Inject
- public LootAssistOverlay(Client client)
+ public LootAssistOverlay(final Client client)
{
this.client = client;
setLayer(OverlayLayer.ABOVE_SCENE);
@@ -41,15 +43,17 @@ public class LootAssistOverlay extends Overlay
LootPile pile = entry.getValue();
int x;
int y;
- try
+ LocalPoint lp = LocalPoint.fromWorld(client, pile.getLocation());
+ if (lp != null)
{
- x = LocalPoint.fromWorld(client, pile.getLocation()).getSceneX();
- y = LocalPoint.fromWorld(client, pile.getLocation()).getSceneY();
+ x = lp.getSceneX();
+ y = lp.getSceneY();
}
- catch (NullPointerException e)
+ else
{
continue;
}
+
if (!localPoint.isInScene(client))
{
continue;
@@ -70,11 +74,9 @@ public class LootAssistOverlay extends Overlay
client.getScene().getTiles()[client.getPlane()][x][y].getLocalLocation());
if (poly != null)
{
- Point textLoc = Perspective.getCanvasTextLocation(client, graphics,
- LocalPoint.fromWorld(client, pile.getLocation()),
+ Point textLoc = Perspective.getCanvasTextLocation(client, graphics, lp,
nameOverlay, graphics.getFontMetrics().getHeight() * 7);
- Point timeLoc = Perspective.getCanvasTextLocation(client, graphics,
- LocalPoint.fromWorld(client, pile.getLocation()),
+ Point timeLoc = Perspective.getCanvasTextLocation(client, graphics, lp,
timeOverlay, graphics.getFontMetrics().getHeight());
OverlayUtil.renderPolygon(graphics, poly, Color.WHITE);
if (timeRemaining < 5)
@@ -84,8 +86,7 @@ public class LootAssistOverlay extends Overlay
}
if (timeRemaining < 2)
{
- client.setHintArrow(WorldPoint.fromLocal(client,
- LocalPoint.fromWorld(client, pile.getLocation())));
+ client.setHintArrow(WorldPoint.fromLocal(client, lp));
}
else
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java
index 7087ec423f..35e02cff98 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java
@@ -1,15 +1,14 @@
package net.runelite.client.plugins.lootassist;
-import com.google.inject.Provides;
import java.util.concurrent.ConcurrentHashMap;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Actor;
import net.runelite.api.AnimationID;
import net.runelite.api.Player;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.GameStateChanged;
-import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
@@ -23,7 +22,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
type = PluginType.PVP,
enabledByDefault = false
)
-
+@Singleton
public class LootAssistPlugin extends Plugin
{
@Inject
@@ -34,12 +33,6 @@ public class LootAssistPlugin extends Plugin
static ConcurrentHashMap lootPiles = new ConcurrentHashMap<>();
- @Provides
- LootAssitConfig getConfig(ConfigManager configManager)
- {
- return configManager.getConfig(LootAssitConfig.class);
- }
-
@Override
protected void startUp() throws Exception
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssitConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssitConfig.java
deleted file mode 100644
index 8c4d5b1a10..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssitConfig.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.runelite.client.plugins.lootassist;
-
-import java.awt.Color;
-import net.runelite.client.config.Config;
-import net.runelite.client.config.ConfigGroup;
-import net.runelite.client.config.ConfigItem;
-
-@ConfigGroup("lootassist")
-public interface LootAssitConfig extends Config
-{
- @ConfigItem(
- keyName = "color",
- name = "Color",
- description = "The Color of the tile and name overlay that indicates where loot will appear"
- )
- default Color color()
- {
- return Color.WHITE;
- }
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java
index 32fa145088..f59e842730 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java
@@ -1,5 +1,6 @@
package net.runelite.client.plugins.lootassist;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.api.coords.WorldPoint;
@@ -8,17 +9,17 @@ class LootPile
{
private static final long TIME_UNTIL_VISIBLE = 60000;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final long timeAppearing;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final WorldPoint location;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final String playerName;
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private boolean beingRendered = false;
LootPile(WorldPoint location, String playerName)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java
index ecfe3dc5da..c8353c0181 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.InventoryID;
import net.runelite.api.Item;
@@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation;
import net.runelite.client.ui.overlay.components.ImageComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
public class LootingBagViewerOverlay extends Overlay
{
private static final int INVENTORY_SIZE = 28;
@@ -57,7 +59,7 @@ public class LootingBagViewerOverlay extends Overlay
private Item[] items;
@Inject
- private LootingBagViewerOverlay(Client client, ItemManager itemManager)
+ private LootingBagViewerOverlay(final Client client, final ItemManager itemManager)
{
setPosition(OverlayPosition.BOTTOM_RIGHT);
panelComponent.setWrapping(4);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java
index 69563ab2c4..a0e3591dbf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java
@@ -29,6 +29,8 @@ package net.runelite.client.plugins.lootingbagviewer;
import com.google.common.base.Strings;
import com.google.inject.Provides;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
@@ -57,6 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
* TODO: Write something to capture adding items to a looting bag and add its price to the current looting bag value
*/
@Slf4j
+@Singleton // WHY IS THIS PLUGIN EVEN MERGED IT'S AGES FROM BEING DONE!?!?!?!?
public class LootingBagViewerPlugin extends Plugin
{
@Inject
@@ -77,8 +80,8 @@ public class LootingBagViewerPlugin extends Plugin
@Inject
private LootingBagViewerConfig config;
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private int valueToShow = -1;
@Provides
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java
index 00c716f2fb..d3356155c4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java
@@ -27,22 +27,21 @@ package net.runelite.client.plugins.lootingbagviewer;
import java.awt.Color;
import java.awt.Graphics2D;
import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
import net.runelite.api.ItemID;
import net.runelite.api.Point;
import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.ui.overlay.WidgetItemOverlay;
+@Singleton
public class LootingBagViewerWidgetOverlay extends WidgetItemOverlay
{
- private Client client;
private LootingBagViewerPlugin plugin;
@Inject
- LootingBagViewerWidgetOverlay(Client client, LootingBagViewerPlugin plugin)
+ LootingBagViewerWidgetOverlay(final LootingBagViewerPlugin plugin)
{
- this.client = client;
this.plugin = plugin;
showOnInventory();
}
@@ -72,9 +71,6 @@ public class LootingBagViewerWidgetOverlay extends WidgetItemOverlay
{
switch ((int) (Math.log10(lootingBagValue) + 1))
{
- case 1:
- case 2:
- return 8;
case 3:
case 4:
return 6;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java
index bd00e16cf3..4098bed359 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java
@@ -63,7 +63,7 @@ class LootTrackerBox extends JPanel
@Getter(AccessLevel.PACKAGE)
private final String id;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final List records = new ArrayList<>();
private long totalPrice;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java
index feb1504681..b676924c8e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java
@@ -24,6 +24,7 @@
*/
package net.runelite.client.plugins.loottracker;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@@ -31,15 +32,15 @@ import lombok.Setter;
@AllArgsConstructor
class LootTrackerItem
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final int id;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final String name;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final int quantity;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final long price;
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private boolean ignored;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java
index 4e5afb9637..91f9218ad9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java
@@ -36,6 +36,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
+import javax.inject.Singleton;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.ImageIcon;
@@ -59,6 +60,7 @@ import net.runelite.client.util.StackFormatter;
import net.runelite.http.api.loottracker.LootTrackerClient;
@Slf4j
+@Singleton
class LootTrackerPanel extends PluginPanel
{
private static final int MAX_LOOT_BOXES = 500;
@@ -137,8 +139,6 @@ class LootTrackerPanel extends PluginPanel
INVISIBLE_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(invisibleImg, -220));
}
- private final JPanel displaySelector;
-
@Getter @Setter
private LootRecordSortType lootRecordSortType = LootRecordSortType.TIMESTAMP;
@@ -300,7 +300,7 @@ class LootTrackerPanel extends PluginPanel
overallPanel.add(overallIcon, BorderLayout.WEST);
overallPanel.add(overallInfo, BorderLayout.CENTER);
- displaySelector = new JPanel();
+ JPanel displaySelector = new JPanel();
displaySelector.setLayout(new GridLayout(1, 1));
displaySelector.setBorder(new EmptyBorder(2, 10, 10, 10));
displaySelector.setBackground(ColorScheme.DARKER_GRAY_COLOR);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
index bea6d2d477..2f863394fe 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
@@ -57,6 +57,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.swing.SwingUtilities;
import lombok.AccessLevel;
import lombok.Getter;
@@ -117,6 +118,7 @@ import net.runelite.http.api.loottracker.LootTrackerClient;
enabledByDefault = false
)
@Slf4j
+@Singleton
public class LootTrackerPlugin extends Plugin
{
// Activity/Event loot handling
@@ -212,6 +214,18 @@ public class LootTrackerPlugin extends Plugin
.collect(Collectors.toList());
}
+ private String getIgnoredItems;
+ private boolean saveLoot;
+ private boolean chestLootChat;
+ private boolean syncPanel;
+ private boolean localPersistence;
+ private LootRecordSortType sortType;
+ private boolean whitelistEnabled;
+ private String getWhitelist;
+ private boolean blacklistEnabled;
+ private String getBlacklist;
+ private boolean sendLootValueMessages;
+
@Provides
LootTrackerConfig provideConfig(ConfigManager configManager)
{
@@ -253,14 +267,16 @@ public class LootTrackerPlugin extends Plugin
{
if (event.getGroup().equals("loottracker"))
{
+ updateConfig();
+
if (event.getKey().equals("ignoredItems"))
{
- ignoredItems = Text.fromCSV(config.getIgnoredItems());
+ ignoredItems = Text.fromCSV(this.getIgnoredItems);
SwingUtilities.invokeLater(panel::updateIgnoredRecords);
}
if (event.getKey().equals("sortType"))
{
- panel.setLootRecordSortType(config.sortType());
+ panel.setLootRecordSortType(this.sortType);
SwingUtilities.invokeLater(panel::rebuild);
}
}
@@ -270,7 +286,9 @@ public class LootTrackerPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
- ignoredItems = Text.fromCSV(config.getIgnoredItems());
+ updateConfig();
+
+ ignoredItems = Text.fromCSV(this.getIgnoredItems);
panel = new LootTrackerPanel(this, itemManager, config);
spriteManager.getSpriteAsync(SpriteID.TAB_INVENTORY, 0, panel::loadHeaderIcon);
@@ -288,7 +306,7 @@ public class LootTrackerPlugin extends Plugin
AccountSession accountSession = sessionManager.getAccountSession();
LOOT_RECORDS_FILE.createNewFile();
bufferedReader = Files.newBufferedReader(LOOT_RECORDS_FILE.toPath());
- if (accountSession != null || config.localPersistence())
+ if (accountSession != null || this.localPersistence)
{
clientThread.invokeLater(() ->
@@ -303,7 +321,7 @@ public class LootTrackerPlugin extends Plugin
executor.submit(() ->
{
- if (config.syncPanel() && lootTrackerClient != null)
+ if (this.syncPanel && lootTrackerClient != null)
{
lootTrackerClient = new LootTrackerClient(accountSession.getUuid());
try
@@ -318,7 +336,7 @@ public class LootTrackerPlugin extends Plugin
log.debug("Loaded {} remote data entries", lootRecords.size());
}
- if (config.localPersistence())
+ if (this.localPersistence)
{
try
{
@@ -367,18 +385,18 @@ public class LootTrackerPlugin extends Plugin
final LootTrackerItem[] entries = buildEntries(stack(items));
String localUsername = client.getLocalPlayer().getName();
- if (config.whitelistEnabled())
+ if (this.whitelistEnabled)
{
- final String configNpcs = config.getWhitelist().toLowerCase();
+ final String configNpcs = this.getWhitelist.toLowerCase();
List whitelist = Text.fromCSV(configNpcs);
if (!whitelist.contains(name.toLowerCase()))
{
return;
}
}
- else if (config.blacklistEnabled())
+ else if (this.blacklistEnabled)
{
- final String configNpcs = config.getBlacklist().toLowerCase();
+ final String configNpcs = this.getBlacklist.toLowerCase();
List blacklist = Text.fromCSV(configNpcs);
if (blacklist.contains(name.toLowerCase()))
{
@@ -390,11 +408,11 @@ public class LootTrackerPlugin extends Plugin
LootRecord lootRecord = new LootRecord(name, localUsername, LootRecordType.NPC,
toGameItems(items), Instant.now());
- if (lootTrackerClient != null && config.saveLoot())
+ if (lootTrackerClient != null && this.saveLoot)
{
lootTrackerClient.submit(lootRecord);
}
- if (config.localPersistence())
+ if (this.localPersistence)
{
saveLocalLootRecord(lootRecord);
}
@@ -412,7 +430,7 @@ public class LootTrackerPlugin extends Plugin
@Subscribe
public void onPlayerLootReceived(final PlayerLootReceived playerLootReceived)
{
- if (config.sendLootValueMessages())
+ if (this.sendLootValueMessages)
{
if (WorldType.isDeadmanWorld(client.getWorldType()) || WorldType.isHighRiskWorld(client.getWorldType()) || WorldType.isPvpWorld(client.getWorldType()) || client.getVar(Varbits.IN_WILDERNESS) == 1)
{
@@ -433,11 +451,11 @@ public class LootTrackerPlugin extends Plugin
SwingUtilities.invokeLater(() -> panel.add(name, localUsername, combat, entries));
LootRecord lootRecord = new LootRecord(name, localUsername, LootRecordType.PLAYER,
toGameItems(items), Instant.now());
- if (lootTrackerClient != null && config.saveLoot())
+ if (lootTrackerClient != null && this.saveLoot)
{
lootTrackerClient.submit(lootRecord);
}
- if (config.localPersistence() && lootTrackerClient == null)
+ if (this.localPersistence && lootTrackerClient == null)
{
saveLocalLootRecord(lootRecord);
}
@@ -480,7 +498,7 @@ public class LootTrackerPlugin extends Plugin
return;
}
- if (!(event.getGroupId() == WidgetID.CLUE_SCROLL_REWARD_GROUP_ID) && config.chestLootChat())
+ if (!(event.getGroupId() == WidgetID.CLUE_SCROLL_REWARD_GROUP_ID) && this.chestLootChat)
{
Item[] items = container.getItems();
long chestPrice = 0;
@@ -523,7 +541,7 @@ public class LootTrackerPlugin extends Plugin
final LootTrackerItem[] entries = buildEntries(stack(items));
SwingUtilities.invokeLater(() -> panel.add(eventType, client.getLocalPlayer().getName(), -1, entries));
- if (lootTrackerClient != null && config.saveLoot())
+ if (lootTrackerClient != null && this.saveLoot)
{
LootRecord lootRecord = new LootRecord(eventType, client.getLocalPlayer().getName(), LootRecordType.EVENT,
toGameItems(items), Instant.now());
@@ -627,11 +645,11 @@ public class LootTrackerPlugin extends Plugin
client.getLocalPlayer().getCombatLevel(), entries));
LootRecord lootRecord = new LootRecord(name, client.getLocalPlayer().getName(), LootRecordType.DEATH,
toGameItems(itemsLost), Instant.now());
- if (lootTrackerClient != null && config.saveLoot())
+ if (lootTrackerClient != null && this.saveLoot)
{
lootTrackerClient.submit(lootRecord);
}
- if (config.localPersistence() && lootTrackerClient == null)
+ if (this.localPersistence && lootTrackerClient == null)
{
saveLocalLootRecord(lootRecord);
}
@@ -734,7 +752,7 @@ public class LootTrackerPlugin extends Plugin
final LootTrackerItem[] entries = buildEntries(stack(items));
SwingUtilities.invokeLater(() -> panel.add(chestType, client.getLocalPlayer().getName(), -1, entries));
- if (lootTrackerClient != null && config.saveLoot())
+ if (lootTrackerClient != null && this.saveLoot)
{
LootRecord lootRecord = new LootRecord(chestType, client.getLocalPlayer().getName(),
LootRecordType.EVENT, toGameItems(items), Instant.now());
@@ -759,6 +777,7 @@ public class LootTrackerPlugin extends Plugin
}
config.setIgnoredItems(Text.toCSV(ignoredItemSet));
+ this.getIgnoredItems = Text.toCSV(ignoredItemSet);
panel.updateIgnoredRecords();
}
@@ -814,4 +833,19 @@ public class LootTrackerPlugin extends Plugin
return trackerRecords;
}
+
+ private void updateConfig()
+ {
+ this.getIgnoredItems = config.getIgnoredItems();
+ this.saveLoot = config.saveLoot();
+ this.chestLootChat = config.chestLootChat();
+ this.syncPanel = config.syncPanel();
+ this.localPersistence = config.localPersistence();
+ this.sortType = config.sortType();
+ this.whitelistEnabled = config.whitelistEnabled();
+ this.getWhitelist = config.getWhitelist();
+ this.blacklistEnabled = config.blacklistEnabled();
+ this.getBlacklist = config.getBlacklist();
+ this.sendLootValueMessages = config.sendLootValueMessages();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java
index 41caa93ebd..589ac4e202 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.lowmemory;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.events.GameStateChanged;
@@ -38,6 +39,7 @@ import net.runelite.client.plugins.PluginDescriptor;
tags = {"memory", "usage", "ground", "decorations"},
enabledByDefault = false
)
+@Singleton
public class LowMemoryPlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java
index 2315d2e2ca..ac85314026 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.maxhit;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.InventoryID;
import net.runelite.api.Item;
@@ -48,7 +49,7 @@ import net.runelite.client.plugins.maxhit.calculators.RangeMaxHitCalculator;
type = PluginType.UTILITY,
enabledByDefault = false
)
-
+@Singleton
public class MaxHitPlugin extends Plugin
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java
index 53833123cb..5e440d5064 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java
@@ -43,7 +43,7 @@ public class EquipmentSlotItem
return this.itemIds;
}
- public EquipmentInventorySlot getEquipmentSlot()
+ EquipmentInventorySlot getEquipmentSlot()
{
return this.equipmentSlot;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
index 4e8490a4c4..05ce35a254 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
@@ -40,6 +40,8 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.api.Client;
@@ -78,11 +80,25 @@ import net.runelite.client.menus.WidgetMenuOption;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
+import net.runelite.client.plugins.menuentryswapper.util.BurningAmuletMode;
+import net.runelite.client.plugins.menuentryswapper.util.CombatBraceletMode;
+import net.runelite.client.plugins.menuentryswapper.util.DigsitePendantMode;
+import net.runelite.client.plugins.menuentryswapper.util.DuelingRingMode;
import net.runelite.client.plugins.menuentryswapper.util.FairyRingMode;
+import net.runelite.client.plugins.menuentryswapper.util.GamesNecklaceMode;
+import net.runelite.client.plugins.menuentryswapper.util.GloryMode;
import net.runelite.client.plugins.menuentryswapper.util.HouseMode;
+import net.runelite.client.plugins.menuentryswapper.util.MaxCapeMode;
+import net.runelite.client.plugins.menuentryswapper.util.NecklaceOfPassageMode;
import net.runelite.client.plugins.menuentryswapper.util.ObeliskMode;
import net.runelite.client.plugins.menuentryswapper.util.OccultAltarMode;
import net.runelite.client.plugins.menuentryswapper.util.CharterOption;
+import net.runelite.client.plugins.menuentryswapper.util.QuestCapeMode;
+import net.runelite.client.plugins.menuentryswapper.util.RingOfWealthMode;
+import net.runelite.client.plugins.menuentryswapper.util.SkillsNecklaceMode;
+import net.runelite.client.plugins.menuentryswapper.util.SlayerRingMode;
+import net.runelite.client.plugins.menuentryswapper.util.XericsTalismanMode;
+import net.runelite.client.plugins.menuentryswapper.util.teleEquippedMode;
import static net.runelite.client.util.MenuUtil.swap;
import net.runelite.client.util.MiscUtils;
import net.runelite.client.util.Text;
@@ -95,7 +111,7 @@ import org.apache.commons.lang3.ArrayUtils;
type = PluginType.UTILITY,
enabledByDefault = false
)
-
+@Singleton
public class MenuEntrySwapperPlugin extends Plugin
{
private static final String CONFIGURE = "Configure";
@@ -109,7 +125,7 @@ public class MenuEntrySwapperPlugin extends Plugin
private static final String WALK_HERE = "WALK HERE";
private static final String CANCEL = "CANCEL";
private static final String CAST_OPTIONS_ATTACK = "CAST";
- public static final HashSet CAST_OPTIONS_KEYWORDS = new HashSet<>();
+ private static final HashSet CAST_OPTIONS_KEYWORDS = new HashSet<>();
static
{
CAST_OPTIONS_KEYWORDS.add(CAST_OPTIONS_ATTACK);
@@ -176,11 +192,139 @@ public class MenuEntrySwapperPlugin extends Plugin
@Inject
private ItemManager itemManager;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private boolean configuringShiftClick = false;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private boolean shiftModifier = false;
+
+ private boolean getWithdrawOne;
+ private String getWithdrawOneItems;
+ private boolean getWithdrawFive;
+ private String getWithdrawFiveItems;
+ private boolean getWithdrawTen;
+ private String getWithdrawTenItems;
+ private boolean getWithdrawX;
+ private String getWithdrawXAmount;
+ private String getWithdrawXItems;
+ private boolean getWithdrawAll;
+ private String getWithdrawAllItems;
+ private boolean swapMax;
+ private boolean teleEquippedCape;
+ private teleEquippedMode telecapeMode;
+ private MaxCapeMode maxMode;
+ private boolean getSwapArdougneCape;
+ private boolean getSwapConstructionCape;
+ private boolean getSwapCraftingCape;
+ private boolean getSwapMagicCape;
+ private boolean getSwapExplorersRing;
+ private boolean swapAdmire;
+ private boolean swapQuestCape;
+ private QuestCapeMode questCapeMode;
+ private String configCustomSwaps;
+ private boolean shiftClickCustomization;
+ private boolean swapCoalBag;
+ private boolean swapBirdhouseEmpty;
+ private boolean swapBones;
+ private boolean swapChase;
+ private boolean swapHarpoon;
+ private boolean swapOccult;
+ private OccultAltarMode swapOccultMode;
+ private boolean swapHomePortal;
+ private HouseMode swapHomePortalMode;
+ private boolean swapPrivate;
+ private boolean swapPick;
+ private boolean swapQuick;
+ private boolean swapBoxTrap;
+ private boolean rockCake;
+ private boolean swapRogueschests;
+ private boolean swapClimbUpDown;
+ private boolean swapStun;
+ private boolean swapSearch;
+ private boolean swapHardWoodGrove;
+ private boolean getRemoveObjects;
+ private String getRemovedObjects;
+ private boolean swapImps;
+ private CharterOption charterOption;
+ private boolean getSwapBuyOne;
+ private String getBuyOneItems;
+ private boolean getSwapBuyFive;
+ private String getBuyFiveItems;
+ private boolean getSwapBuyTen;
+ private String getBuyTenItems;
+ private boolean getSwapBuyFifty;
+ private String getBuyFiftyItems;
+ private boolean getSwapSellOne;
+ private String getSellOneItems;
+ private boolean getSwapSellFive;
+ private String getSellFiveItems;
+ private boolean getSwapSellTen;
+ private String getSellTenItems;
+ private boolean getSwapSellFifty;
+ private String getSellFiftyItems;
+ private boolean getEasyConstruction;
+ private String getEasyConstructionItems;
+ private boolean getSwapSmithing;
+ private boolean getSwapTanning;
+ private boolean getSwapSawmill;
+ private boolean getSwapSawmillPlanks;
+ private boolean getSwapPuro;
+ private boolean swapAssignment;
+ private boolean swapBankExchange;
+ private boolean swapContract;
+ private boolean swapInteract;
+ private boolean swapPickpocket;
+ private boolean swapPay;
+ private boolean swapAbyssTeleport;
+ private boolean swapTrade;
+ private boolean swapTravel;
+ private boolean swapMinigame;
+ private boolean swapPlank;
+ private boolean swapMetamorphosis;
+ private boolean swapEnchant;
+ private boolean swapFairyRing;
+ private FairyRingMode swapFairyRingMode;
+ private boolean swapObelisk;
+ private ObeliskMode swapObeliskMode;
+ private boolean swapTeleportItem;
+ private boolean swapWildernessLever;
+ private boolean swapNexus;
+ private boolean getGamesNecklace;
+ private GamesNecklaceMode getGamesNecklaceMode;
+ private boolean getDuelingRing;
+ private DuelingRingMode getDuelingRingMode;
+ private boolean getGlory;
+ private GloryMode getGloryMode;
+ private boolean getSkillsNecklace;
+ private SkillsNecklaceMode getSkillsNecklaceMode;
+ private boolean getNecklaceofPassage;
+ private NecklaceOfPassageMode getNecklaceofPassageMode;
+ private boolean getDigsitePendant;
+ private DigsitePendantMode getDigsitePendantMode;
+ private boolean getCombatBracelet;
+ private CombatBraceletMode getCombatBraceletMode;
+ private boolean getBurningAmulet;
+ private BurningAmuletMode getBurningAmuletMode;
+ private boolean getXericsTalisman;
+ private XericsTalismanMode getXericsTalismanMode;
+ private boolean getRingofWealth;
+ private RingOfWealthMode getRingofWealthMode;
+ private boolean getSlayerRing;
+ private SlayerRingMode getSlayerRingMode;
+ private boolean hideExamine;
+ private boolean hideTradeWith;
+ private boolean hideReport;
+ private boolean hideLookup;
+ private boolean hideNet;
+ private boolean hideBait;
+ private boolean hideDestroyRunepouch;
+ private boolean hideDestroyCoalbag;
+ private boolean hideDestroyHerbsack;
+ private boolean hideDestroyBoltpouch;
+ private boolean hideDestroyGembag;
+ private boolean hideDropRunecraftingPouch;
+ private boolean getRemoveFreezePlayerToB;
+ private boolean getRemoveFreezePlayerCoX;
@Provides
MenuEntrySwapperConfig provideConfig(ConfigManager configManager)
@@ -191,6 +335,7 @@ public class MenuEntrySwapperPlugin extends Plugin
@Override
public void startUp()
{
+ updateConfig();
addSwaps();
loadConstructionItems(config.getEasyConstructionItems());
@@ -218,8 +363,10 @@ public class MenuEntrySwapperPlugin extends Plugin
{
return;
}
+
+ updateConfig();
- loadConstructionItems(config.getEasyConstructionItems());
+ loadConstructionItems(this.getEasyConstructionItems);
removeSwaps();
addSwaps();
@@ -227,7 +374,7 @@ public class MenuEntrySwapperPlugin extends Plugin
{
if (event.getKey().equals("customSwaps"))
{
- loadCustomSwaps(config.customSwaps());
+ loadCustomSwaps(this.configCustomSwaps);
}
return;
@@ -235,7 +382,7 @@ public class MenuEntrySwapperPlugin extends Plugin
if (event.getKey().equals("shiftClickCustomization"))
{
- if (config.shiftClickCustomization())
+ if (this.shiftClickCustomization)
{
enableCustomization();
}
@@ -315,7 +462,7 @@ public class MenuEntrySwapperPlugin extends Plugin
return;
}
- loadConstructionItems(config.getEasyConstructionItems());
+ loadConstructionItems(this.getEasyConstructionItems);
}
@Subscribe
@@ -345,55 +492,55 @@ public class MenuEntrySwapperPlugin extends Plugin
{
String option = Text.removeTags(entry.getOption()).toLowerCase();
- if (option.contains("trade with") && config.hideTradeWith())
+ if (option.contains("trade with") && this.hideTradeWith)
{
continue;
}
- if (option.contains("lookup") && config.hideLookup())
+ if (option.contains("lookup") && this.hideLookup)
{
continue;
}
- if (option.contains("report") && config.hideReport())
+ if (option.contains("report") && this.hideReport)
{
continue;
}
- if (option.contains("examine") && config.hideExamine())
+ if (option.contains("examine") && this.hideExamine)
{
continue;
}
- if (option.contains("net") && config.hideNet())
+ if (option.contains("net") && this.hideNet)
{
continue;
}
- if (option.contains("bait") && config.hideBait())
+ if (option.contains("bait") && this.hideBait)
{
continue;
}
if (option.contains("destroy"))
{
- if (config.hideDestroyRunepouch() && entry.getTarget().contains("Rune pouch"))
+ if (this.hideDestroyRunepouch && entry.getTarget().contains("Rune pouch"))
{
continue;
}
- if (config.hideDestroyCoalbag() && entry.getTarget().contains("Coal bag"))
+ if (this.hideDestroyCoalbag && entry.getTarget().contains("Coal bag"))
{
continue;
}
- if (config.hideDestroyHerbsack() && entry.getTarget().contains("Herb sack"))
+ if (this.hideDestroyHerbsack && entry.getTarget().contains("Herb sack"))
{
continue;
}
- if (config.hideDestroyBoltpouch() && entry.getTarget().contains("Bolt pouch"))
+ if (this.hideDestroyBoltpouch && entry.getTarget().contains("Bolt pouch"))
{
continue;
}
- if (config.hideDestroyGembag() && entry.getTarget().contains("Gem bag"))
+ if (this.hideDestroyGembag && entry.getTarget().contains("Gem bag"))
{
continue;
}
@@ -401,8 +548,8 @@ public class MenuEntrySwapperPlugin extends Plugin
if (option.contains("drop"))
{
- if (config.hideDropRunecraftingPouch() && (
- entry.getTarget().contains("Small pouch")
+ if (this.hideDropRunecraftingPouch && (
+ entry.getTarget().contains("Small pouch")
|| entry.getTarget().contains("Medium pouch")
|| entry.getTarget().contains("Large pouch")
|| entry.getTarget().contains("Giant pouch")))
@@ -551,9 +698,9 @@ public class MenuEntrySwapperPlugin extends Plugin
if (option.contains("withdraw") || option.contains("deposit"))
{
- if (config.getWithdrawOne())
+ if (this.getWithdrawOne)
{
- for (String item : Text.fromCSV(config.getWithdrawOneItems()))
+ for (String item : Text.fromCSV(this.getWithdrawOneItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -563,9 +710,9 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- if (config.getWithdrawFive())
+ if (this.getWithdrawFive)
{
- for (String item : Text.fromCSV(config.getWithdrawFiveItems()))
+ for (String item : Text.fromCSV(this.getWithdrawFiveItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -575,9 +722,9 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- if (config.getWithdrawTen())
+ if (this.getWithdrawTen)
{
- for (String item : Text.fromCSV(config.getWithdrawTenItems()))
+ for (String item : Text.fromCSV(this.getWithdrawTenItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -587,21 +734,21 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- if (config.getWithdrawX())
+ if (this.getWithdrawX)
{
- for (String item : Text.fromCSV(config.getWithdrawXItems()))
+ for (String item : Text.fromCSV(this.getWithdrawXItems))
{
if (target.equals(Text.standardize(item)))
{
- swap(client, "Withdraw-" + config.getWithdrawXAmount(), option, target);
- swap(client, "Deposit-" + config.getWithdrawXAmount(), option, target);
+ swap(client, "Withdraw-" + this.getWithdrawXAmount, option, target);
+ swap(client, "Deposit-" + this.getWithdrawXAmount, option, target);
}
}
}
- if (config.getWithdrawAll())
+ if (this.getWithdrawAll)
{
- for (String item : Text.fromCSV(config.getWithdrawAllItems()))
+ for (String item : Text.fromCSV(this.getWithdrawAllItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -613,13 +760,11 @@ public class MenuEntrySwapperPlugin extends Plugin
}
if ((option.contains("buy") || option.contains("value")) && Arrays.stream(entries).anyMatch(menuEntry ->
+ menuEntry.getOption().toLowerCase().contains("buy")))
{
- return menuEntry.getOption().toLowerCase().contains("buy");
- }))
- {
- if (config.getSwapBuyOne() && !config.getBuyOneItems().equals(""))
+ if (this.getSwapBuyOne && !this.getBuyOneItems.equals(""))
{
- for (String item : Text.fromCSV(config.getBuyOneItems()))
+ for (String item : Text.fromCSV(this.getBuyOneItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -628,9 +773,9 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- if (config.getSwapBuyFive() && !config.getBuyFiveItems().equals(""))
+ if (this.getSwapBuyFive && !this.getBuyFiveItems.equals(""))
{
- for (String item : Text.fromCSV(config.getBuyFiveItems()))
+ for (String item : Text.fromCSV(this.getBuyFiveItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -639,9 +784,9 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- if (config.getSwapBuyTen() && !config.getBuyTenItems().equals(""))
+ if (this.getSwapBuyTen && !this.getBuyTenItems.equals(""))
{
- for (String item : Text.fromCSV(config.getBuyTenItems()))
+ for (String item : Text.fromCSV(this.getBuyTenItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -650,9 +795,9 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- if (config.getSwapBuyFifty() && !config.getBuyFiftyItems().equals(""))
+ if (this.getSwapBuyFifty && !this.getBuyFiftyItems.equals(""))
{
- for (String item : Text.fromCSV(config.getBuyFiftyItems()))
+ for (String item : Text.fromCSV(this.getBuyFiftyItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -662,13 +807,11 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
else if ((option.contains("sell") || option.contains("value")) && Arrays.stream(entries).anyMatch(menuEntry ->
+ menuEntry.getOption().toLowerCase().contains("sell")))
{
- return menuEntry.getOption().toLowerCase().contains("sell");
- }))
- {
- if (config.getSwapSellOne() && !config.getSellOneItems().equals(""))
+ if (this.getSwapSellOne && !this.getSellOneItems.equals(""))
{
- for (String item : Text.fromCSV(config.getSellOneItems()))
+ for (String item : Text.fromCSV(this.getSellOneItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -677,9 +820,9 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- if (config.getSwapSellFive() && !Strings.isNullOrEmpty(config.getSellFiveItems()))
+ if (this.getSwapSellFive && !Strings.isNullOrEmpty(this.getSellFiveItems))
{
- for (String item : Text.fromCSV(config.getSellFiveItems()))
+ for (String item : Text.fromCSV(this.getSellFiveItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -688,9 +831,9 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- if (config.getSwapSellTen() && !Strings.isNullOrEmpty(config.getSellTenItems()))
+ if (this.getSwapSellTen && !Strings.isNullOrEmpty(this.getSellTenItems))
{
- for (String item : Text.fromCSV(config.getSellTenItems()))
+ for (String item : Text.fromCSV(this.getSellTenItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -699,9 +842,9 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- if (config.getSwapSellFifty() && !Strings.isNullOrEmpty(config.getSellFiftyItems()))
+ if (this.getSwapSellFifty && !Strings.isNullOrEmpty(this.getSellFiftyItems))
{
- for (String item : Text.fromCSV(config.getSellFiftyItems()))
+ for (String item : Text.fromCSV(this.getSellFiftyItems))
{
if (target.equals(Text.standardize(item)))
{
@@ -711,9 +854,9 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- if (config.getRemoveObjects() && !config.getRemovedObjects().equals(""))
+ if (this.getRemoveObjects && !this.getRemovedObjects.equals(""))
{
- for (String removed : Text.fromCSV(config.getRemovedObjects()))
+ for (String removed : Text.fromCSV(this.getRemovedObjects))
{
removed = Text.standardize(removed);
if (target.contains("(") && target.split(" \\(")[0].equals(removed))
@@ -737,7 +880,7 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- if (config.getSwapPuro() && isPuroPuro())
+ if (this.getSwapPuro && isPuroPuro())
{
if (event.getType() == WALK.getId())
{
@@ -756,7 +899,7 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- else if (config.getSwapSmithing() && option.contains("smith"))
+ else if (this.getSwapSmithing && option.contains("smith"))
{
if (option.equalsIgnoreCase("Smith 1"))
{
@@ -768,17 +911,17 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- else if (config.getSwapTanning() && option.equalsIgnoreCase("Tan 1"))
+ else if (this.getSwapTanning && option.equalsIgnoreCase("Tan 1"))
{
swap(client, "Tan All", option, target);
}
- else if (config.getSwapSawmill() && target.equalsIgnoreCase("Sawmill operator"))
+ else if (this.getSwapSawmill && target.equalsIgnoreCase("Sawmill operator"))
{
swap(client, "Buy-plank", option, target);
}
- else if (config.getSwapSawmillPlanks() && option.equalsIgnoreCase("Buy 1"))
+ else if (this.getSwapSawmillPlanks && option.equalsIgnoreCase("Buy 1"))
{
swap(client, "Buy All", option, target);
}
@@ -788,28 +931,28 @@ public class MenuEntrySwapperPlugin extends Plugin
swap(client, "Clear", option, target);
}
- else if (target.contains("ardougne cloak") && config.getSwapArdougneCape())
+ else if (target.contains("ardougne cloak") && this.getSwapArdougneCape)
{
swap(client, "Kandarin Monastery", option, target);
swap(client, "Monastery Teleport", option, target);
}
- else if (target.contains("crafting cape") && config.getSwapCraftingCape())
+ else if (target.contains("crafting cape") && this.getSwapCraftingCape)
{
swap(client, "Teleport", option, target);
}
- else if (target.contains("construct. cape") && config.getSwapConstructionCape())
+ else if (target.contains("construct. cape") && this.getSwapConstructionCape)
{
swap(client, "Tele to poh", option, target);
}
- else if (target.contains("magic cape") && config.getSwapMagicCape())
+ else if (target.contains("magic cape") && this.getSwapMagicCape)
{
swap(client, "Spellbook", option, target);
}
- else if (target.contains("explorer's ring") && config.getSwapExplorersRing())
+ else if (target.contains("explorer's ring") && this.getSwapExplorersRing)
{
swap(client, "Teleport", option, target);
}
@@ -821,7 +964,7 @@ public class MenuEntrySwapperPlugin extends Plugin
return;
}
- if (config.swapImps() && target.contains("impling"))
+ if (this.swapImps && target.contains("impling"))
{
if (client.getItemContainer(InventoryID.BANK) != null)
@@ -851,59 +994,61 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
}
- if (target.equals("eclectic impling jar"))
+ switch (target)
{
- if (client.getItemContainer(InventoryID.INVENTORY) != null)
- {
- for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
+ case "eclectic impling jar":
+ if (client.getItemContainer(InventoryID.INVENTORY) != null)
{
- invItemNames.add(client.getItemDefinition((i.getId())).getName());
+ for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
+ {
+ invItemNames.add(client.getItemDefinition((i.getId())).getName());
+ }
+ if ((invItemNames.contains("Clue scroll (medium)") || bankItemNames.contains("Clue scroll (medium)")))
+ {
+ menuManager.addSwap("loot", target, "use");
+ }
+ else
+ {
+ menuManager.removeSwaps(target);
+ }
}
- if ((invItemNames.contains("Clue scroll (medium)") || bankItemNames.contains("Clue scroll (medium)")))
+ break;
+ case "magpie impling jar":
+ case "nature impling jar":
+ case "ninja impling jar":
+ if (client.getItemContainer(InventoryID.INVENTORY) != null)
{
- menuManager.addSwap("loot", target, "use");
+ for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
+ {
+ invItemNames.add(client.getItemDefinition((i.getId())).getName());
+ }
+ if ((invItemNames.contains("Clue scroll (hard)") || bankItemNames.contains("Clue scroll (hard)")))
+ {
+ menuManager.addSwap("loot", target, "use");
+ }
+ else
+ {
+ menuManager.removeSwaps(target);
+ }
}
- else
+ break;
+ case "dragon impling jar":
+ if (client.getItemContainer(InventoryID.INVENTORY) != null)
{
- menuManager.removeSwaps(target);
+ for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
+ {
+ invItemNames.add(client.getItemDefinition((i.getId())).getName());
+ }
+ if ((invItemNames.contains("Clue scroll (elite)") || bankItemNames.contains("Clue scroll (elite)")))
+ {
+ menuManager.addSwap("loot", target, "use");
+ }
+ else
+ {
+ menuManager.removeSwaps(target);
+ }
}
- }
- }
- else if (target.equals("magpie impling jar") || (target.equals("nature impling jar")) || (target.equals("ninja impling jar")))
- {
- if (client.getItemContainer(InventoryID.INVENTORY) != null)
- {
- for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
- {
- invItemNames.add(client.getItemDefinition((i.getId())).getName());
- }
- if ((invItemNames.contains("Clue scroll (hard)") || bankItemNames.contains("Clue scroll (hard)")))
- {
- menuManager.addSwap("loot", target, "use");
- }
- else
- {
- menuManager.removeSwaps(target);
- }
- }
- }
- else if (target.equals("dragon impling jar"))
- {
- if (client.getItemContainer(InventoryID.INVENTORY) != null)
- {
- for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
- {
- invItemNames.add(client.getItemDefinition((i.getId())).getName());
- }
- if ((invItemNames.contains("Clue scroll (elite)") || bankItemNames.contains("Clue scroll (elite)")))
- {
- menuManager.addSwap("loot", target, "use");
- }
- else
- {
- menuManager.removeSwaps(target);
- }
- }
+ break;
}
}
@@ -918,8 +1063,8 @@ public class MenuEntrySwapperPlugin extends Plugin
Player player = players[identifier];
if (player != null)
{
- if (((config.getRemoveFreezePlayerCoX() && client.getVar(Varbits.IN_RAID) == 1)
- || (config.getRemoveFreezePlayerToB() && client.getVar(Varbits.THEATRE_OF_BLOOD) == 2))
+ if (((this.getRemoveFreezePlayerCoX && client.getVar(Varbits.IN_RAID) == 1)
+ || (this.getRemoveFreezePlayerToB && client.getVar(Varbits.THEATRE_OF_BLOOD) == 2))
&& (player.isFriend() || player.isClanMember())
&& CAST_OPTIONS_KEYWORDS.contains(pOptionToReplace))
{
@@ -931,27 +1076,27 @@ public class MenuEntrySwapperPlugin extends Plugin
if (option.equals("talk-to"))
{
- if (config.swapPickpocket())
+ if (this.swapPickpocket)
{
swap(client, "pickpocket", option, target, true);
}
- if (config.swapHardWoodGrove() && target.contains("rionasta"))
+ if (this.swapHardWoodGrove && target.contains("rionasta"))
{
swap(client, "send-parcel", option, target, true);
}
- if (config.swapBankExchange())
+ if (this.swapBankExchange)
{
swap(client, "bank", option, target, true);
swap(client, "exchange", option, target, true);
}
- if (config.swapContract())
+ if (this.swapContract)
{
swap(client, "contract", option, target, true);
}
- if (config.swapInteract())
+ if (this.swapInteract)
{
swap(client, "repairs", option, target, true);
swap(client, "claim-slime", option, target, true);
@@ -962,24 +1107,24 @@ public class MenuEntrySwapperPlugin extends Plugin
}
// make sure assignment swap is higher priority than trade swap for slayer masters
- if (config.swapAssignment())
+ if (this.swapAssignment)
{
swap(client, "assignment", option, target, true);
}
- if (config.swapPlank())
+ if (this.swapPlank)
{
swap(client, "buy-plank", option, target, true);
}
- if (config.swapTrade() && (!(target.equals("trader crewmember") || target.equals("trader stan")) || config.charterOption().equals(CharterOption.TRADE)))
+ if (this.swapTrade && (!(target.equals("trader crewmember") || target.equals("trader stan")) || this.charterOption.equals(CharterOption.TRADE)))
{
swap(client, "trade", option, target, true);
swap(client, "trade-with", option, target, true);
swap(client, "shop", option, target, true);
}
- if (config.swapMinigame())
+ if (this.swapMinigame)
{
swap(client, "story", option, target, true);
swap(client, "escort", option, target, true);
@@ -987,7 +1132,7 @@ public class MenuEntrySwapperPlugin extends Plugin
swap(client, "start-minigame", option, target, true);
}
- if (config.swapTravel())
+ if (this.swapTravel)
{
swap(client, "travel", option, target, true);
swap(client, "pay-fare", option, target, true);
@@ -1000,83 +1145,83 @@ public class MenuEntrySwapperPlugin extends Plugin
swap(client, "follow", option, target, true);
swap(client, "transport", option, target, true);
- if (config.swapAbyssTeleport() && target.contains("mage of zamorak"))
+ if (this.swapAbyssTeleport && target.contains("mage of zamorak"))
{
swap(client, "teleport", option, target, true);
}
- if (!(target.equals("trader crewmember") || target.equals("trader stan")) || config.charterOption().equals(CharterOption.CHARTER))
+ if (!(target.equals("trader crewmember") || target.equals("trader stan")) || this.charterOption.equals(CharterOption.CHARTER))
{
swap(client, "charter", option, target, true);
}
}
- if (config.swapPay())
+ if (this.swapPay)
{
swap(client, "pay", option, target, true);
swap(client, "pay (", option, target, false);
}
- if (config.swapQuick())
+ if (this.swapQuick)
{
swap(client, "quick-travel", option, target, true);
}
- if (config.swapEnchant())
+ if (this.swapEnchant)
{
swap(client, "enchant", option, target, true);
}
}
- else if (config.swapWildernessLever() && target.equals("lever") && option.equals("ardougne"))
+ else if (this.swapWildernessLever && target.equals("lever") && option.equals("ardougne"))
{
swap(client, "edgeville", option, target, true);
}
- else if (config.swapMetamorphosis() && target.contains("baby chinchompa"))
+ else if (this.swapMetamorphosis && target.contains("baby chinchompa"))
{
swap(client, "metamorphosis", option, target, true);
}
- else if (config.swapStun() && target.contains("hoop snake"))
+ else if (this.swapStun && target.contains("hoop snake"))
{
swap(client, "stun", option, target, true);
}
- else if (config.swapTravel() && option.equals("pass") && target.equals("energy barrier"))
+ else if (this.swapTravel && option.equals("pass") && target.equals("energy barrier"))
{
swap(client, "pay-toll(2-ecto)", option, target, true);
}
- else if (config.swapTravel() && option.equals("open") && target.equals("gate"))
+ else if (this.swapTravel && option.equals("open") && target.equals("gate"))
{
swap(client, "pay-toll(10gp)", option, target, true);
}
- else if (config.swapHardWoodGrove() && option.equals("open") && target.equals("hardwood grove doors"))
+ else if (this.swapHardWoodGrove && option.equals("open") && target.equals("hardwood grove doors"))
{
swap(client, "quick-pay(100)", option, target, true);
}
- else if (config.swapTravel() && option.equals("inspect") && target.equals("trapdoor"))
+ else if (this.swapTravel && option.equals("inspect") && target.equals("trapdoor"))
{
swap(client, "travel", option, target, true);
}
- else if (config.swapHarpoon() && option.equals("cage"))
+ else if (this.swapHarpoon && option.equals("cage"))
{
swap(client, "harpoon", option, target, true);
}
- else if (config.swapHarpoon() && (option.equals("big net") || option.equals("net")))
+ else if (this.swapHarpoon && (option.equals("big net") || option.equals("net")))
{
swap(client, "harpoon", option, target, true);
}
- else if (config.swapOccultMode() != OccultAltarMode.VENERATE && option.equals("venerate"))
+ else if (this.swapOccultMode != OccultAltarMode.VENERATE && option.equals("venerate"))
{
- switch (config.swapOccultMode())
+ switch (this.swapOccultMode)
{
case VENERATE:
swap(client, "Venerate", option, target, true);
@@ -1093,9 +1238,9 @@ public class MenuEntrySwapperPlugin extends Plugin
}
- else if (config.swapObeliskMode() != ObeliskMode.ACTIVATE && option.equals("activate"))
+ else if (this.swapObeliskMode != ObeliskMode.ACTIVATE && option.equals("activate"))
{
- switch (config.swapObeliskMode())
+ switch (this.swapObeliskMode)
{
case ACTIVATE:
swap(client, "activate", option, target, true);
@@ -1109,9 +1254,9 @@ public class MenuEntrySwapperPlugin extends Plugin
}
}
- else if (config.swapHomePortalMode() != HouseMode.ENTER && option.equals("enter"))
+ else if (this.swapHomePortalMode != HouseMode.ENTER && option.equals("enter"))
{
- switch (config.swapHomePortalMode())
+ switch (this.swapHomePortalMode)
{
case HOME:
swap(client, "home", option, target, true);
@@ -1124,101 +1269,101 @@ public class MenuEntrySwapperPlugin extends Plugin
break;
}
}
- else if (config.swapFairyRingMode() != FairyRingMode.OFF && config.swapFairyRingMode() != FairyRingMode.ZANARIS
+ else if (this.swapFairyRingMode != FairyRingMode.OFF && this.swapFairyRingMode != FairyRingMode.ZANARIS
&& (option.equals("zanaris") || option.equals("configure") || option.equals("tree")))
{
- if (config.swapFairyRingMode() == FairyRingMode.LAST_DESTINATION)
+ if (this.swapFairyRingMode == FairyRingMode.LAST_DESTINATION)
{
swap(client, "last-destination", option, target, false);
}
- else if (config.swapFairyRingMode() == FairyRingMode.CONFIGURE)
+ else if (this.swapFairyRingMode == FairyRingMode.CONFIGURE)
{
swap(client, "configure", option, target, false);
}
}
- else if (config.swapFairyRingMode() == FairyRingMode.ZANARIS && option.equals("tree"))
+ else if (this.swapFairyRingMode == FairyRingMode.ZANARIS && option.equals("tree"))
{
swap(client, "zanaris", option, target, false);
}
- else if (config.swapBoxTrap() && (option.equals("check") || option.equals("dismantle")))
+ else if (this.swapBoxTrap && (option.equals("check") || option.equals("dismantle")))
{
swap(client, "reset", option, target, true);
}
- else if (config.swapBoxTrap() && option.equals("take"))
+ else if (this.swapBoxTrap && option.equals("take"))
{
swap(client, "lay", option, target, true);
swap(client, "activate", option, target, true);
}
- else if (config.swapChase() && option.equals("pick-up"))
+ else if (this.swapChase && option.equals("pick-up"))
{
swap(client, "chase", option, target, true);
}
- else if (config.swapBirdhouseEmpty() && option.equals("interact") && target.contains("birdhouse"))
+ else if (this.swapBirdhouseEmpty && option.equals("interact") && target.contains("birdhouse"))
{
swap(client, "empty", option, target, true);
}
- else if (config.swapQuick() && option.equals("ring"))
+ else if (this.swapQuick && option.equals("ring"))
{
swap(client, "quick-start", option, target, true);
}
- else if (config.swapQuick() && option.equals("pass"))
+ else if (this.swapQuick && option.equals("pass"))
{
swap(client, "quick-pass", option, target, true);
}
- else if (config.swapQuick() && option.equals("open"))
+ else if (this.swapQuick && option.equals("open"))
{
swap(client, "quick-open", option, target, true);
}
- else if (config.swapQuick() && option.equals("enter"))
+ else if (this.swapQuick && option.equals("enter"))
{
swap(client, "quick-enter", option, target, true);
}
- else if (config.swapQuick() && option.equals("leave tomb"))
+ else if (this.swapQuick && option.equals("leave tomb"))
{
swap(client, "quick-leave", option, target, true);
}
- else if (config.swapAdmire() && option.equals("admire"))
+ else if (this.swapAdmire && option.equals("admire"))
{
swap(client, "teleport", option, target, true);
swap(client, "spellbook", option, target, true);
swap(client, "perks", option, target, true);
}
- else if (config.swapPrivate() && option.equals("shared"))
+ else if (this.swapPrivate && option.equals("shared"))
{
swap(client, "private", option, target, true);
}
- else if (config.swapPick() && option.equals("pick"))
+ else if (this.swapPick && option.equals("pick"))
{
swap(client, "pick-lots", option, target, true);
}
- else if (config.swapSearch() && (option.equals("close") || option.equals("shut")))
+ else if (this.swapSearch && (option.equals("close") || option.equals("shut")))
{
swap(client, "search", option, target, true);
}
- else if (config.swapRogueschests() && target.contains("chest"))
+ else if (this.swapRogueschests && target.contains("chest"))
{
swap(client, "search for traps", option, target, true);
}
- else if (config.rockCake() && option.equals("eat"))
+ else if (this.rockCake && option.equals("eat"))
{
swap(client, "guzzle", option, target, true);
}
- else if (config.shiftClickCustomization() && shiftModifier && !option.equals("use"))
+ else if (this.shiftClickCustomization && shiftModifier && !option.equals("use"))
{
Integer customOption = getSwapConfig(eventId);
@@ -1229,20 +1374,20 @@ public class MenuEntrySwapperPlugin extends Plugin
}
// Put all item-related swapping after shift-click
- else if (config.swapTeleportItem() && (option.equals("wear") || option.equals("wield")))
+ else if (this.swapTeleportItem && (option.equals("wear") || option.equals("wield")))
{
swap(client, "rub", option, target, true);
swap(client, "teleport", option, target, true);
}
- else if (config.swapCoalBag() && option.contains("deposit") && target.equals("coal bag"))
+ else if (this.swapCoalBag && option.contains("deposit") && target.equals("coal bag"))
{
swap(client, "empty", option, target, true);
}
- else if (config.swapBones() && option.equals("bury"))
+ else if (this.swapBones && option.equals("bury"))
{
swap(client, "use", option, target, true);
}
- else if (config.swapNexus() && target.contains("portal nexus"))
+ else if (this.swapNexus && target.contains("portal nexus"))
{
swap(client, "teleport menu", option, target, true);
}
@@ -1308,7 +1453,7 @@ public class MenuEntrySwapperPlugin extends Plugin
{
if (!str.startsWith("//"))
{
- sb.append(str + "\n");
+ sb.append(str).append("\n");
}
}
@@ -1370,76 +1515,76 @@ public class MenuEntrySwapperPlugin extends Plugin
private void addSwaps()
{
- if (config.getBurningAmulet())
+ if (this.getBurningAmulet)
{
- menuManager.addSwap("remove", "burning amulet", config.getBurningAmuletMode().toString());
+ menuManager.addSwap("remove", "burning amulet", this.getBurningAmuletMode.toString());
}
- if (config.teleEquippedCape())
+ if (this.teleEquippedCape)
{
- menuManager.addSwap("remove", "tele to poh", config.telecapeMode().toString());
- menuManager.addSwap("remove", "teleport", config.telecapeMode().toString());
+ menuManager.addSwap("remove", "tele to poh", this.telecapeMode.toString());
+ menuManager.addSwap("remove", "teleport", this.telecapeMode.toString());
}
- if (config.getCombatBracelet())
+ if (this.getCombatBracelet)
{
- menuManager.addSwap("remove", "combat bracelet", config.getCombatBraceletMode().toString());
+ menuManager.addSwap("remove", "combat bracelet", this.getCombatBraceletMode.toString());
}
- if (config.getGamesNecklace())
+ if (this.getGamesNecklace)
{
- menuManager.addSwap("remove", "games necklace", config.getGamesNecklaceMode().toString());
+ menuManager.addSwap("remove", "games necklace", this.getGamesNecklaceMode.toString());
}
- if (config.getDuelingRing())
+ if (this.getDuelingRing)
{
- menuManager.addSwap("remove", "ring of dueling", config.getDuelingRingMode().toString());
+ menuManager.addSwap("remove", "ring of dueling", this.getDuelingRingMode.toString());
}
- if (config.getGlory())
+ if (this.getGlory)
{
- menuManager.addSwap("remove", "amulet of glory", config.getGloryMode().toString());
- menuManager.addSwap("remove", "amulet of eternal glory", config.getGloryMode().toString());
+ menuManager.addSwap("remove", "amulet of glory", this.getGloryMode.toString());
+ menuManager.addSwap("remove", "amulet of eternal glory", this.getGloryMode.toString());
}
- if (config.getSkillsNecklace())
+ if (this.getSkillsNecklace)
{
- menuManager.addSwap("remove", "skills necklace", config.getSkillsNecklaceMode().toString());
+ menuManager.addSwap("remove", "skills necklace", this.getSkillsNecklaceMode.toString());
}
- if (config.getNecklaceofPassage())
+ if (this.getNecklaceofPassage)
{
- menuManager.addSwap("remove", "necklace of passage", config.getNecklaceofPassageMode().toString());
+ menuManager.addSwap("remove", "necklace of passage", this.getNecklaceofPassageMode.toString());
}
- if (config.getDigsitePendant())
+ if (this.getDigsitePendant)
{
- menuManager.addSwap("remove", "digsite pendant", config.getDigsitePendantMode().toString());
+ menuManager.addSwap("remove", "digsite pendant", this.getDigsitePendantMode.toString());
}
- if (config.getSlayerRing())
+ if (this.getSlayerRing)
{
- menuManager.addSwap("remove", "slayer ring", config.getSlayerRingMode().toString());
- menuManager.addSwap("remove", "slayer ring (eternal)", config.getSlayerRingMode().toString());
+ menuManager.addSwap("remove", "slayer ring", this.getSlayerRingMode.toString());
+ menuManager.addSwap("remove", "slayer ring (eternal)", this.getSlayerRingMode.toString());
}
- if (config.getXericsTalisman())
+ if (this.getXericsTalisman)
{
- menuManager.addSwap("remove", "xeric's talisman", config.getXericsTalismanMode().toString());
+ menuManager.addSwap("remove", "xeric's talisman", this.getXericsTalismanMode.toString());
}
- if (config.getRingofWealth())
+ if (this.getRingofWealth)
{
- menuManager.addSwap("remove", "ring of wealth", config.getRingofWealthMode().toString());
+ menuManager.addSwap("remove", "ring of wealth", this.getRingofWealthMode.toString());
}
- if (config.swapMax())
+ if (this.swapMax)
{
- menuManager.addSwap("remove", "max cape", config.maxMode().toString());
+ menuManager.addSwap("remove", "max cape", this.maxMode.toString());
}
- if (config.swapQuestCape())
+ if (this.swapQuestCape)
{
- menuManager.addSwap("remove", "quest point cape", config.questCapeMode().toString());
+ menuManager.addSwap("remove", "quest point cape", this.questCapeMode.toString());
}
}
@@ -1509,7 +1654,7 @@ public class MenuEntrySwapperPlugin extends Plugin
leftClickConstructionItems.clear();
}
- if (config.getEasyConstruction() &&
+ if (this.getEasyConstruction &&
!Strings.isNullOrEmpty(from) &&
buildingMode)
{
@@ -1530,7 +1675,7 @@ public class MenuEntrySwapperPlugin extends Plugin
void startShift()
{
- if (!config.swapClimbUpDown())
+ if (!this.swapClimbUpDown)
{
return;
}
@@ -1545,7 +1690,7 @@ public class MenuEntrySwapperPlugin extends Plugin
void startControl()
{
- if (!config.swapClimbUpDown())
+ if (!this.swapClimbUpDown)
{
return;
}
@@ -1600,4 +1745,135 @@ public class MenuEntrySwapperPlugin extends Plugin
}
return null;
}
+
+ private void updateConfig()
+ {
+ this.getWithdrawOne = config.getWithdrawOne();
+ this.getWithdrawOneItems = config.getWithdrawOneItems();
+ this.getWithdrawFive = config.getWithdrawFive();
+ this.getWithdrawFiveItems = config.getWithdrawFiveItems();
+ this.getWithdrawTen = config.getWithdrawTen();
+ this.getWithdrawTenItems = config.getWithdrawTenItems();
+ this.getWithdrawX = config.getWithdrawX();
+ this.getWithdrawXAmount = config.getWithdrawXAmount();
+ this.getWithdrawXItems = config.getWithdrawXItems();
+ this.getWithdrawAll = config.getWithdrawAll();
+ this.getWithdrawAllItems = config.getWithdrawAllItems();
+ this.swapMax = config.swapMax();
+ this.teleEquippedCape = config.teleEquippedCape();
+ this.telecapeMode = config.telecapeMode();
+ this.maxMode = config.maxMode();
+ this.getSwapArdougneCape = config.getSwapArdougneCape();
+ this.getSwapConstructionCape = config.getSwapConstructionCape();
+ this.getSwapCraftingCape = config.getSwapCraftingCape();
+ this.getSwapMagicCape = config.getSwapMagicCape();
+ this.getSwapExplorersRing = config.getSwapExplorersRing();
+ this.swapAdmire = config.swapAdmire();
+ this.swapQuestCape = config.swapQuestCape();
+ this.questCapeMode = config.questCapeMode();
+ this.configCustomSwaps = config.customSwaps();
+ this.shiftClickCustomization = config.shiftClickCustomization();
+ this.swapCoalBag = config.swapCoalBag();
+ this.swapBirdhouseEmpty = config.swapBirdhouseEmpty();
+ this.swapBones = config.swapBones();
+ this.swapChase = config.swapChase();
+ this.swapHarpoon = config.swapHarpoon();
+ this.swapOccult = config.swapOccult();
+ this.swapOccultMode = config.swapOccultMode();
+ this.swapHomePortal = config.swapHomePortal();
+ this.swapHomePortalMode = config.swapHomePortalMode();
+ this.swapPrivate = config.swapPrivate();
+ this.swapPick = config.swapPick();
+ this.swapQuick = config.swapQuick();
+ this.swapBoxTrap = config.swapBoxTrap();
+ this.rockCake = config.rockCake();
+ this.swapRogueschests = config.swapRogueschests();
+ this.swapClimbUpDown = config.swapClimbUpDown();
+ this.swapStun = config.swapStun();
+ this.swapSearch = config.swapSearch();
+ this.swapHardWoodGrove = config.swapHardWoodGrove();
+ this.getRemoveObjects = config.getRemoveObjects();
+ this.getRemovedObjects = config.getRemovedObjects();
+ this.swapImps = config.swapImps();
+ this.charterOption = config.charterOption();
+ this.getSwapBuyOne = config.getSwapBuyOne();
+ this.getBuyOneItems = config.getBuyOneItems();
+ this.getSwapBuyFive = config.getSwapBuyFive();
+ this.getBuyFiveItems = config.getBuyFiveItems();
+ this.getSwapBuyTen = config.getSwapBuyTen();
+ this.getBuyTenItems = config.getBuyTenItems();
+ this.getSwapBuyFifty = config.getSwapBuyFifty();
+ this.getBuyFiftyItems = config.getBuyFiftyItems();
+ this.getSwapSellOne = config.getSwapSellOne();
+ this.getSellOneItems = config.getSellOneItems();
+ this.getSwapSellFive = config.getSwapSellFive();
+ this.getSellFiveItems = config.getSellFiveItems();
+ this.getSwapSellTen = config.getSwapSellTen();
+ this.getSellTenItems = config.getSellTenItems();
+ this.getSwapSellFifty = config.getSwapSellFifty();
+ this.getSellFiftyItems = config.getSellFiftyItems();
+ this.getEasyConstruction = config.getEasyConstruction();
+ this.getEasyConstructionItems = config.getEasyConstructionItems();
+ this.getSwapSmithing = config.getSwapSmithing();
+ this.getSwapTanning = config.getSwapTanning();
+ this.getSwapSawmill = config.getSwapSawmill();
+ this.getSwapSawmillPlanks = config.getSwapSawmillPlanks();
+ this.getSwapPuro = config.getSwapPuro();
+ this.swapAssignment = config.swapAssignment();
+ this.swapBankExchange = config.swapBankExchange();
+ this.swapContract = config.swapContract();
+ this.swapInteract = config.swapInteract();
+ this.swapPickpocket = config.swapPickpocket();
+ this.swapPay = config.swapPay();
+ this.swapAbyssTeleport = config.swapAbyssTeleport();
+ this.swapTrade = config.swapTrade();
+ this.swapTravel = config.swapTravel();
+ this.swapMinigame = config.swapMinigame();
+ this.swapPlank = config.swapPlank();
+ this.swapMetamorphosis = config.swapMetamorphosis();
+ this.swapEnchant = config.swapEnchant();
+ this.swapFairyRing = config.swapFairyRing();
+ this.swapFairyRingMode = config.swapFairyRingMode();
+ this.swapObelisk = config.swapObelisk();
+ this.swapObeliskMode = config.swapObeliskMode();
+ this.swapTeleportItem = config.swapTeleportItem();
+ this.swapWildernessLever = config.swapWildernessLever();
+ this.swapNexus = config.swapNexus();
+ this.getGamesNecklace = config.getGamesNecklace();
+ this.getGamesNecklaceMode = config.getGamesNecklaceMode();
+ this.getDuelingRing = config.getDuelingRing();
+ this.getDuelingRingMode = config.getDuelingRingMode();
+ this.getGlory = config.getGlory();
+ this.getGloryMode = config.getGloryMode();
+ this.getSkillsNecklace = config.getSkillsNecklace();
+ this.getSkillsNecklaceMode = config.getSkillsNecklaceMode();
+ this.getNecklaceofPassage = config.getNecklaceofPassage();
+ this.getNecklaceofPassageMode = config.getNecklaceofPassageMode();
+ this.getDigsitePendant = config.getDigsitePendant();
+ this.getDigsitePendantMode = config.getDigsitePendantMode();
+ this.getCombatBracelet = config.getCombatBracelet();
+ this.getCombatBraceletMode = config.getCombatBraceletMode();
+ this.getBurningAmulet = config.getBurningAmulet();
+ this.getBurningAmuletMode = config.getBurningAmuletMode();
+ this.getXericsTalisman = config.getXericsTalisman();
+ this.getXericsTalismanMode = config.getXericsTalismanMode();
+ this.getRingofWealth = config.getRingofWealth();
+ this.getRingofWealthMode = config.getRingofWealthMode();
+ this.getSlayerRing = config.getSlayerRing();
+ this.getSlayerRingMode = config.getSlayerRingMode();
+ this.hideExamine = config.hideExamine();
+ this.hideTradeWith = config.hideTradeWith();
+ this.hideReport = config.hideReport();
+ this.hideLookup = config.hideLookup();
+ this.hideNet = config.hideNet();
+ this.hideBait = config.hideBait();
+ this.hideDestroyRunepouch = config.hideDestroyRunepouch();
+ this.hideDestroyCoalbag = config.hideDestroyCoalbag();
+ this.hideDestroyHerbsack = config.hideDestroyHerbsack();
+ this.hideDestroyBoltpouch = config.hideDestroyBoltpouch();
+ this.hideDestroyGembag = config.hideDestroyGembag();
+ this.hideDropRunecraftingPouch = config.hideDropRunecraftingPouch();
+ this.getRemoveFreezePlayerToB = config.getRemoveFreezePlayerToB();
+ this.getRemoveFreezePlayerCoX = config.getRemoveFreezePlayerCoX();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java
index 5df37f45b2..c258bfb30a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java
@@ -26,8 +26,10 @@ package net.runelite.client.plugins.menuentryswapper;
import java.awt.event.KeyEvent;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.input.KeyListener;
+@Singleton
public class ShiftClickInputListener implements KeyListener
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java
index 148d7e4255..766b80c434 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.metronome;
import com.google.inject.Provides;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.SoundEffectVolume;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
@@ -50,6 +51,7 @@ import net.runelite.client.plugins.PluginDescriptor;
tags = {"skilling", "tick", "timers"},
enabledByDefault = false
)
+@Singleton
public class MetronomePlugin extends Plugin
{
@Inject
@@ -63,6 +65,14 @@ public class MetronomePlugin extends Plugin
private Clip tickClip;
private Clip tockClip;
+ private int tickCount;
+ private boolean enableTock;
+ private int tockNumber;
+ private int tickOffset;
+ private String tickPath;
+ private String tockPath;
+ private int volume;
+
@Provides
MetronomePluginConfiguration provideConfig(ConfigManager configManager)
{
@@ -90,7 +100,7 @@ public class MetronomePlugin extends Plugin
Clip audioClip = AudioSystem.getClip();
audioClip.open(audioStream);
FloatControl gainControl = (FloatControl) audioClip.getControl(FloatControl.Type.MASTER_GAIN);
- float gainValue = (((float) config.volume()) * 40f / 100f) - 35f;
+ float gainValue = (((float) this.volume) * 40f / 100f) - 35f;
gainControl.setValue(gainValue);
return audioClip;
}
@@ -105,8 +115,10 @@ public class MetronomePlugin extends Plugin
@Override
protected void startUp()
{
- tickClip = GetAudioClip(config.tickPath());
- tockClip = GetAudioClip(config.tockPath());
+ updateConfig();
+
+ tickClip = GetAudioClip(this.tickPath);
+ tockClip = GetAudioClip(this.tockPath);
}
@Override
@@ -125,9 +137,16 @@ public class MetronomePlugin extends Plugin
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
+ if (!event.getGroup().equals("metronome"))
+ {
+ return;
+ }
+
+ updateConfig();
+
if (event.getKey().equals("volume"))
{
- float gainValue = (((float) config.volume()) * 40f / 100f) - 35f;
+ float gainValue = (((float) this.volume) * 40f / 100f) - 35f;
FloatControl gainControlTick = (FloatControl) tickClip.getControl(FloatControl.Type.MASTER_GAIN);
gainControlTick.setValue(gainValue);
FloatControl gainControlTock = (FloatControl) tockClip.getControl(FloatControl.Type.MASTER_GAIN);
@@ -139,7 +158,7 @@ public class MetronomePlugin extends Plugin
{
tickClip.close();
}
- tickClip = GetAudioClip(config.tickPath());
+ tickClip = GetAudioClip(this.tickPath);
}
if (event.getKey().equals("tockSoundFilePath"))
{
@@ -147,21 +166,21 @@ public class MetronomePlugin extends Plugin
{
tockClip.close();
}
- tockClip = GetAudioClip(config.tockPath());
+ tockClip = GetAudioClip(this.tockPath);
}
}
@Subscribe
public void onGameTick(GameTick tick)
{
- if (config.tickCount() == 0)
+ if (this.tickCount == 0)
{
return;
}
- if ((++tickCounter + config.tickOffset()) % config.tickCount() == 0)
+ if ((++tickCounter + this.tickOffset) % this.tickCount == 0)
{
- if (++tockCounter % config.tockNumber() == 0 & config.enableTock())
+ if (++tockCounter % this.tockNumber == 0 & this.enableTock)
{
if (tockClip == null)
{
@@ -195,4 +214,15 @@ public class MetronomePlugin extends Plugin
}
}
}
+
+ private void updateConfig()
+ {
+ this.tickCount = config.tickCount();
+ this.enableTock = config.enableTock();
+ this.tockNumber = config.tockNumber();
+ this.tickOffset = config.tickOffset();
+ this.tickPath = config.tickPath();
+ this.tockPath = config.tockPath();
+ this.volume = config.volume();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java
index d68e6f56f4..205e67d03e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java
@@ -28,6 +28,7 @@ import com.google.inject.Provides;
import java.awt.Color;
import java.util.Arrays;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Sprite;
@@ -46,6 +47,7 @@ import net.runelite.client.plugins.PluginDescriptor;
description = "Customize the color of minimap dots",
tags = {"items", "npcs", "players"}
)
+@Singleton
public class MinimapPlugin extends Plugin
{
private static final int NUM_MAPDOTS = 6;
@@ -58,6 +60,14 @@ public class MinimapPlugin extends Plugin
private Sprite[] originalDotSprites;
+ private Color itemColor;
+ private Color npcColor;
+ private Color playerColor;
+ private Color friendColor;
+ private Color teamColor;
+ private Color clanColor;
+ private boolean hideMinimap;
+
@Provides
private MinimapConfig provideConfig(ConfigManager configManager)
{
@@ -67,7 +77,9 @@ public class MinimapPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
- updateMinimapWidgetVisibility(config.hideMinimap());
+ updateConfig();
+
+ updateMinimapWidgetVisibility(this.hideMinimap);
storeOriginalDots();
replaceMapDots();
}
@@ -97,9 +109,11 @@ public class MinimapPlugin extends Plugin
return;
}
+ updateConfig();
+
if (event.getKey().equals("hideMinimap"))
{
- updateMinimapWidgetVisibility(config.hideMinimap());
+ updateMinimapWidgetVisibility(this.hideMinimap);
return;
}
@@ -109,7 +123,7 @@ public class MinimapPlugin extends Plugin
@Subscribe
public void onWidgetHiddenChanged(WidgetHiddenChanged event)
{
- updateMinimapWidgetVisibility(config.hideMinimap());
+ updateMinimapWidgetVisibility(this.hideMinimap);
}
private void updateMinimapWidgetVisibility(boolean enable)
@@ -155,12 +169,13 @@ public class MinimapPlugin extends Plugin
private Color[] getColors()
{
Color[] colors = new Color[NUM_MAPDOTS];
- colors[0] = config.itemColor();
- colors[1] = config.npcColor();
- colors[2] = config.playerColor();
- colors[3] = config.friendColor();
- colors[4] = config.teamColor();
- colors[5] = config.clanColor();
+ colors[0] = this.itemColor;
+ colors[1] = this.npcColor;
+ colors[2] = this.playerColor;
+ colors[3] = this.friendColor;
+ colors[4] = this.teamColor;
+ colors[5] = this.clanColor;
+
return colors;
}
@@ -187,4 +202,15 @@ public class MinimapPlugin extends Plugin
System.arraycopy(originalDotSprites, 0, mapDots, 0, mapDots.length);
}
+
+ private void updateConfig()
+ {
+ this.itemColor = config.itemColor();
+ this.npcColor = config.npcColor();
+ this.playerColor = config.playerColor();
+ this.friendColor = config.friendColor();
+ this.teamColor = config.teamColor();
+ this.clanColor = config.clanColor();
+ this.hideMinimap = config.hideMinimap();
+ }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java
index 2acbf90aa8..cdcf2ad670 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java
@@ -27,29 +27,29 @@ package net.runelite.client.plugins.mining;
import java.awt.Color;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.ItemID;
import net.runelite.api.Point;
import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.WidgetItemOverlay;
+@Singleton
public class MiningCoalBagOverlay extends WidgetItemOverlay
{
private final MiningPlugin plugin;
- private final MiningConfig config;
@Inject
- MiningCoalBagOverlay(MiningPlugin plugin, MiningConfig config)
+ MiningCoalBagOverlay(final MiningPlugin plugin)
{
showOnInventory();
this.plugin = plugin;
- this.config = config;
}
@Override
public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget)
{
- if (!config.showCoalBagOverlay() || (itemId != ItemID.COAL_BAG && itemId != ItemID.COAL_BAG_12019))
+ if (!plugin.isShowCoalBagOverlay() || (itemId != ItemID.COAL_BAG && itemId != ItemID.COAL_BAG_12019))
{
return;
}
@@ -58,6 +58,6 @@ public class MiningCoalBagOverlay extends WidgetItemOverlay
graphics.setColor(Color.WHITE);
Point location = itemWidget.getCanvasLocation();
- graphics.drawString(config.amountOfCoalInCoalBag() + "", location.getX(), location.getY() + 14);
+ graphics.drawString(plugin.getAmountOfCoalInCoalBag() + "", location.getX(), location.getY() + 14);
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java
index fc673f2784..f0ca9fea59 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java
@@ -31,6 +31,7 @@ import java.time.Instant;
import java.util.Iterator;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.Client;
@@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.ProgressPieComponent;
+@Singleton
class MiningOverlay extends Overlay
{
// Range of Motherlode vein respawn time not 100% confirmed but based on observation
@@ -57,7 +59,7 @@ class MiningOverlay extends Overlay
private final MiningPlugin plugin;
@Inject
- private MiningOverlay(Client client, MiningPlugin plugin)
+ private MiningOverlay(final Client client, final MiningPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java
index f8f4ae7bc7..29f5df03e0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java
@@ -34,6 +34,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@@ -72,6 +73,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
tags = {"overlay", "skilling", "timers", "coal", "coalbag", "coal bag"},
enabledByDefault = false
)
+@Singleton
public class MiningPlugin extends Plugin
{
private static final int ROCK_DISTANCE = 14;
@@ -87,7 +89,6 @@ public class MiningPlugin extends Plugin
private static final String FILL_OPTION = "fill";
private static final String EMPTY_OPTION = "empty";
-
@Inject
private Client client;
@@ -107,9 +108,17 @@ public class MiningPlugin extends Plugin
private final List respawns = new ArrayList<>();
private boolean recentlyLoggedIn;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showCoalBagOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private int amountOfCoalInCoalBag;
+
@Override
protected void startUp()
{
+ this.showCoalBagOverlay = config.showCoalBagOverlay();
+ this.amountOfCoalInCoalBag = config.amountOfCoalInCoalBag();
+
overlayManager.add(miningOverlay);
overlayManager.add(coalBagOverlay);
}
@@ -222,7 +231,11 @@ public class MiningPlugin extends Plugin
}
ItemContainer inventoryItemContainer = client.getItemContainer(InventoryID.INVENTORY);
- Item[] inventoryItems = inventoryItemContainer.getItems();
+ Item[] inventoryItems = new Item[0];
+ if (inventoryItemContainer != null)
+ {
+ inventoryItems = inventoryItemContainer.getItems();
+ }
switch (event.getOption().toLowerCase())
{
@@ -261,7 +274,7 @@ public class MiningPlugin extends Plugin
Matcher matcher = COAL_BAG_AMOUNT_MESSAGE.matcher(chatMsg);
if (matcher.find())
{
- updateAmountOfCoalInBag(Integer.parseInt(matcher.group(1)) - config.amountOfCoalInCoalBag());
+ updateAmountOfCoalInBag(Integer.parseInt(matcher.group(1)) - this.amountOfCoalInCoalBag);
}
}
}
@@ -276,11 +289,25 @@ public class MiningPlugin extends Plugin
{
// check for upper/lower bounds of amount of coal in a bag
// 0 <= X <= 27
- config.amountOfCoalInCoalBag(Math.max(0, Math.min(FULL_COAL_BAG_AMOUNT, config.amountOfCoalInCoalBag() + delta)));
+ int coalbagAmount = Math.max(0, Math.min(FULL_COAL_BAG_AMOUNT, this.amountOfCoalInCoalBag + delta));
+ config.amountOfCoalInCoalBag(coalbagAmount);
+ this.amountOfCoalInCoalBag = coalbagAmount;
}
private boolean inMiningGuild()
{
return client.getLocalPlayer().getWorldLocation().getRegionID() == MINING_GUILD_REGION;
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("mining"))
+ {
+ return;
+ }
+
+ this.showCoalBagOverlay = config.showCoalBagOverlay();
+ this.amountOfCoalInCoalBag = config.amountOfCoalInCoalBag();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java
index daedda8f34..6b00652af4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java
@@ -25,12 +25,13 @@
package net.runelite.client.plugins.mining;
import java.time.Instant;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.runelite.api.coords.WorldPoint;
@AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
class RockRespawn
{
private final Rock rock;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java
index 7b95147aeb..c87469b6bc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Graphics2D;
import java.time.Duration;
import java.time.Instant;
import javax.inject.Inject;
+import javax.inject.Singleton;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.client.ui.overlay.Overlay;
import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
@@ -38,22 +39,20 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
-
+@Singleton
public class MotherlodeGemOverlay extends Overlay
{
private final MotherlodePlugin plugin;
private final MotherlodeSession motherlodeSession;
- private final MotherlodeConfig config;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- MotherlodeGemOverlay(MotherlodePlugin plugin, MotherlodeSession motherlodeSession, MotherlodeConfig config)
+ MotherlodeGemOverlay(final MotherlodePlugin plugin, final MotherlodeSession motherlodeSession)
{
super(plugin);
setPosition(OverlayPosition.TOP_LEFT);
this.plugin = plugin;
this.motherlodeSession = motherlodeSession;
- this.config = config;
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Gem overlay"));
}
@@ -62,12 +61,12 @@ public class MotherlodeGemOverlay extends Overlay
{
MotherlodeSession session = motherlodeSession;
- if (session.getLastGemFound() == null || !plugin.isInMlm() || !config.showGemsFound())
+ if (session.getLastGemFound() == null || !plugin.isInMlm() || !plugin.isShowGemsFound())
{
return null;
}
- Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+ Duration statTimeout = Duration.ofMinutes(plugin.getStatTimeout());
Duration sinceCut = Duration.between(session.getLastGemFound(), Instant.now());
if (sinceCut.compareTo(statTimeout) >= 0)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java
index 3533537987..65888c0f74 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java
@@ -27,33 +27,32 @@ package net.runelite.client.plugins.motherlode;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
-
+@Singleton
public class MotherlodeOreOverlay extends Overlay
{
private final MotherlodePlugin plugin;
private final MotherlodeSession motherlodeSession;
- private final MotherlodeConfig config;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- MotherlodeOreOverlay(MotherlodePlugin plugin, MotherlodeSession motherlodeSession, MotherlodeConfig config)
+ MotherlodeOreOverlay(final MotherlodePlugin plugin, final MotherlodeSession motherlodeSession)
{
setPosition(OverlayPosition.TOP_LEFT);
this.plugin = plugin;
this.motherlodeSession = motherlodeSession;
- this.config = config;
}
@Override
public Dimension render(Graphics2D graphics)
{
- if (!plugin.isInMlm() || !config.showOresFound())
+ if (!plugin.isInMlm() || !plugin.isShowOresFound())
{
return null;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java
index c43e012bfb..7bd10dd62c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java
@@ -30,7 +30,7 @@ import java.awt.Graphics2D;
import java.time.Duration;
import java.time.Instant;
import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.PanelComponent;
@@ -38,29 +38,26 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
+@Singleton
class MotherlodeOverlay extends Overlay
{
- private final Client client;
private final MotherlodePlugin plugin;
private final MotherlodeSession motherlodeSession;
- private final MotherlodeConfig config;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- MotherlodeOverlay(Client client, MotherlodePlugin plugin, MotherlodeSession motherlodeSession, MotherlodeConfig config)
+ MotherlodeOverlay(final MotherlodePlugin plugin, final MotherlodeSession motherlodeSession)
{
super(plugin);
setPosition(OverlayPosition.TOP_LEFT);
- this.client = client;
this.plugin = plugin;
this.motherlodeSession = motherlodeSession;
- this.config = config;
}
@Override
public Dimension render(Graphics2D graphics)
{
- if (!plugin.isInMlm() || !config.showMiningStats())
+ if (!plugin.isInMlm() || !plugin.isShowMiningStats())
{
return null;
}
@@ -72,7 +69,7 @@ class MotherlodeOverlay extends Overlay
return null;
}
- Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+ Duration statTimeout = Duration.ofMinutes(plugin.getStatTimeout());
Duration sinceCut = Duration.between(session.getLastPayDirtMined(), Instant.now());
if (sinceCut.compareTo(statTimeout) >= 0)
@@ -82,7 +79,7 @@ class MotherlodeOverlay extends Overlay
panelComponent.getChildren().clear();
- if (config.showMiningState())
+ if (plugin.isShowMiningState())
{
if (plugin.isMining())
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
index 0e23e85a19..7e202ef3ac 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
@@ -38,6 +38,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.AnimationID;
@@ -80,6 +81,7 @@ import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameObjectChanged;
import net.runelite.api.events.GameObjectDespawned;
import net.runelite.api.events.GameObjectSpawned;
@@ -110,6 +112,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
tags = {"pay", "dirt", "mining", "mlm", "skilling", "overlay"},
enabledByDefault = false
)
+@Singleton
public class MotherlodePlugin extends Plugin
{
private static final Set MOTHERLODE_MAP_REGIONS = ImmutableSet.of(14679, 14680, 14681, 14935, 14936, 14937, 15191, 15192, 15193);
@@ -188,6 +191,28 @@ public class MotherlodePlugin extends Plugin
private int lastAnimation = AnimationID.IDLE;
private Instant lastAnimating;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showVeins;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showRockFalls;
+ @Getter(AccessLevel.PACKAGE)
+ private int statTimeout;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showSack;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showMiningStats;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showDepositsLeft;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showMiningState;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showGemsFound;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showOresFound;
+ private boolean notifyOnIdle;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showTargetVein;
+
@Provides
MotherlodeConfig getConfig(ConfigManager configManager)
{
@@ -197,6 +222,8 @@ public class MotherlodePlugin extends Plugin
@Override
protected void startUp()
{
+ updateConfig();
+
overlayManager.add(overlay);
overlayManager.add(rocksOverlay);
overlayManager.add(motherlodeGemOverlay);
@@ -311,7 +338,7 @@ public class MotherlodePlugin extends Plugin
}
// reset recentPayDirtMined if you haven't mined anything recently
- Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+ Duration statTimeout = Duration.ofMinutes(this.statTimeout);
Duration sinceMined = Duration.between(lastPayDirtMined, Instant.now());
if (sinceMined.compareTo(statTimeout) >= 0)
@@ -467,7 +494,7 @@ public class MotherlodePlugin extends Plugin
private void sendIdleNotification()
{
- if (!config.notifyOnIdle())
+ if (!this.notifyOnIdle)
{
return;
}
@@ -703,4 +730,30 @@ public class MotherlodePlugin extends Plugin
{
return Perspective.getTileHeight(client, localPoint, 0) < UPPER_FLOOR_HEIGHT;
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("motherlode"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ private void updateConfig()
+ {
+ this.showVeins = config.showVeins();
+ this.showRockFalls = config.showRockFalls();
+ this.statTimeout = config.statTimeout();
+ this.showSack = config.showSack();
+ this.showMiningStats = config.showMiningStats();
+ this.showDepositsLeft = config.showDepositsLeft();
+ this.showMiningState = config.showMiningState();
+ this.showGemsFound = config.showGemsFound();
+ this.showOresFound = config.showOresFound();
+ this.notifyOnIdle = config.notifyOnIdle();
+ this.showTargetVein = config.showTargetVein();
+ }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java
index bcd4d2946e..3fa2aba3dd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
import java.awt.Polygon;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.GameObject;
import net.runelite.api.Perspective;
@@ -48,13 +49,13 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.util.ImageUtil;
+@Singleton
class MotherlodeRocksOverlay extends Overlay
{
private static final int MAX_DISTANCE = 2350;
private final Client client;
private final MotherlodePlugin plugin;
- private final MotherlodeConfig config;
private final BufferedImage miningIcon;
private final BufferedImage targetMiningIcon;
@@ -62,13 +63,12 @@ class MotherlodeRocksOverlay extends Overlay
private static final Color miningIconNewColor = new Color(0, 150, 0);
@Inject
- MotherlodeRocksOverlay(Client client, MotherlodePlugin plugin, MotherlodeConfig config, SkillIconManager iconManager)
+ MotherlodeRocksOverlay(final Client client, final MotherlodePlugin plugin, final SkillIconManager iconManager)
{
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE);
this.client = client;
this.plugin = plugin;
- this.config = config;
miningIcon = iconManager.getSkillImage(Skill.MINING);
targetMiningIcon = ImageUtil.recolorImage(miningIcon, miningIconNewColor, Color -> Color.getRGB() == miningIconOldColor.getRGB());
@@ -77,7 +77,7 @@ class MotherlodeRocksOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if ((!config.showVeins() && !config.showRockFalls()) || !plugin.isInMlm())
+ if ((!plugin.isShowVeins() && !plugin.isShowRockFalls()) || !plugin.isInMlm())
{
return null;
}
@@ -92,7 +92,7 @@ class MotherlodeRocksOverlay extends Overlay
private void renderTiles(Graphics2D graphics, Player local)
{
LocalPoint localLocation = local.getLocalLocation();
- if (config.showVeins())
+ if (plugin.isShowVeins())
{
for (WallObject vein : plugin.getVeins())
{
@@ -104,7 +104,7 @@ class MotherlodeRocksOverlay extends Overlay
{
if (WorldPoint.fromLocal(client, location).equals(plugin.getTargetVeinLocation())
&& plugin.isMining()
- && config.showTargetVein())
+ && plugin.isShowTargetVein())
{
renderVein(graphics, vein, true);
}
@@ -117,7 +117,7 @@ class MotherlodeRocksOverlay extends Overlay
}
}
- if (config.showRockFalls())
+ if (plugin.isShowRockFalls())
{
for (GameObject rock : plugin.getRocks())
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java
index 2b53ff5bee..bf8e1d31a3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.api.Varbits;
@@ -45,22 +46,21 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.util.ColorUtil;
+@Singleton
class MotherlodeSackOverlay extends Overlay
{
private static final Color DANGER = new Color(150, 0, 0, 150);
private final Client client;
- private final MotherlodeConfig config;
private final MotherlodePlugin plugin;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- MotherlodeSackOverlay(Client client, MotherlodeConfig config, MotherlodePlugin plugin)
+ MotherlodeSackOverlay(final Client client, final MotherlodePlugin plugin)
{
super(plugin);
setPosition(OverlayPosition.TOP_LEFT);
this.client = client;
- this.config = config;
this.plugin = plugin;
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Sack overlay"));
}
@@ -85,7 +85,7 @@ class MotherlodeSackOverlay extends Overlay
{
sack.setHidden(true);
- if (config.showSack())
+ if (plugin.isShowSack())
{
if (plugin.getCurSackSize() >= plugin.getMaxSackSize())
{
@@ -95,7 +95,7 @@ class MotherlodeSackOverlay extends Overlay
tableComponent.addRow("Pay-dirt in sack:", String.valueOf(client.getVar(Varbits.SACK_NUMBER)));
}
- if (config.showDepositsLeft())
+ if (plugin.isShowDepositsLeft())
{
final Integer depositsLeft = plugin.getDepositsLeft();
Color color = Color.WHITE;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java
index e4d00cfda6..6a9c97d4b4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java
@@ -133,7 +133,7 @@ public class MotherlodeSession
}
}
- public void incrementPayDirtMined()
+ void incrementPayDirtMined()
{
Instant now = Instant.now();
@@ -153,33 +153,28 @@ public class MotherlodeSession
}
}
- public void resetRecent()
+ void resetRecent()
{
recentPayDirtMined = null;
recentMined = 0;
}
- public int getPerHour()
+ int getPerHour()
{
return perHour;
}
- public Instant getLastPayDirtMined()
+ Instant getLastPayDirtMined()
{
return lastPayDirtMined;
}
- public int getTotalMined()
+ int getTotalMined()
{
return totalMined;
}
- public Instant getRecentPayDirtMined()
- {
- return recentPayDirtMined;
- }
-
- public int getRecentMined()
+ int getRecentMined()
{
return recentMined;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java
index 79700ce096..34cae5980f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java
@@ -28,6 +28,7 @@ import com.google.common.base.Strings;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.MenuAction;
import net.runelite.api.MenuEntry;
@@ -39,19 +40,20 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.tooltip.Tooltip;
import net.runelite.client.ui.overlay.tooltip.TooltipManager;
+@Singleton
class MouseHighlightOverlay extends Overlay
{
private final TooltipManager tooltipManager;
private final Client client;
- private final MouseHighlightConfig config;
+ private final MouseHighlightPlugin plugin;
@Inject
- MouseHighlightOverlay(Client client, TooltipManager tooltipManager, MouseHighlightConfig config)
+ MouseHighlightOverlay(final Client client, final TooltipManager tooltipManager, final MouseHighlightPlugin plugin)
{
setPosition(OverlayPosition.DYNAMIC);
this.client = client;
this.tooltipManager = tooltipManager;
- this.config = config;
+ this.plugin = plugin;
}
@Override
@@ -105,12 +107,12 @@ class MouseHighlightOverlay extends Overlay
final int childId = WidgetInfo.TO_CHILD(widgetId);
final Widget widget = client.getWidget(groupId, childId);
- if (!config.uiTooltip() && widget != null)
+ if (!plugin.isUiTooltip() && widget != null)
{
return null;
}
- if (!config.chatboxTooltip() && groupId == WidgetInfo.CHATBOX.getGroupId())
+ if (!plugin.isChatboxTooltip() && groupId == WidgetInfo.CHATBOX.getGroupId())
{
return null;
}
@@ -125,7 +127,7 @@ class MouseHighlightOverlay extends Overlay
}
}
- if (widget == null && !config.mainTooltip())
+ if (widget == null && !plugin.isMainTooltip())
{
return null;
}
@@ -144,7 +146,7 @@ class MouseHighlightOverlay extends Overlay
private boolean shouldNotRenderMenuAction(int type)
{
return type == MenuAction.RUNELITE_OVERLAY.getId()
- || (!config.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type));
+ || (!plugin.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type));
}
private boolean isMenuActionRightClickOnly(int type)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java
index 85f95aa6bd..ded370e957 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java
@@ -26,8 +26,12 @@ package net.runelite.client.plugins.mousehighlight;
import com.google.inject.Provides;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.GameState;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.WidgetLoaded;
@@ -45,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
description = "Render default actions as a tooltip",
tags = {"actions", "overlay", "tooltip", "hide"}
)
+@Singleton
public class MouseHighlightPlugin extends Plugin
{
@Inject
@@ -58,6 +63,17 @@ public class MouseHighlightPlugin extends Plugin
@Inject
private MouseHighlightOverlay overlay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean mainTooltip;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean uiTooltip;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean chatboxTooltip;
+ private boolean shouldHideSpells;
+ private boolean shouldHideCombat;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean isRightClickTooltipEnabled;
+
@Provides
MouseHighlightConfig provideConfig(ConfigManager configManager)
{
@@ -67,6 +83,8 @@ public class MouseHighlightPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
adjustTips();
overlayManager.add(overlay);
}
@@ -111,15 +129,13 @@ public class MouseHighlightPlugin extends Plugin
try
{
- setTipHidden(WidgetInfo.SPELL_TOOLTIP, config.shouldHideSpells());
- setTipHidden(WidgetInfo.COMBAT_TOOLTIP, config.shouldHideCombat());
+ setTipHidden(WidgetInfo.SPELL_TOOLTIP, this.shouldHideSpells);
+ setTipHidden(WidgetInfo.COMBAT_TOOLTIP, this.shouldHideCombat);
}
catch (Exception e)
{
//swallow
}
-
-
}
private void resetTips()
@@ -152,4 +168,24 @@ public class MouseHighlightPlugin extends Plugin
widget.setHidden(hidden);
}
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("motherlode"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ private void updateConfig()
+ {
+ this.mainTooltip = config.mainTooltip();
+ this.uiTooltip = config.uiTooltip();
+ this.chatboxTooltip = config.chatboxTooltip();
+ this.shouldHideSpells = config.shouldHideSpells();
+ this.shouldHideCombat = config.shouldHideCombat();
+ this.isRightClickTooltipEnabled = config.isRightClickTooltipEnabled();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java
index ea99cf7f00..928522a48a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java
@@ -27,17 +27,19 @@ package net.runelite.client.plugins.mta;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
+@Singleton
public class MTAInventoryOverlay extends Overlay
{
private final MTAPlugin plugin;
@Inject
- public MTAInventoryOverlay(MTAPlugin plugin)
+ public MTAInventoryOverlay(final MTAPlugin plugin)
{
this.plugin = plugin;
setPosition(OverlayPosition.DYNAMIC);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java
index 5b7d6bffa1..907f66f03d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java
@@ -26,9 +26,9 @@ package net.runelite.client.plugins.mta;
import com.google.inject.Provides;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
-import net.runelite.api.Client;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.EventBus;
import net.runelite.client.plugins.Plugin;
@@ -44,11 +44,9 @@ import net.runelite.client.ui.overlay.OverlayManager;
description = "Show helpful information for the Mage Training Arena minigame",
tags = {"mta", "magic", "minigame", "overlay"}
)
+@Singleton
public class MTAPlugin extends Plugin
{
- @Inject
- private Client client;
-
@Inject
private OverlayManager overlayManager;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java
index a77f8170d8..6df7c96c37 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java
@@ -35,7 +35,7 @@ public abstract class MTARoom
protected final MTAConfig config;
@Inject
- protected MTARoom(MTAConfig config)
+ protected MTARoom(final MTAConfig config)
{
this.config = config;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java
index 5ed9a7e6b1..c9c405aa75 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java
@@ -27,17 +27,19 @@ package net.runelite.client.plugins.mta;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
+@Singleton
public class MTASceneOverlay extends Overlay
{
private final MTAPlugin plugin;
@Inject
- public MTASceneOverlay(MTAPlugin plugin)
+ public MTASceneOverlay(final MTAPlugin plugin)
{
this.plugin = plugin;
setPosition(OverlayPosition.DYNAMIC);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java
index d690b7f16b..c7f45bfc50 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java
@@ -43,7 +43,7 @@ public enum AlchemyItem
@Getter
private final String name;
- AlchemyItem(String name, int id)
+ AlchemyItem(final String name, final int id)
{
this.id = id;
this.name = name;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java
index ff8224238f..b8bd37fa9c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java
@@ -58,6 +58,7 @@ import net.runelite.api.Player;
import net.runelite.api.Point;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameObjectSpawned;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
@@ -97,20 +98,24 @@ public class AlchemyRoom extends MTARoom
private AlchemyItem best;
private Cupboard suggestion;
+ private boolean alchemy;
+
@Inject
- private AlchemyRoom(Client client, MTAConfig config, MTAPlugin plugin, ItemManager itemManager, InfoBoxManager infoBoxManager)
+ private AlchemyRoom(final Client client, final MTAConfig config, final MTAPlugin plugin, final ItemManager itemManager, final InfoBoxManager infoBoxManager)
{
super(config);
this.client = client;
this.plugin = plugin;
this.itemManager = itemManager;
this.infoBoxManager = infoBoxManager;
+
+ this.alchemy = config.alchemy();
}
@Subscribe
public void onGameTick(GameTick event)
{
- if (!inside() || !config.alchemy())
+ if (!inside() || !this.alchemy)
{
return;
}
@@ -272,6 +277,17 @@ public class AlchemyRoom extends MTARoom
}
}
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("mta") || !event.getKey().equals("alchemy"))
+ {
+ return;
+ }
+
+ this.alchemy = config.alchemy();
+ }
+
private void reset()
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java
index 693e0517c9..d5b23a07e9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java
@@ -30,12 +30,12 @@ import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.overlay.infobox.Timer;
import net.runelite.client.util.ImageUtil;
-public class AlchemyRoomTimer extends Timer
+class AlchemyRoomTimer extends Timer
{
private static final int RESET_PERIOD = 42;
private static BufferedImage image;
- public AlchemyRoomTimer(Plugin plugin)
+ AlchemyRoomTimer(final Plugin plugin)
{
super(RESET_PERIOD, ChronoUnit.SECONDS, getResetImage(), plugin);
this.setTooltip("Time until items swap");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java
index ce82dc00cc..40a46c332d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java
@@ -35,6 +35,7 @@ import net.runelite.api.ItemID;
import net.runelite.api.Player;
import net.runelite.api.Tile;
import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.ItemDespawned;
@@ -51,11 +52,15 @@ public class EnchantmentRoom extends MTARoom
private final Client client;
private final List dragonstones = new ArrayList<>();
+ private boolean enchantment;
+
@Inject
- private EnchantmentRoom(MTAConfig config, Client client)
+ private EnchantmentRoom(final MTAConfig config, final Client client)
{
super(config);
this.client = client;
+
+ this.enchantment = config.enchantment();
}
@Subscribe
@@ -70,7 +75,7 @@ public class EnchantmentRoom extends MTARoom
@Subscribe
public void onGameTick(GameTick event)
{
- if (!inside() || !config.enchantment())
+ if (!inside() || !this.enchantment)
{
return;
}
@@ -131,6 +136,17 @@ public class EnchantmentRoom extends MTARoom
}
}
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("mta") || !event.getKey().equals("enchantment"))
+ {
+ return;
+ }
+
+ this.enchantment = config.enchantment();
+ }
+
@Override
public boolean inside()
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java
index 59f78785c8..8db687282f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java
@@ -31,7 +31,7 @@ import net.runelite.client.ui.overlay.infobox.Counter;
public class GraveyardCounter extends Counter
{
- GraveyardCounter(BufferedImage image, Plugin plugin)
+ GraveyardCounter(final BufferedImage image, final Plugin plugin)
{
super(image, plugin, 0);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java
index 6661b141ff..2c683989c6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java
@@ -35,6 +35,7 @@ import static net.runelite.api.ItemID.ANIMALS_BONES_6905;
import static net.runelite.api.ItemID.ANIMALS_BONES_6906;
import static net.runelite.api.ItemID.ANIMALS_BONES_6907;
import net.runelite.api.Player;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.ItemContainerChanged;
import net.runelite.client.eventbus.Subscribe;
@@ -57,15 +58,18 @@ public class GraveyardRoom extends MTARoom
private GraveyardCounter counter;
+ private boolean graveyard;
+
@Inject
- private GraveyardRoom(MTAConfig config, Client client, MTAPlugin plugin,
- ItemManager itemManager, InfoBoxManager infoBoxManager)
+ private GraveyardRoom(final MTAConfig config, final Client client, final MTAPlugin plugin, final ItemManager itemManager, final InfoBoxManager infoBoxManager)
{
super(config);
this.client = client;
this.plugin = plugin;
this.itemManager = itemManager;
this.infoBoxManager = infoBoxManager;
+
+ this.graveyard = config.graveyard();
}
@Override
@@ -79,7 +83,7 @@ public class GraveyardRoom extends MTARoom
@Subscribe
public void onGameTick(GameTick tick)
{
- if (!inside() || !config.graveyard())
+ if (!inside() || !this.graveyard)
{
if (this.counter != null)
{
@@ -113,6 +117,17 @@ public class GraveyardRoom extends MTARoom
}
}
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("mta") || !event.getKey().equals("graveyard"))
+ {
+ return;
+ }
+
+ this.graveyard = config.graveyard();
+ }
+
private int score(Item[] items)
{
int score = 0;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java
index bef5c1d201..77871deb92 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java
@@ -42,7 +42,7 @@ public enum Maze
private final int walls;
private final LocalPoint start;
- Maze(int walls, LocalPoint start)
+ Maze(final int walls, final LocalPoint start)
{
this.walls = walls;
this.start = start;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java
index ae797b74cd..557792c398 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java
@@ -54,6 +54,7 @@ import net.runelite.api.coords.Direction;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldArea;
import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.GroundObjectSpawned;
@@ -84,11 +85,15 @@ public class TelekineticRoom extends MTARoom
private NPC guardian;
private Maze maze;
+ private boolean telekinetic;
+
@Inject
- private TelekineticRoom(MTAConfig config, Client client)
+ private TelekineticRoom(final MTAConfig config, final Client client)
{
super(config);
this.client = client;
+
+ this.telekinetic = config.telekinetic();
}
public void resetRoom()
@@ -133,7 +138,7 @@ public class TelekineticRoom extends MTARoom
@Subscribe
public void onGameTick(GameTick event)
{
- if (!config.telekinetic()
+ if (!this.telekinetic
|| !inside()
|| client.getGameState() != GameState.LOGGED_IN)
{
@@ -220,6 +225,17 @@ public class TelekineticRoom extends MTARoom
}
}
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("mta") || !event.getKey().equals("telekinetic"))
+ {
+ return;
+ }
+
+ this.telekinetic = config.telekinetic();
+ }
+
@Override
public boolean inside()
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java
index 044e9bdb36..cf7a0ef3da 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java
@@ -35,12 +35,12 @@ import net.runelite.api.Constants;
public class MapLocations
{
- private static final List[] MULTICOMBAT = new List[Constants.MAX_Z];
- private static final List[] NOT_MULTICOMBAT = new List[Constants.MAX_Z];
- private static final List[] ROUGH_WILDERNESS = new List[Constants.MAX_Z];
+ private static final List[] MULTICOMBAT = new List[Constants.MAX_Z];
+ private static final List[] NOT_MULTICOMBAT = new List[Constants.MAX_Z];
+ private static final List[] ROUGH_WILDERNESS = new List[Constants.MAX_Z];
private static final List[] WILDERNESS_LEVEL_LINES = new List[Constants.MAX_Z];
- private static final List[] DEADMAN_SAFE_ZONES = new List[Constants.MAX_Z];
- private static final List[] PVP_WORLD_SAFE_ZONES = new List[Constants.MAX_Z];
+ private static final List[] DEADMAN_SAFE_ZONES = new List[Constants.MAX_Z];
+ private static final List[] PVP_WORLD_SAFE_ZONES = new List[Constants.MAX_Z];
private static Area getArea(List shapes)
{
@@ -3453,7 +3453,6 @@ public class MapLocations
int wildyLeftX = 2944;
int wildyRightX = 3392;
int wildyBottomY = 3525;
- int wildyTopY = 3971;
// define wilderness level lines at ground level
int accumulatedY = 0;
@@ -3482,9 +3481,9 @@ public class MapLocations
{
poly.addPoint(coords[i], coords[i + 1]);
}
- for (int i = 0; i < shapes.length; i++)
+ for (List shape : shapes)
{
- shapes[i].add(poly);
+ shape.add(poly);
}
}
@@ -3497,17 +3496,4 @@ public class MapLocations
}
shapes[plane].add(poly);
}
-
- private static void addPolygonOnPlanes(List[] shapes, int minPlane, int maxPlane, int... coords)
- {
- Polygon poly = new Polygon();
- for (int i = 0; i < coords.length; i += 2)
- {
- poly.addPoint(coords[i], coords[i + 1]);
- }
- for (int i = minPlane; i <= maxPlane; i++)
- {
- shapes[i].add(poly);
- }
- }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java
index b0c1187745..5ea7f57b24 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Rectangle;
import java.awt.geom.GeneralPath;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.geometry.Geometry;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
@@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
+@Singleton
public class MultiIndicatorsMinimapOverlay extends Overlay
{
private final static int MAX_LOCAL_DRAW_LENGTH = 20 * Perspective.LOCAL_TILE_SIZE;
@@ -52,9 +54,6 @@ public class MultiIndicatorsMinimapOverlay extends Overlay
@Inject
private MultiIndicatorsPlugin plugin;
- @Inject
- private MultiIndicatorsConfig config;
-
@Inject
public MultiIndicatorsMinimapOverlay()
{
@@ -86,8 +85,11 @@ public class MultiIndicatorsMinimapOverlay extends Overlay
path = Geometry.transformPath(path, coords ->
{
Point point = Perspective.localToMinimap(client, new LocalPoint((int) coords[0], (int) coords[1]));
- coords[0] = point.getX();
- coords[1] = point.getY();
+ if (point != null)
+ {
+ coords[0] = point.getX();
+ coords[1] = point.getY();
+ }
});
graphics.draw(path);
@@ -96,7 +98,7 @@ public class MultiIndicatorsMinimapOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (!config.showMinimapLines())
+ if (!plugin.isShowMinimapLines())
{
return null;
}
@@ -105,17 +107,17 @@ public class MultiIndicatorsMinimapOverlay extends Overlay
GeneralPath pvpPath = plugin.getPvpPathToDisplay()[client.getPlane()];
GeneralPath wildernessLevelLinesPath = plugin.getWildernessLevelLinesPathToDisplay()[client.getPlane()];
- if (config.multicombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null)
+ if (plugin.getMulticombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null)
{
- renderPath(graphics, multicombatPath, getTransparentColorVersion(config.multicombatColor()));
+ renderPath(graphics, multicombatPath, getTransparentColorVersion(plugin.getMulticombatColor()));
}
- if ((config.showPvpSafeZones() || config.showDeadmanSafeZones()) && pvpPath != null)
+ if ((plugin.isShowPvpSafeZones() || plugin.isShowDeadmanSafeZones()) && pvpPath != null)
{
- renderPath(graphics, pvpPath, getTransparentColorVersion(config.safeZoneColor()));
+ renderPath(graphics, pvpPath, getTransparentColorVersion(plugin.getSafeZoneColor()));
}
- if (config.showWildernessLevelLines() && wildernessLevelLinesPath != null)
+ if (plugin.isShowWildernessLevelLines() && wildernessLevelLinesPath != null)
{
- renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(config.wildernessLevelLinesColor()));
+ renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(plugin.getWildernessLevelLinesColor()));
}
return null;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java
index d9268121f0..dd134690ed 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.geom.GeneralPath;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.geometry.Geometry;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
@@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
+@Singleton
public class MultiIndicatorsOverlay extends Overlay
{
private final static int MAX_LOCAL_DRAW_LENGTH = 20 * Perspective.LOCAL_TILE_SIZE;
@@ -52,9 +54,6 @@ public class MultiIndicatorsOverlay extends Overlay
@Inject
private MultiIndicatorsPlugin plugin;
- @Inject
- private MultiIndicatorsConfig config;
-
@Inject
public MultiIndicatorsOverlay()
{
@@ -101,17 +100,17 @@ public class MultiIndicatorsOverlay extends Overlay
GeneralPath pvpPath = plugin.getPvpPathToDisplay()[client.getPlane()];
GeneralPath wildernessLevelLinesPath = plugin.getWildernessLevelLinesPathToDisplay()[client.getPlane()];
- if (config.multicombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null)
+ if (plugin.getMulticombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null)
{
- renderPath(graphics, multicombatPath, getTransparentColorVersion(config.multicombatColor()));
+ renderPath(graphics, multicombatPath, getTransparentColorVersion(plugin.getMulticombatColor()));
}
- if ((config.showPvpSafeZones() || config.showDeadmanSafeZones()) && pvpPath != null)
+ if ((plugin.isShowPvpSafeZones() || plugin.isShowDeadmanSafeZones()) && pvpPath != null)
{
- renderPath(graphics, pvpPath, getTransparentColorVersion(config.safeZoneColor()));
+ renderPath(graphics, pvpPath, getTransparentColorVersion(plugin.getSafeZoneColor()));
}
- if (config.showWildernessLevelLines() && wildernessLevelLinesPath != null)
+ if (plugin.isShowWildernessLevelLines() && wildernessLevelLinesPath != null)
{
- renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(config.wildernessLevelLinesColor()));
+ renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(plugin.getWildernessLevelLinesColor()));
}
return null;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java
index c20fa25810..c9b025502f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java
@@ -26,11 +26,14 @@
package net.runelite.client.plugins.multiindicators;
import com.google.inject.Provides;
+import java.awt.Color;
import java.awt.Rectangle;
import java.awt.geom.GeneralPath;
import java.time.temporal.ChronoUnit;
import java.util.Arrays;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.Constants;
@@ -62,7 +65,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
type = PluginType.PVP,
enabledByDefault = false
)
-
+@Singleton
public class MultiIndicatorsPlugin extends Plugin
{
@Inject
@@ -83,23 +86,40 @@ public class MultiIndicatorsPlugin extends Plugin
@Inject
private OverlayManager overlayManager;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private GeneralPath[] multicombatPathToDisplay;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private GeneralPath[] pvpPathToDisplay;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private GeneralPath[] wildernessLevelLinesPathToDisplay;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private boolean inPvp;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private boolean inDeadman;
private int currentPlane;
+ @Getter(AccessLevel.PACKAGE)
+ private ZoneVisibility multicombatZoneVisibility;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showPvpSafeZones;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showDeadmanSafeZones;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showWildernessLevelLines;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showMinimapLines;
+ @Getter(AccessLevel.PACKAGE)
+ private Color multicombatColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color safeZoneColor;
+ @Getter(AccessLevel.PACKAGE)
+ private Color wildernessLevelLinesColor;
+
@Provides
MultiIndicatorsConfig getConfig(ConfigManager configManager)
{
@@ -109,6 +129,8 @@ public class MultiIndicatorsPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(overlay);
overlayManager.add(minimapOverlay);
@@ -165,9 +187,13 @@ public class MultiIndicatorsPlugin extends Plugin
private void transformWorldToLocal(float[] coords)
{
LocalPoint lp = LocalPoint.fromWorld(client, (int) coords[0], (int) coords[1]);
- coords[0] = lp.getX() - Perspective.LOCAL_TILE_SIZE / 2;
- coords[1] = lp.getY() - Perspective.LOCAL_TILE_SIZE / 2;
+ if (lp != null)
+ {
+ coords[0] = lp.getX() - Perspective.LOCAL_TILE_SIZE / 2;
+ coords[1] = lp.getY() - Perspective.LOCAL_TILE_SIZE / 2;
+ }
}
+
private boolean isOpenableAt(WorldPoint wp)
{
int sceneX = wp.getX() - client.getBaseX();
@@ -253,7 +279,7 @@ public class MultiIndicatorsPlugin extends Plugin
Constants.SCENE_SIZE - 2, Constants.SCENE_SIZE - 2);
// Generate lines for multicombat zones
- if (config.multicombatZoneVisibility() == ZoneVisibility.HIDE)
+ if (this.multicombatZoneVisibility == ZoneVisibility.HIDE)
{
for (int i = 0; i < multicombatPathToDisplay.length; i++)
{
@@ -268,7 +294,7 @@ public class MultiIndicatorsPlugin extends Plugin
GeneralPath lines = new GeneralPath(MapLocations.getMulticombat(sceneRect, i));
lines = Geometry.clipPath(lines, sceneRect);
- if (config.multicombatZoneVisibility() == ZoneVisibility.SHOW_IN_PVP &&
+ if (this.multicombatZoneVisibility == ZoneVisibility.SHOW_IN_PVP &&
!isInDeadman() && !isInPvp())
{
lines = Geometry.clipPath(lines, MapLocations.getRoughWilderness(i));
@@ -289,11 +315,11 @@ public class MultiIndicatorsPlugin extends Plugin
currentPlane = i;
GeneralPath safeZonePath = null;
- if (config.showDeadmanSafeZones() && isInDeadman())
+ if (this.showDeadmanSafeZones && isInDeadman())
{
safeZonePath = new GeneralPath(MapLocations.getDeadmanSafeZones(sceneRect, i));
}
- else if (config.showPvpSafeZones() && isInPvp())
+ else if (this.showPvpSafeZones && isInPvp())
{
safeZonePath = new GeneralPath(MapLocations.getPvpSafeZones(sceneRect, i));
}
@@ -316,7 +342,7 @@ public class MultiIndicatorsPlugin extends Plugin
currentPlane = i;
GeneralPath wildernessLevelLinesPath = null;
- if (config.showWildernessLevelLines())
+ if (this.showWildernessLevelLines)
{
wildernessLevelLinesPath = new GeneralPath(MapLocations.getWildernessLevelLines(sceneRect, i));
}
@@ -343,6 +369,13 @@ public class MultiIndicatorsPlugin extends Plugin
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
+ if (!event.getGroup().equals("multiindicators"))
+ {
+ return;
+ }
+
+ updateConfig();
+
if (event.getKey().equals("collisionDetection") ||
event.getKey().equals("multicombatZoneVisibility") ||
event.getKey().equals("deadmanSafeZones") ||
@@ -361,4 +394,16 @@ public class MultiIndicatorsPlugin extends Plugin
findLinesInScene();
}
}
+
+ private void updateConfig()
+ {
+ this.multicombatZoneVisibility = config.multicombatZoneVisibility();
+ this.showPvpSafeZones = config.showPvpSafeZones();
+ this.showDeadmanSafeZones = config.showDeadmanSafeZones();
+ this.showWildernessLevelLines = config.showDeadmanSafeZones();
+ this.showMinimapLines = config.showMinimapLines();
+ this.multicombatColor = config.multicombatColor();
+ this.safeZoneColor = config.safeZoneColor();
+ this.wildernessLevelLinesColor = config.wildernessLevelLinesColor();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java
index 694fc83698..1974109215 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java
@@ -32,6 +32,7 @@ import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
import net.runelite.api.EnumDefinition;
@@ -55,7 +56,7 @@ import net.runelite.client.plugins.PluginType;
type = PluginType.UTILITY,
enabledByDefault = false
)
-
+@Singleton
public class MusicIndicatorPlugin extends Plugin
{
private static final List MUSIC_TRACK_VARPS = ImmutableList.of(
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java
index ab38b515f9..683666c2bc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java
@@ -29,6 +29,7 @@ import java.util.Collection;
import java.util.Comparator;
import java.util.stream.Collectors;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.runelite.api.Client;
@@ -57,6 +58,7 @@ import net.runelite.client.plugins.PluginDescriptor;
name = "Music List",
description = "Adds search and filter for the music list"
)
+@Singleton
public class MusicListPlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java
index 3f91d8ee15..e6491a6205 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java
@@ -26,11 +26,12 @@ package net.runelite.client.plugins.nightmarezone;
import java.awt.Color;
import java.awt.image.BufferedImage;
+import lombok.AccessLevel;
import lombok.Setter;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.overlay.infobox.Counter;
-@Setter
+@Setter(AccessLevel.PACKAGE)
public class AbsorptionCounter extends Counter
{
private int threshold;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java
index 5a0a58e9da..247b2f97ab 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.nightmarezone;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.ItemID;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
@@ -46,10 +47,10 @@ import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
import net.runelite.client.util.StackFormatter;
+@Singleton
class NightmareZoneOverlay extends Overlay
{
private final Client client;
- private final NightmareZoneConfig config;
private final NightmareZonePlugin plugin;
private final InfoBoxManager infoBoxManager;
private final ItemManager itemManager;
@@ -59,17 +60,15 @@ class NightmareZoneOverlay extends Overlay
@Inject
NightmareZoneOverlay(
- Client client,
- NightmareZoneConfig config,
- NightmareZonePlugin plugin,
- InfoBoxManager infoBoxManager,
- ItemManager itemManager)
+ final Client client,
+ final NightmareZonePlugin plugin,
+ final InfoBoxManager infoBoxManager,
+ final ItemManager itemManager)
{
super(plugin);
setPosition(OverlayPosition.TOP_LEFT);
setPriority(OverlayPriority.LOW);
this.client = client;
- this.config = config;
this.plugin = plugin;
this.infoBoxManager = infoBoxManager;
this.itemManager = itemManager;
@@ -79,7 +78,7 @@ class NightmareZoneOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (!plugin.isInNightmareZone() || !config.moveOverlay())
+ if (plugin.isNotInNightmareZone() || !plugin.isMoveOverlay())
{
if (absorptionCounter != null)
{
@@ -108,7 +107,7 @@ class NightmareZoneOverlay extends Overlay
tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
tableComponent.addRow("Points:", StackFormatter.formatNumber(client.getVar(Varbits.NMZ_POINTS)));
- if (config.showtotalpoints())
+ if (plugin.isShowtotalpoints())
{
tableComponent.addRow("Total:", StackFormatter.formatNumber(client.getVar(VarPlayer.NMZ_REWARD_POINTS) + client.getVar(Varbits.NMZ_POINTS)));
}
@@ -129,7 +128,7 @@ class NightmareZoneOverlay extends Overlay
absorptionCounter = null;
}
}
- else if (config.moveOverlay())
+ else if (plugin.isMoveOverlay())
{
if (absorptionCounter == null)
{
@@ -144,9 +143,9 @@ class NightmareZoneOverlay extends Overlay
private void addAbsorptionCounter(int startValue)
{
- absorptionCounter = new AbsorptionCounter(itemManager.getImage(ItemID.ABSORPTION_4), plugin, startValue, config.absorptionThreshold());
- absorptionCounter.setAboveThresholdColor(config.absorptionColorAboveThreshold());
- absorptionCounter.setBelowThresholdColor(config.absorptionColorBelowThreshold());
+ absorptionCounter = new AbsorptionCounter(itemManager.getImage(ItemID.ABSORPTION_4), plugin, startValue, plugin.getAbsorptionThreshold());
+ absorptionCounter.setAboveThresholdColor(plugin.getAbsorptionColorAboveThreshold());
+ absorptionCounter.setBelowThresholdColor(plugin.getAbsorptionColorBelowThreshold());
infoBoxManager.addInfoBox(absorptionCounter);
}
@@ -160,9 +159,9 @@ class NightmareZoneOverlay extends Overlay
{
if (absorptionCounter != null)
{
- absorptionCounter.setAboveThresholdColor(config.absorptionColorAboveThreshold());
- absorptionCounter.setBelowThresholdColor(config.absorptionColorBelowThreshold());
- absorptionCounter.setThreshold(config.absorptionThreshold());
+ absorptionCounter.setAboveThresholdColor(plugin.getAbsorptionColorAboveThreshold());
+ absorptionCounter.setBelowThresholdColor(plugin.getAbsorptionColorBelowThreshold());
+ absorptionCounter.setThreshold(plugin.getAbsorptionThreshold());
}
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java
index 3d038163d7..63fffe5396 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java
@@ -25,8 +25,12 @@
package net.runelite.client.plugins.nightmarezone;
import com.google.inject.Provides;
+import java.awt.Color;
import java.util.Arrays;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
import net.runelite.api.Varbits;
@@ -48,6 +52,7 @@ import net.runelite.client.util.Text;
description = "Show NMZ points/absorption and/or notify about expiring potions",
tags = {"combat", "nmz", "minigame", "notifications"}
)
+@Singleton
public class NightmareZonePlugin extends Plugin
{
private static final int[] NMZ_MAP_REGION = {9033};
@@ -71,9 +76,28 @@ public class NightmareZonePlugin extends Plugin
// above the threshold before sending notifications
private boolean absorptionNotificationSend = true;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean moveOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showtotalpoints;
+ private boolean powerSurgeNotification;
+ private boolean recurrentDamageNotification;
+ private boolean zapperNotification;
+ private boolean ultimateForceNotification;
+ private boolean overloadNotification;
+ private boolean absorptionNotification;
+ @Getter(AccessLevel.PACKAGE)
+ private int absorptionThreshold;
+ @Getter(AccessLevel.PACKAGE)
+ private Color absorptionColorAboveThreshold;
+ @Getter(AccessLevel.PACKAGE)
+ private Color absorptionColorBelowThreshold;
+
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(overlay);
overlay.removeAbsorptionCounter();
}
@@ -95,6 +119,12 @@ public class NightmareZonePlugin extends Plugin
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
+ if (!event.getGroup().equals("nightmareZone"))
+ {
+ return;
+ }
+
+ updateConfig();
overlay.updateConfig();
}
@@ -107,7 +137,7 @@ public class NightmareZonePlugin extends Plugin
@Subscribe
public void onGameTick(GameTick event)
{
- if (!isInNightmareZone())
+ if (isNotInNightmareZone())
{
if (!absorptionNotificationSend)
{
@@ -116,7 +146,8 @@ public class NightmareZonePlugin extends Plugin
return;
}
- if (config.absorptionNotification())
+
+ if (this.absorptionNotification)
{
checkAbsorption();
}
@@ -126,7 +157,7 @@ public class NightmareZonePlugin extends Plugin
public void onChatMessage(ChatMessage event)
{
if (event.getType() != ChatMessageType.GAMEMESSAGE
- || !isInNightmareZone())
+ || isNotInNightmareZone())
{
return;
}
@@ -134,7 +165,7 @@ public class NightmareZonePlugin extends Plugin
String msg = Text.removeTags(event.getMessage()); //remove color
if (msg.contains("The effects of overload have worn off, and you feel normal again."))
{
- if (config.overloadNotification())
+ if (this.overloadNotification)
{
notifier.notify("Your overload has worn off");
}
@@ -143,28 +174,28 @@ public class NightmareZonePlugin extends Plugin
{
if (msg.contains("Power surge"))
{
- if (config.powerSurgeNotification())
+ if (this.powerSurgeNotification)
{
notifier.notify(msg);
}
}
else if (msg.contains("Recurrent damage"))
{
- if (config.recurrentDamageNotification())
+ if (this.recurrentDamageNotification)
{
notifier.notify(msg);
}
}
else if (msg.contains("Zapper"))
{
- if (config.zapperNotification())
+ if (this.zapperNotification)
{
notifier.notify(msg);
}
}
else if (msg.contains("Ultimate force"))
{
- if (config.ultimateForceNotification())
+ if (this.ultimateForceNotification)
{
notifier.notify(msg);
}
@@ -178,23 +209,38 @@ public class NightmareZonePlugin extends Plugin
if (!absorptionNotificationSend)
{
- if (absorptionPoints < config.absorptionThreshold())
+ if (absorptionPoints < this.absorptionThreshold)
{
- notifier.notify("Absorption points below: " + config.absorptionThreshold());
+ notifier.notify("Absorption points below: " + this.absorptionThreshold);
absorptionNotificationSend = true;
}
}
else
{
- if (absorptionPoints > config.absorptionThreshold())
+ if (absorptionPoints > this.absorptionThreshold)
{
absorptionNotificationSend = false;
}
}
}
- public boolean isInNightmareZone()
+ boolean isNotInNightmareZone()
{
- return Arrays.equals(client.getMapRegions(), NMZ_MAP_REGION);
+ return !Arrays.equals(client.getMapRegions(), NMZ_MAP_REGION);
+ }
+
+ private void updateConfig()
+ {
+ this.moveOverlay = config.moveOverlay();
+ this.showtotalpoints = config.showtotalpoints();
+ this.powerSurgeNotification = config.powerSurgeNotification();
+ this.recurrentDamageNotification = config.recurrentDamageNotification();
+ this.zapperNotification = config.zapperNotification();
+ this.ultimateForceNotification = config.ultimateForceNotification();
+ this.overloadNotification = config.overloadNotification();
+ this.absorptionNotification = config.absorptionNotification();
+ this.absorptionThreshold = config.absorptionThreshold();
+ this.absorptionColorAboveThreshold = config.absorptionColorAboveThreshold();
+ this.absorptionColorBelowThreshold = config.absorptionColorBelowThreshold();
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java
index b051cf0e5e..4092f2c15b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java
@@ -29,6 +29,7 @@ import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
+import javax.inject.Singleton;
import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
@@ -44,12 +45,13 @@ import net.runelite.client.ui.ColorScheme;
import net.runelite.client.ui.PluginPanel;
@Slf4j
+@Singleton
class NotesPanel extends PluginPanel
{
private final JTextArea notesEditor = new JTextArea();
private final UndoManager undoRedo = new UndoManager();
- void init(NotesConfig config)
+ void init(final NotesConfig config)
{
// this may or may not qualify as a hack
// but this lets the editor pane expand to fill the whole parent panel
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java
index c923a0eefe..e765944fbd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.notes;
import com.google.inject.Provides;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.events.SessionOpen;
@@ -42,6 +43,7 @@ import net.runelite.client.util.ImageUtil;
tags = {"panel"},
loadWhenOutdated = true
)
+@Singleton
public class NotesPlugin extends Plugin
{
@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java
index 404748db74..8bc34e7738 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java
@@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.api.NPC;
@@ -36,34 +37,34 @@ import net.runelite.api.coords.WorldPoint;
class MemorizedNpc
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int npcIndex;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Set npcNames;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int npcSize;
/**
* The time the npc died at, in game ticks, relative to the tick counter
*/
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private int diedOnTick;
/**
* The time it takes for the npc to respawn, in game ticks
*/
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private int respawnTime;
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private List possibleRespawnLocations;
- MemorizedNpc(NPC npc)
+ MemorizedNpc(final NPC npc)
{
this.npcNames = new HashSet<>();
this.npcNames.add(npc.getName());
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
index 2e1d0cdfa4..122599d15c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.npchighlight;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Provides;
+import java.awt.Color;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
@@ -39,6 +40,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
@@ -78,6 +80,7 @@ import net.runelite.client.util.WildcardMatcher;
tags = {"highlight", "minimap", "npcs", "overlay", "respawn", "tags"}
)
@Slf4j
+@Singleton
public class NpcIndicatorsPlugin extends Plugin
{
private static final int MAX_ACTOR_VIEW_RANGE = 15;
@@ -179,6 +182,21 @@ public class NpcIndicatorsPlugin extends Plugin
*/
private boolean skipNextSpawnCheck = false;
+ @Getter(AccessLevel.PACKAGE)
+ private RenderStyle renderStyle;
+ @Setter(AccessLevel.PACKAGE)
+ private String getNpcToHighlight;
+ @Getter(AccessLevel.PACKAGE)
+ private Color getHighlightColor;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean drawNames;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean drawMinimapNames;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean highlightMenuNames;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showRespawnTimer;
+
@Provides
NpcIndicatorsConfig provideConfig(ConfigManager configManager)
{
@@ -188,6 +206,8 @@ public class NpcIndicatorsPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(npcSceneOverlay);
overlayManager.add(npcMinimapOverlay);
keyManager.registerKeyListener(inputListener);
@@ -236,6 +256,8 @@ public class NpcIndicatorsPlugin extends Plugin
return;
}
+ updateConfig();
+
highlights = getHighlights();
rebuildAllNpcs();
}
@@ -261,7 +283,7 @@ public class NpcIndicatorsPlugin extends Plugin
type -= MENU_ACTION_DEPRIORITIZE_OFFSET;
}
- if (config.highlightMenuNames() &&
+ if (this.highlightMenuNames &&
NPC_MENU_ACTIONS.contains(MenuAction.of(type)) &&
highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == event.getIdentifier()))
{
@@ -490,7 +512,7 @@ public class NpcIndicatorsPlugin extends Plugin
@VisibleForTesting
List getHighlights()
{
- final String configNpcs = config.getNpcToHighlight().toLowerCase();
+ final String configNpcs = this.getNpcToHighlight.toLowerCase();
if (configNpcs.isEmpty())
{
@@ -619,4 +641,15 @@ public class NpcIndicatorsPlugin extends Plugin
despawnedNpcsThisTick.clear();
teleportGraphicsObjectSpawnedThisTick.clear();
}
+
+ private void updateConfig()
+ {
+ this.renderStyle = config.renderStyle();
+ this.getNpcToHighlight = config.getNpcToHighlight();
+ this.getHighlightColor = config.getHighlightColor();
+ this.drawNames = config.drawNames();
+ this.drawMinimapNames = config.drawMinimapNames();
+ this.highlightMenuNames = config.highlightMenuNames();
+ this.showRespawnTimer = config.showRespawnTimer();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java
index 2e46b11bd7..bb5519202c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java
@@ -29,7 +29,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
import net.runelite.api.NPC;
import net.runelite.api.Point;
import net.runelite.client.ui.overlay.Overlay;
@@ -37,17 +37,14 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
public class NpcMinimapOverlay extends Overlay
{
- private final Client client;
- private final NpcIndicatorsConfig config;
private final NpcIndicatorsPlugin plugin;
@Inject
- NpcMinimapOverlay(Client client, NpcIndicatorsConfig config, NpcIndicatorsPlugin plugin)
+ NpcMinimapOverlay(final NpcIndicatorsPlugin plugin)
{
- this.client = client;
- this.config = config;
this.plugin = plugin;
setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_WIDGETS);
@@ -58,7 +55,7 @@ public class NpcMinimapOverlay extends Overlay
{
for (NPC npc : plugin.getHighlightedNpcs())
{
- renderNpcOverlay(graphics, npc, npc.getName(), config.getHighlightColor());
+ renderNpcOverlay(graphics, npc, npc.getName(), plugin.getGetHighlightColor());
}
return null;
@@ -71,7 +68,7 @@ public class NpcMinimapOverlay extends Overlay
{
OverlayUtil.renderMinimapLocation(graphics, minimapLocation, color.darker());
- if (config.drawMinimapNames())
+ if (plugin.isDrawMinimapNames())
{
OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java
index 7fd4cff995..900072d4e3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java
@@ -35,6 +35,7 @@ import java.text.NumberFormat;
import java.time.Instant;
import java.util.Locale;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Constants;
import net.runelite.api.NPC;
@@ -50,6 +51,7 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.util.Text;
+@Singleton
public class NpcSceneOverlay extends Overlay
{
private static final Color TRANSPARENT = new Color(0, 0, 0, 0);
@@ -66,15 +68,13 @@ public class NpcSceneOverlay extends Overlay
}
private final Client client;
- private final NpcIndicatorsConfig config;
private final NpcIndicatorsPlugin plugin;
private final ModelOutlineRenderer modelOutliner;
@Inject
- NpcSceneOverlay(Client client, NpcIndicatorsConfig config, NpcIndicatorsPlugin plugin, ModelOutlineRenderer modelOutliner)
+ NpcSceneOverlay(final Client client, final NpcIndicatorsPlugin plugin, final ModelOutlineRenderer modelOutliner)
{
this.client = client;
- this.config = config;
this.plugin = plugin;
this.modelOutliner = modelOutliner;
setPosition(OverlayPosition.DYNAMIC);
@@ -84,14 +84,14 @@ public class NpcSceneOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (config.showRespawnTimer())
+ if (plugin.isShowRespawnTimer())
{
plugin.getDeadNpcsToDisplay().forEach((id, npc) -> renderNpcRespawn(npc, graphics));
}
for (NPC npc : plugin.getHighlightedNpcs())
{
- renderNpcOverlay(graphics, npc, config.getHighlightColor());
+ renderNpcOverlay(graphics, npc, plugin.getGetHighlightColor());
}
return null;
@@ -112,7 +112,7 @@ public class NpcSceneOverlay extends Overlay
return;
}
- final Color color = config.getHighlightColor();
+ final Color color = plugin.getGetHighlightColor();
final LocalPoint centerLp = new LocalPoint(
lp.getX() + Perspective.LOCAL_TILE_SIZE * (npc.getNpcSize() - 1) / 2,
@@ -149,7 +149,7 @@ public class NpcSceneOverlay extends Overlay
private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color)
{
- switch (config.renderStyle())
+ switch (plugin.getRenderStyle())
{
case SOUTH_WEST_TILE:
LocalPoint lp1 = LocalPoint.fromWorld(client, actor.getWorldLocation());
@@ -194,7 +194,7 @@ public class NpcSceneOverlay extends Overlay
break;
}
- if (config.drawNames() && actor.getName() != null)
+ if (plugin.isDrawNames() && actor.getName() != null)
{
String npcName = Text.removeTags(actor.getName());
Point textLocation = actor.getCanvasTextLocation(graphics, npcName, actor.getLogicalHeight() + 40);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java
index 4a746e63db..01d44c8379 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.npcstatus;
import java.awt.Color;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@@ -39,22 +40,22 @@ class MemorizedNPC
private int npcIndex;
private String npcName;
private int attackSpeed;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private int combatTimerEnd;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private int timeLeft;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private int flinchTimerEnd;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private Status status;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private WorldArea lastnpcarea;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private Actor lastinteracted;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
private int lastspotanimation;
- MemorizedNPC(NPC npc, int attackSpeed, WorldArea worldArea)
+ MemorizedNPC(final NPC npc, final int attackSpeed, final WorldArea worldArea)
{
this.npc = npc;
this.npcIndex = npc.getIndex();
@@ -69,7 +70,7 @@ class MemorizedNPC
this.lastspotanimation = -1;
}
- @Getter
+ @Getter(AccessLevel.PACKAGE)
@AllArgsConstructor
enum Status
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java
index bf0495fae5..5b0b0c97e7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java
@@ -32,9 +32,9 @@ import net.runelite.client.config.ConfigItem;
public interface NpcStatusConfig extends Config
{
@ConfigItem(
- keyName = "AttackRange",
- name = "NPC Attack range",
- description = "The attack range of the NPC"
+ keyName = "AttackRange",
+ name = "NPC Attack range",
+ description = "The attack range of the NPC"
)
default int getRange()
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java
index 7b948f24c0..8814b6769a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.npcstatus;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Point;
import net.runelite.client.ui.overlay.Overlay;
@@ -34,13 +35,14 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
public class NpcStatusOverlay extends Overlay
{
private final Client client;
private final NpcStatusPlugin plugin;
@Inject
- NpcStatusOverlay(Client client, NpcStatusPlugin plugin)
+ NpcStatusOverlay(final Client client, final NpcStatusPlugin plugin)
{
this.client = client;
this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java
index 0f1a59a17a..9e6af3cc93 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java
@@ -30,6 +30,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@@ -39,6 +40,7 @@ import net.runelite.api.GraphicID;
import net.runelite.api.Hitsplat;
import net.runelite.api.NPC;
import net.runelite.api.coords.WorldArea;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.HitsplatApplied;
@@ -46,7 +48,6 @@ import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
-import net.runelite.client.game.ItemManager;
import net.runelite.client.game.NPCManager;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
@@ -59,26 +60,34 @@ import net.runelite.client.ui.overlay.OverlayManager;
tags = {"flinch", "npc"},
enabledByDefault = false
)
+@Singleton
public class NpcStatusPlugin extends Plugin
{
@Getter(AccessLevel.PACKAGE)
private final Set memorizedNPCs = new HashSet<>();
+
@Inject
private Client client;
+
@Inject
private OverlayManager overlayManager;
- @Inject
- private ItemManager itemManager;
+
@Inject
private NPCManager npcManager;
+
@Inject
private NpcStatusConfig config;
+
@Inject
private NpcStatusOverlay npcStatusOverlay;
+
@Getter(AccessLevel.PACKAGE)
private Instant lastTickUpdate;
+
private WorldArea lastPlayerLocation;
+ private int getRange;
+
@Provides
NpcStatusConfig provideConfig(ConfigManager configManager)
{
@@ -88,6 +97,7 @@ public class NpcStatusPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ this.getRange = config.getRange();
overlayManager.add(npcStatusOverlay);
}
@@ -169,7 +179,7 @@ public class NpcStatusPlugin extends Plugin
if (npc.getLastspotanimation() == GraphicID.SPLASH && npc.getNpc().getSpotAnimation() == GraphicID.SPLASH) //For splash flinching
{
npc.setLastspotanimation(-1);
- if ((npc.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT ) || npc.getLastinteracted() == null)
+ if ((npc.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT) || npc.getLastinteracted() == null)
{
npc.setStatus(MemorizedNPC.Status.FLINCHING);
npc.setCombatTimerEnd(-1);
@@ -180,8 +190,8 @@ public class NpcStatusPlugin extends Plugin
}
}
//Checks: will the NPC attack this tick?
- if (((npc.getNpc().getWorldArea().canMelee(client, lastPlayerLocation) && config.getRange() == 1) //Separate mechanics for meleerange-only NPC's because they have extra collisiondata checks (fences etc.) and can't attack diagonally
- || (lastPlayerLocation.hasLineOfSightTo(client, npc.getNpc().getWorldArea()) && npc.getNpc().getWorldArea().distanceTo(lastPlayerLocation) <= config.getRange() && config.getRange() > 1))
+ if (((npc.getNpc().getWorldArea().canMelee(client, lastPlayerLocation) && this.getRange == 1) //Separate mechanics for meleerange-only NPC's because they have extra collisiondata checks (fences etc.) and can't attack diagonally
+ || (lastPlayerLocation.hasLineOfSightTo(client, npc.getNpc().getWorldArea()) && npc.getNpc().getWorldArea().distanceTo(lastPlayerLocation) <= this.getRange && this.getRange > 1))
&& ((npc.getStatus() != MemorizedNPC.Status.FLINCHING && CombatTime < 9) || (npc.getStatus() == MemorizedNPC.Status.FLINCHING && FlinchTime < 2))
&& npc.getNpc().getAnimation() != -1 //Failsafe, attacking NPC's always have an animation.
&& !(npc.getLastnpcarea().distanceTo(lastPlayerLocation) == 0 && npc.getLastnpcarea() != npc.getNpc().getWorldArea())) //Weird mechanic: NPC's can't attack on the tick they do a random move
@@ -228,4 +238,15 @@ public class NpcStatusPlugin extends Plugin
checkStatus();
lastPlayerLocation = client.getLocalPlayer().getWorldArea();
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged configChanged)
+ {
+ if (!configChanged.getGroup().equals("npcstatus"))
+ {
+ return;
+ }
+
+ this.getRange = config.getRange();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java
index 7194d2ddd6..5a091eaabd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java
@@ -29,6 +29,7 @@ import java.awt.image.BufferedImage;
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.client.plugins.Plugin;
@@ -36,11 +37,11 @@ import net.runelite.client.ui.overlay.infobox.Timer;
class AggressionTimer extends Timer
{
- @Getter
- @Setter
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private boolean visible;
- AggressionTimer(Duration duration, BufferedImage image, Plugin plugin, boolean visible)
+ AggressionTimer(final Duration duration, final BufferedImage image, final Plugin plugin, final boolean visible)
{
super(duration.toMillis(), ChronoUnit.MILLIS, image, plugin);
setTooltip("Time until NPCs become unaggressive");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java
index 3d238cce85..533d4ae93b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.npcunaggroarea;
import com.google.inject.Inject;
+import com.google.inject.Singleton;
import java.awt.Dimension;
import java.awt.Graphics2D;
import net.runelite.client.ui.overlay.Overlay;
@@ -33,17 +34,16 @@ import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
+@Singleton
class NpcAggroAreaNotWorkingOverlay extends Overlay
{
private final NpcAggroAreaPlugin plugin;
- private final NpcAggroAreaConfig config;
private final PanelComponent panelComponent;
@Inject
- private NpcAggroAreaNotWorkingOverlay(NpcAggroAreaPlugin plugin, NpcAggroAreaConfig config)
+ private NpcAggroAreaNotWorkingOverlay(final NpcAggroAreaPlugin plugin)
{
this.plugin = plugin;
- this.config = config;
panelComponent = new PanelComponent();
panelComponent.setPreferredSize(new Dimension(150, 0));
@@ -58,7 +58,7 @@ class NpcAggroAreaNotWorkingOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (!plugin.isActive() || plugin.getSafeCenters()[1] != null || config.hideOverlayHint())
+ if (!plugin.isActive() || plugin.getSafeCenters()[1] != null || plugin.isHideOverlayHint())
{
return null;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java
index 2090fca5c2..5a295e2f35 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java
@@ -24,6 +24,7 @@
*/
package net.runelite.client.plugins.npcunaggroarea;
+import javax.inject.Singleton;
import net.runelite.api.geometry.Geometry;
import java.awt.BasicStroke;
import java.awt.Color;
@@ -42,19 +43,18 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
+@Singleton
class NpcAggroAreaOverlay extends Overlay
{
private static final int MAX_LOCAL_DRAW_LENGTH = 20 * Perspective.LOCAL_TILE_SIZE;
private final Client client;
- private final NpcAggroAreaConfig config;
private final NpcAggroAreaPlugin plugin;
@Inject
- private NpcAggroAreaOverlay(Client client, NpcAggroAreaConfig config, NpcAggroAreaPlugin plugin)
+ private NpcAggroAreaOverlay(final Client client, final NpcAggroAreaPlugin plugin)
{
this.client = client;
- this.config = config;
this.plugin = plugin;
setLayer(OverlayLayer.ABOVE_SCENE);
@@ -76,7 +76,7 @@ class NpcAggroAreaOverlay extends Overlay
return null;
}
- Color outlineColor = config.aggroAreaColor();
+ Color outlineColor = plugin.getAggroAreaColor();
AggressionTimer timer = plugin.getCurrentTimer();
if (timer == null || Instant.now().compareTo(timer.getEndTime()) < 0)
{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java
index d7aede1a4f..d4093c07a5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java
@@ -24,6 +24,9 @@
*/
package net.runelite.client.plugins.npcunaggroarea;
+import java.awt.Color;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import net.runelite.api.geometry.Geometry;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
@@ -69,6 +72,7 @@ import net.runelite.client.util.WildcardMatcher;
tags = {"highlight", "lines", "unaggro", "aggro", "aggressive", "npcs", "area", "slayer"},
enabledByDefault = false
)
+@Singleton
public class NpcAggroAreaPlugin extends Plugin
{
/*
@@ -112,18 +116,28 @@ public class NpcAggroAreaPlugin extends Plugin
@Inject
private ConfigManager configManager;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final WorldPoint[] safeCenters = new WorldPoint[2];
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final GeneralPath[] linesToDisplay = new GeneralPath[Constants.MAX_Z];
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private boolean active;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private AggressionTimer currentTimer;
+ private boolean alwaysActive;
+ private String configNpcNamePatterns;
+ private boolean showTimer;
+ private boolean showAreaLines;
+ @Getter(AccessLevel.PACKAGE)
+ private Color aggroAreaColor;
+ private boolean showNotWorkingOverlay;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean hideOverlayHint;
+
private WorldPoint lastPlayerLocation;
private WorldPoint previousUnknownCenter;
private boolean loggingIn;
@@ -139,14 +153,16 @@ public class NpcAggroAreaPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(overlay);
- if (config.showNotWorkingOverlay())
+ if (this.showNotWorkingOverlay)
{
overlayManager.add(notWorkingOverlay);
notWorkingOverlayShown = true;
}
- npcNamePatterns = NAME_SPLITTER.splitToList(config.npcNamePatterns());
+ npcNamePatterns = NAME_SPLITTER.splitToList(this.configNpcNamePatterns);
recheckActive();
}
@@ -203,7 +219,7 @@ public class NpcAggroAreaPlugin extends Plugin
{
if (currentTimer != null)
{
- currentTimer.setVisible(active && config.showTimer());
+ currentTimer.setVisible(active && this.showTimer);
}
calculateLinesToDisplay();
@@ -211,7 +227,7 @@ public class NpcAggroAreaPlugin extends Plugin
private void calculateLinesToDisplay()
{
- if (!active || !config.showAreaLines())
+ if (!active || !this.showAreaLines)
{
Arrays.fill(linesToDisplay, null);
return;
@@ -241,7 +257,7 @@ public class NpcAggroAreaPlugin extends Plugin
{
removeTimer();
BufferedImage image = itemManager.getImage(ItemID.ENSOULED_DEMON_HEAD);
- currentTimer = new AggressionTimer(duration, image, this, active && config.showTimer());
+ currentTimer = new AggressionTimer(duration, image, this, active && this.showTimer);
infoBoxManager.addInfoBox(currentTimer);
}
@@ -310,14 +326,14 @@ public class NpcAggroAreaPlugin extends Plugin
private void recheckActive()
{
- active = config.alwaysActive();
+ active = this.alwaysActive;
checkAreaNpcs(client.getCachedNPCs());
}
@Subscribe
public void onNpcSpawned(NpcSpawned event)
{
- if (config.alwaysActive())
+ if (this.alwaysActive)
{
return;
}
@@ -374,6 +390,13 @@ public class NpcAggroAreaPlugin extends Plugin
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
+ if (!event.getGroup().equals("npcUnaggroArea"))
+ {
+ return;
+ }
+
+ updateConfig();
+
String key = event.getKey();
switch (key)
{
@@ -383,7 +406,7 @@ public class NpcAggroAreaPlugin extends Plugin
case "npcUnaggroShowTimer":
if (currentTimer != null)
{
- currentTimer.setVisible(active && config.showTimer());
+ currentTimer.setVisible(active && this.showTimer);
}
break;
case "npcUnaggroCollisionDetection":
@@ -391,7 +414,7 @@ public class NpcAggroAreaPlugin extends Plugin
calculateLinesToDisplay();
break;
case "npcUnaggroNames":
- npcNamePatterns = NAME_SPLITTER.splitToList(config.npcNamePatterns());
+ npcNamePatterns = NAME_SPLITTER.splitToList(this.configNpcNamePatterns);
recheckActive();
break;
}
@@ -483,4 +506,15 @@ public class NpcAggroAreaPlugin extends Plugin
break;
}
}
+
+ private void updateConfig()
+ {
+ this.alwaysActive = config.alwaysActive();
+ this.configNpcNamePatterns = config.npcNamePatterns();
+ this.showTimer = config.showTimer();
+ this.showAreaLines = config.showAreaLines();
+ this.aggroAreaColor = config.aggroAreaColor();
+ this.showNotWorkingOverlay = config.showNotWorkingOverlay();
+ this.hideOverlayHint = config.hideOverlayHint();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java
index a4e9aee7e9..e9ac6d354a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Polygon;
import java.awt.geom.Area;
import static java.lang.Math.floor;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.DecorativeObject;
import net.runelite.api.GameObject;
@@ -43,20 +44,19 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
class ObjectIndicatorsOverlay extends Overlay
{
private static final Color TRANSPARENT = new Color(0, 0, 0, 0);
private final Client client;
- private final ObjectIndicatorsConfig config;
private final ObjectIndicatorsPlugin plugin;
private final ModelOutlineRenderer modelOutliner;
@Inject
- private ObjectIndicatorsOverlay(Client client, ObjectIndicatorsConfig config, ObjectIndicatorsPlugin plugin, ModelOutlineRenderer modelOutliner)
+ private ObjectIndicatorsOverlay(final Client client, final ObjectIndicatorsPlugin plugin, final ModelOutlineRenderer modelOutliner)
{
this.client = client;
- this.config = config;
this.plugin = plugin;
this.modelOutliner = modelOutliner;
setPosition(OverlayPosition.DYNAMIC);
@@ -74,14 +74,14 @@ class ObjectIndicatorsOverlay extends Overlay
continue;
}
- Color color = config.objectMarkerColor();
- int opacity = (int) floor(config.objectMarkerAlpha() * 2.55);
+ Color color = plugin.getObjectMarkerColor();
+ int opacity = (int) floor(plugin.getObjectMarkerAlpha() * 2.55);
Color objectColor = new Color(color.getRed(), color.getGreen(), color.getBlue(), opacity);
- switch (config.objectMarkerRenderStyle())
+ switch (plugin.getObjectMarkerRenderStyle())
{
case OUTLINE:
- switch (config.objectMarkerOutlineRenderStyle())
+ switch (plugin.getObjectMarkerOutlineRenderStyle())
{
case THIN_OUTLINE:
modelOutliner.drawOutline(object, 1, objectColor);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
index adb0cb4bc5..f21d7ef067 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
@@ -29,6 +29,7 @@ import com.google.common.base.Strings;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Provides;
+import java.awt.Color;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Arrays;
@@ -38,6 +39,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@@ -53,6 +55,7 @@ import net.runelite.api.Scene;
import net.runelite.api.Tile;
import net.runelite.api.TileObject;
import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.DecorativeObjectDespawned;
import net.runelite.api.events.DecorativeObjectSpawned;
import net.runelite.api.events.FocusChanged;
@@ -76,6 +79,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
tags = {"overlay", "objects", "mark", "marker"},
enabledByDefault = false
)
+@Singleton
public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
{
private static final String CONFIG_GROUP = "objectindicators";
@@ -100,9 +104,21 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
@Inject
private ObjectIndicatorsOverlay overlay;
+ @Inject
+ private ObjectIndicatorsConfig config;
+
@Inject
private KeyManager keyManager;
+ @Getter(AccessLevel.PACKAGE)
+ private RenderStyle objectMarkerRenderStyle;
+ @Getter(AccessLevel.PACKAGE)
+ private OutlineRenderStyle objectMarkerOutlineRenderStyle;
+ @Getter(AccessLevel.PACKAGE)
+ private Color objectMarkerColor;
+ @Getter(AccessLevel.PACKAGE)
+ private int objectMarkerAlpha;
+
@Provides
ObjectIndicatorsConfig provideConfig(ConfigManager configManager)
{
@@ -112,6 +128,8 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
@Override
protected void startUp()
{
+ updateConfig();
+
overlayManager.add(overlay);
keyManager.registerKeyListener(this);
}
@@ -428,4 +446,23 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
{
}.getType());
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("objectindicators"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ private void updateConfig()
+ {
+ this.objectMarkerRenderStyle = config.objectMarkerRenderStyle();
+ this.objectMarkerOutlineRenderStyle = config.objectMarkerOutlineRenderStyle();
+ this.objectMarkerColor = config.objectMarkerColor();
+ this.objectMarkerAlpha = config.objectMarkerAlpha();
+ }
}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
index 9ca6337427..2913384345 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
@@ -52,6 +53,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.util.Text;
import net.runelite.http.api.hiscore.HiscoreResult;
+@Singleton
class OpponentInfoOverlay extends Overlay
{
private static final Color HP_GREEN = new Color(0, 146, 54, 230);
@@ -59,7 +61,6 @@ class OpponentInfoOverlay extends Overlay
private final Client client;
private final OpponentInfoPlugin opponentInfoPlugin;
- private final OpponentInfoConfig opponentInfoConfig;
private final HiscoreManager hiscoreManager;
private final NPCManager npcManager;
@@ -73,16 +74,14 @@ class OpponentInfoOverlay extends Overlay
@Inject
private OpponentInfoOverlay(
- Client client,
- OpponentInfoPlugin opponentInfoPlugin,
- OpponentInfoConfig opponentInfoConfig,
- HiscoreManager hiscoreManager,
- NPCManager npcManager)
+ final Client client,
+ final OpponentInfoPlugin opponentInfoPlugin,
+ final HiscoreManager hiscoreManager,
+ final NPCManager npcManager)
{
super(opponentInfoPlugin);
this.client = client;
this.opponentInfoPlugin = opponentInfoPlugin;
- this.opponentInfoConfig = opponentInfoConfig;
this.hiscoreManager = hiscoreManager;
this.npcManager = npcManager;
@@ -164,7 +163,7 @@ class OpponentInfoOverlay extends Overlay
progressBarComponent.setBackgroundColor(HP_RED);
progressBarComponent.setForegroundColor(HP_GREEN);
- final HitpointsDisplayStyle displayStyle = opponentInfoConfig.hitpointsDisplayStyle();
+ final HitpointsDisplayStyle displayStyle = opponentInfoPlugin.getHitpointsDisplayStyle();
if ((displayStyle == HitpointsDisplayStyle.HITPOINTS || displayStyle == HitpointsDisplayStyle.BOTH)
&& lastMaxHealth != -1)
@@ -219,7 +218,7 @@ class OpponentInfoOverlay extends Overlay
}
// Opponents opponent
- if (opponentsOpponentName != null && opponentInfoConfig.showOpponentsOpponent())
+ if (opponentsOpponentName != null && opponentInfoPlugin.isShowOpponentsOpponent())
{
textWidth = Math.max(textWidth, fontMetrics.stringWidth(opponentsOpponentName));
panelComponent.setPreferredSize(new Dimension(textWidth, 0));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java
index 6e36665a8b..979633bdf7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java
@@ -30,12 +30,14 @@ import java.time.Duration;
import java.time.Instant;
import java.util.EnumSet;
import javax.inject.Inject;
+import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.WorldType;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.InteractingChanged;
@@ -51,6 +53,7 @@ import net.runelite.http.api.hiscore.HiscoreEndpoint;
description = "Show name and hitpoints information about the NPC you are fighting",
tags = {"combat", "health", "hitpoints", "npcs", "overlay"}
)
+@Singleton
public class OpponentInfoPlugin extends Plugin
{
private static final Duration WAIT = Duration.ofSeconds(5);
@@ -78,6 +81,13 @@ public class OpponentInfoPlugin extends Plugin
private Instant lastTime;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean lookupOnInteraction;
+ @Getter(AccessLevel.PACKAGE)
+ private HitpointsDisplayStyle hitpointsDisplayStyle;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean showOpponentsOpponent;
+
@Provides
OpponentInfoConfig provideConfig(ConfigManager configManager)
{
@@ -87,6 +97,8 @@ public class OpponentInfoPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(opponentInfoOverlay);
overlayManager.add(playerComparisonOverlay);
}
@@ -159,4 +171,22 @@ public class OpponentInfoPlugin extends Plugin
}
}
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("opponentinfo"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ private void updateConfig()
+ {
+ this.lookupOnInteraction = config.lookupOnInteraction();
+ this.hitpointsDisplayStyle = config.hitpointsDisplayStyle();
+ this.showOpponentsOpponent = config.showOpponentsOpponent();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java
index 867e0e6004..c89603364f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
@@ -49,6 +50,7 @@ import net.runelite.client.util.Text;
import net.runelite.http.api.hiscore.HiscoreResult;
import net.runelite.http.api.hiscore.HiscoreSkill;
+@Singleton
class PlayerComparisonOverlay extends Overlay
{
private static final Color HIGHER_STAT_TEXT_COLOR = Color.GREEN;
@@ -82,17 +84,15 @@ class PlayerComparisonOverlay extends Overlay
private final Client client;
private final OpponentInfoPlugin opponentInfoPlugin;
- private final OpponentInfoConfig config;
private final HiscoreManager hiscoreManager;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
- private PlayerComparisonOverlay(Client client, OpponentInfoPlugin opponentInfoPlugin, OpponentInfoConfig config, HiscoreManager hiscoreManager)
+ private PlayerComparisonOverlay(final Client client, final OpponentInfoPlugin opponentInfoPlugin, final HiscoreManager hiscoreManager)
{
super(opponentInfoPlugin);
this.client = client;
this.opponentInfoPlugin = opponentInfoPlugin;
- this.config = config;
this.hiscoreManager = hiscoreManager;
setPosition(OverlayPosition.BOTTOM_LEFT);
@@ -103,7 +103,7 @@ class PlayerComparisonOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (!config.lookupOnInteraction())
+ if (!opponentInfoPlugin.isLookupOnInteraction())
{
return null;
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java
index 9134c1f8d1..f7811806dd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
import java.awt.Polygon;
import java.util.Iterator;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.coords.LocalPoint;
@@ -38,6 +39,7 @@ import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
+@Singleton
class PartyPingOverlay extends Overlay
{
private final Client client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
index 2d7bddc3a6..ac83ef69e1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
@@ -38,6 +38,8 @@ import java.util.UUID;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Named;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ChatMessageType;
@@ -50,6 +52,7 @@ import net.runelite.api.SoundEffectID;
import net.runelite.api.Tile;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.CommandExecuted;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.FocusChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.MenuOptionClicked;
@@ -87,6 +90,7 @@ import net.runelite.http.api.ws.messages.party.UserSync;
description = "Shows useful information about current party"
)
@Slf4j
+@Singleton
public class PartyPlugin extends Plugin implements KeyListener
{
@Inject
@@ -126,16 +130,24 @@ public class PartyPlugin extends Plugin implements KeyListener
@Named("developerMode")
boolean developerMode;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final Map partyDataMap = Collections.synchronizedMap(new HashMap<>());
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final List pendingTilePings = Collections.synchronizedList(new ArrayList<>());
private int lastHp, lastPray;
private boolean hotkeyDown, doSync;
private boolean sendAlert;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean stats;
+ private boolean pings;
+ private boolean sounds;
+ private boolean messages;
+ @Getter(AccessLevel.PACKAGE)
+ private boolean recolorNames;
+
@Override
public void configure(Binder binder)
{
@@ -145,6 +157,8 @@ public class PartyPlugin extends Plugin implements KeyListener
@Override
protected void startUp() throws Exception
{
+ updateConfig();
+
overlayManager.add(partyStatsOverlay);
overlayManager.add(partyPingOverlay);
wsClient.registerMessage(SkillUpdate.class);
@@ -186,7 +200,7 @@ public class PartyPlugin extends Plugin implements KeyListener
{
party.changeParty(null);
- if (!config.messages())
+ if (!this.messages)
{
return;
}
@@ -206,7 +220,7 @@ public class PartyPlugin extends Plugin implements KeyListener
@Subscribe
public void onMenuOptionClicked(MenuOptionClicked event)
{
- if (!hotkeyDown || client.isMenuOpen() || party.getMembers().isEmpty() || !config.pings())
+ if (!hotkeyDown || client.isMenuOpen() || party.getMembers().isEmpty() || !this.pings)
{
return;
}
@@ -246,14 +260,14 @@ public class PartyPlugin extends Plugin implements KeyListener
@Subscribe
public void onTilePing(TilePing event)
{
- if (config.pings())
+ if (this.pings)
{
final PartyData partyData = getPartyData(event.getMemberId());
final Color color = partyData != null ? partyData.getColor() : Color.RED;
pendingTilePings.add(new PartyTilePingData(event.getPoint(), color));
}
- if (config.sounds())
+ if (this.sounds)
{
WorldPoint point = event.getPoint();
@@ -375,7 +389,7 @@ public class PartyPlugin extends Plugin implements KeyListener
{
final PartyData partyData = getPartyData(event.getMemberId());
- if (partyData == null || !config.messages())
+ if (partyData == null || !this.messages)
{
return;
}
@@ -427,7 +441,7 @@ public class PartyPlugin extends Plugin implements KeyListener
if (removed != null)
{
- if (config.messages())
+ if (this.messages)
{
final String joinMessage = new ChatMessageBuilder()
.append(ChatColorType.HIGHLIGHT)
@@ -546,4 +560,24 @@ public class PartyPlugin extends Plugin implements KeyListener
.runeLiteFormattedMessage(helpMessage)
.build());
}
+
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("party"))
+ {
+ return;
+ }
+
+ updateConfig();
+ }
+
+ private void updateConfig()
+ {
+ this.stats = config.stats();
+ this.pings = config.pings();
+ this.sounds = config.sounds();
+ this.messages = config.messages();
+ this.recolorNames = config.recolorNames();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java
index 693b23cb89..17c791cf19 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Rectangle;
import java.util.Map;
import java.util.UUID;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.MenuAction;
import net.runelite.client.plugins.party.data.PartyData;
import net.runelite.client.ui.overlay.Overlay;
@@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.components.ProgressBarComponent;
import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.ws.PartyService;
+@Singleton
public class PartyStatsOverlay extends Overlay
{
private static final Color HP_FG = new Color(0, 146, 54, 230);
@@ -51,7 +53,6 @@ public class PartyStatsOverlay extends Overlay
private final PartyPlugin plugin;
private final PartyService party;
- private final PartyConfig config;
private final PanelComponent body = new PanelComponent();
@Inject
@@ -60,7 +61,6 @@ public class PartyStatsOverlay extends Overlay
super(plugin);
this.plugin = plugin;
this.party = party;
- this.config = config;
body.setBorder(new Rectangle());
body.setGap(new Point(0, ComponentConstants.STANDARD_BORDER / 2));
getMenuEntries().add(new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, "Leave", "Party"));
@@ -69,7 +69,7 @@ public class PartyStatsOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
- if (!config.stats())
+ if (!plugin.isStats())
{
return null;
}
@@ -107,7 +107,7 @@ public class PartyStatsOverlay extends Overlay
final TitleComponent name = TitleComponent.builder()
.text(v.getName())
- .color(config.recolorNames() ? v.getColor() : Color.WHITE)
+ .color(plugin.isRecolorNames() ? v.getColor() : Color.WHITE)
.build();
panel.getChildren().add(name);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java
index a2ae27835b..8a51f5fa0c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java
@@ -39,7 +39,7 @@ class PartyWorldMapPoint extends WorldMapPoint
private BufferedImage partyImage;
private PartyMember member;
- PartyWorldMapPoint(WorldPoint worldPoint, PartyMember member)
+ PartyWorldMapPoint(final WorldPoint worldPoint, final PartyMember member)
{
super(worldPoint, null);
this.member = member;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java
index cc81fa1bfb..25336dbb38 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java
@@ -24,16 +24,17 @@
*/
package net.runelite.client.plugins.performancestats;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.http.api.ws.messages.party.PartyMemberMessage;
-@Getter
+@Getter(AccessLevel.PACKAGE)
class Performance extends PartyMemberMessage
{
private static final double TICK_LENGTH = 0.6;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
String username;
double damageDealt = 0;
@@ -43,7 +44,7 @@ class Performance extends PartyMemberMessage
double highestHitTaken = 0;
int lastActivityTick = -1;
- @Setter
+ @Setter(AccessLevel.PACKAGE)
double ticksSpent = 0;
void addDamageDealt(double a, int currentTick)
@@ -83,7 +84,7 @@ class Performance extends PartyMemberMessage
ticksSpent = 0;
}
- double getSecondsSpent()
+ private double getSecondsSpent()
{
return Math.round(this.ticksSpent * TICK_LENGTH);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java
index c2d2961034..ede483cfa1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.MenuAction;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayMenuEntry;
@@ -38,6 +39,7 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
+@Singleton
public class PerformanceStatsOverlay extends Overlay
{
private static final String TARGET = "Performance Stats";
@@ -50,7 +52,7 @@ public class PerformanceStatsOverlay extends Overlay
private final TableComponent tableComponent = new TableComponent();
@Inject
- PerformanceStatsOverlay(PerformanceStatsPlugin tracker)
+ PerformanceStatsOverlay(final PerformanceStatsPlugin tracker)
{
super(tracker);
setPosition(OverlayPosition.TOP_RIGHT);
@@ -111,8 +113,8 @@ public class PerformanceStatsOverlay extends Overlay
return new String[]
{
performance.getUsername(),
- String.valueOf((int) Math.round(performance.getDamageDealt())) + " | " + String.valueOf((int) Math.round(performance.getHighestHitDealt())),
- String.valueOf((int) Math.round(performance.getDamageTaken())) + " | " + String.valueOf((int) Math.round(performance.getHighestHitTaken())),
+ (int) Math.round(performance.getDamageDealt()) + " | " + String.valueOf((int) Math.round(performance.getHighestHitDealt())),
+ (int) Math.round(performance.getDamageTaken()) + " | " + String.valueOf((int) Math.round(performance.getHighestHitTaken())),
String.valueOf(performance.getDPS()),
performance.getHumanReadableSecondsSpent()
};
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java
index fa3e7fd530..41fdfedfc6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java
@@ -31,6 +31,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Actor;
@@ -39,6 +41,7 @@ import net.runelite.api.Client;
import net.runelite.api.NPC;
import net.runelite.api.Skill;
import net.runelite.api.WorldType;
+import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.ExperienceChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
@@ -72,6 +75,7 @@ import net.runelite.http.api.ws.messages.party.UserSync;
enabledByDefault = false
)
@Slf4j
+@Singleton
public class PerformanceStatsPlugin extends Plugin
{
// For every damage point dealt 1.33 experience is given to the player's hitpoints (base rate)
@@ -105,11 +109,11 @@ public class PerformanceStatsPlugin extends Plugin
@Inject
private WSClient wsClient;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private boolean enabled = false;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private boolean paused = false;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final Performance performance = new Performance();
// Keep track of actor last tick as sometimes getInteracting can return null when hp xp event is triggered
@@ -119,8 +123,10 @@ public class PerformanceStatsPlugin extends Plugin
private boolean hopping;
private int pausedTicks = 0;
+ private int submitTimeout;
+
// Party System
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private final Map partyDataMap = Collections.synchronizedMap(new HashMap<>());
@Provides
@@ -132,6 +138,8 @@ public class PerformanceStatsPlugin extends Plugin
@Override
protected void startUp()
{
+ this.submitTimeout = config.submitTimeout();
+
overlayManager.add(performanceTrackerOverlay);
wsClient.registerMessage(Performance.class);
}
@@ -266,7 +274,7 @@ public class PerformanceStatsPlugin extends Plugin
performance.incrementTicksSpent();
hopping = false;
- final int timeout = config.submitTimeout();
+ final int timeout = this.submitTimeout;
if (timeout > 0)
{
final double tickTimeout = timeout / GAME_TICK_SECONDS;
@@ -449,4 +457,14 @@ public class PerformanceStatsPlugin extends Plugin
partyDataMap.clear();
}
+ @Subscribe
+ public void onConfigChanged(ConfigChanged event)
+ {
+ if (!event.getGroup().equals("performancestats"))
+ {
+ return;
+ }
+
+ this.submitTimeout = config.submitTimeout();
+ }
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java
index 6e9e4274bd..5ed0b19202 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java
@@ -30,6 +30,7 @@ import java.time.Instant;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
@@ -44,19 +45,19 @@ public class Game
private PestControlPlugin plugin;
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Portal bluePortal = new Portal(PortalColor.BLUE, WidgetPortal.BLUE);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Portal purplePortal = new Portal(PortalColor.PURPLE, WidgetPortal.PURPLE);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Portal yellowPortal = new Portal(PortalColor.YELLOW, WidgetPortal.YELLOW);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private Portal redPortal = new Portal(PortalColor.RED, WidgetPortal.RED);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private int shieldsDropped = 0;
// Game starts with all possible rotations
@@ -103,7 +104,7 @@ public class Game
}
}
- public void lowerPortalShield(String portalColor)
+ void lowerPortalShield(String portalColor)
{
switch (portalColor.toLowerCase())
{
@@ -124,7 +125,7 @@ public class Game
private void lowerPortalShield(Portal portal)
{
- if (!portal.isShielded())
+ if (portal.isNotShielded())
{
return;
}
@@ -149,7 +150,7 @@ public class Game
possibleRotations = rotations.toArray(new PortalRotation[rotations.size()]);
}
- public void killPortal(Portal portal)
+ private void killPortal(Portal portal)
{
if (portal.isDead())
{
@@ -185,7 +186,7 @@ public class Game
return false;
}
- public void setPortalLocations(WorldPoint squireLocation)
+ private void setPortalLocations(WorldPoint squireLocation)
{
int x = squireLocation.getX();
int y = squireLocation.getY();
@@ -198,7 +199,7 @@ public class Game
portalLocationsSet = true;
}
- public List getPortals()
+ List getPortals()
{
List portalList = new ArrayList();
@@ -210,7 +211,7 @@ public class Game
return portalList;
}
- public Portal getPortal(PortalColor portalColor)
+ Portal getPortal(PortalColor portalColor)
{
if (bluePortal.getColor() == portalColor)
{
@@ -232,7 +233,7 @@ public class Game
return null;
}
- public Collection getNextPortals()
+ Collection getNextPortals()
{
List portals = new ArrayList<>();
@@ -249,7 +250,7 @@ public class Game
return portals;
}
- public Collection getActivePortals()
+ Collection getActivePortals()
{
List portals = new ArrayList<>();
@@ -264,7 +265,7 @@ public class Game
return portals;
}
- public Duration getTimeTillNextPortal()
+ Duration getTimeTillNextPortal()
{
Instant nextShieldDrop;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java
index db8abe87b7..31191088bd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.pestcontrol;
import com.google.inject.Inject;
+import com.google.inject.Singleton;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Dimension;
@@ -43,17 +44,16 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager;
import net.runelite.client.util.ColorUtil;
@Slf4j
+@Singleton
public class GangplankOverlay extends Overlay
{
private final Client client;
- private final PestControlConfig config;
private final PestControlPlugin plugin;
private final TooltipManager tooltipManager;
@Inject
- GangplankOverlay(Client client, PestControlConfig config, PestControlPlugin plugin, TooltipManager toolTipManager)
+ GangplankOverlay(final Client client, final PestControlPlugin plugin, final TooltipManager toolTipManager)
{
- this.config = config;
this.plugin = plugin;
this.client = client;
this.tooltipManager = toolTipManager;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java
index 90c81228a1..b22798f57e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java
@@ -30,6 +30,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Singleton;
import net.runelite.api.Client;
import net.runelite.api.NPC;
import net.runelite.api.coords.WorldPoint;
@@ -37,16 +38,15 @@ import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
+@Singleton
public class HintArrowOverlay extends Overlay
{
- private final PestControlConfig config;
private final PestControlPlugin plugin;
private final Client client;
@Inject
- HintArrowOverlay(PestControlConfig config, PestControlPlugin plugin, Client client)
+ HintArrowOverlay(final PestControlPlugin plugin, final Client client)
{
- this.config = config;
this.plugin = plugin;
this.client = client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java
index 56c51fdd8d..3dfaee777b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java
@@ -25,15 +25,16 @@
package net.runelite.client.plugins.pestcontrol;
import java.awt.Color;
+import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import net.runelite.client.plugins.pestcontrol.config.NpcHighlightStyle;
@AllArgsConstructor
-@Getter
-@Setter
-public class NpcHighlightContext
+@Getter(AccessLevel.PACKAGE)
+@Setter(AccessLevel.PACKAGE)
+class NpcHighlightContext
{
private NpcHighlightStyle npcRenderStyle;
private Color color;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java
index bb8e94c175..540134714b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java
@@ -25,6 +25,7 @@
package net.runelite.client.plugins.pestcontrol;
import com.google.inject.Inject;
+import com.google.inject.Singleton;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Dimension;
@@ -43,16 +44,15 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
@Slf4j
+@Singleton
public class NpcHighlightOverlay extends Overlay
{
- private final PestControlConfig config;
private final PestControlPlugin plugin;
private final Client client;
@Inject
- NpcHighlightOverlay(PestControlConfig config, PestControlPlugin plugin, Client client)
+ NpcHighlightOverlay(final PestControlPlugin plugin, final Client client)
{
- this.config = config;
this.plugin = plugin;
this.client = client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java
index e1b9ef143e..50ca737592 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java
@@ -26,13 +26,14 @@ package net.runelite.client.plugins.pestcontrol;
import com.google.common.collect.ImmutableSet;
import java.util.Set;
+import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.NpcID;
-@Getter
+@Getter(AccessLevel.PACKAGE)
public class PestControlNpc
{
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private static final Set splatterIdSet = ImmutableSet.of(
NpcID.SPLATTER,
NpcID.SPLATTER_1690,
@@ -41,7 +42,7 @@ public class PestControlNpc
NpcID.SPLATTER_1693
);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
public static final Set shifterIdSet = ImmutableSet.of(
NpcID.SHIFTER,
NpcID.SHIFTER_1695,
@@ -55,7 +56,7 @@ public class PestControlNpc
NpcID.SHIFTER_1703
);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private static final Set spinnerIdSet = ImmutableSet.of(
NpcID.SPINNER,
NpcID.SPINNER_1710,
@@ -64,7 +65,7 @@ public class PestControlNpc
NpcID.SPINNER_1713
);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private static final Set torcherIdSet = ImmutableSet.of(
NpcID.TORCHER,
NpcID.TORCHER_1715,
@@ -78,7 +79,7 @@ public class PestControlNpc
NpcID.TORCHER_1723
);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private static final Set defilerIdSet = ImmutableSet.of(
NpcID.DEFILER,
NpcID.DEFILER_1725,
@@ -92,7 +93,7 @@ public class PestControlNpc
NpcID.DEFILER_1733
);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private static final Set brawlerIdSet = ImmutableSet.of(
NpcID.BRAWLER,
NpcID.BRAWLER_1735,
@@ -101,7 +102,7 @@ public class PestControlNpc
NpcID.BRAWLER_1738
);
- @Getter
+ @Getter(AccessLevel.PACKAGE)
private static final Set