From e70cefbb601818c2db3fb00c8073afbb09843631 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:29:47 +0200 Subject: [PATCH] theatre: Final fields --- .../client/plugins/theatre/rooms/MaidenHandler.java | 12 ++++++------ .../plugins/theatre/rooms/SotetsegHandler.java | 10 +++++----- .../plugins/theatre/rooms/nylocas/NyloHandler.java | 4 ++-- .../plugins/theatre/rooms/nylocas/NyloOverlay.java | 2 +- .../plugins/theatre/rooms/nylocas/NyloPredictor.java | 12 ++++++------ .../plugins/theatre/rooms/xarpus/XarpusCounter.java | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java index d62bf8c8ea..62ffeb2e54 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java @@ -54,18 +54,18 @@ public class MaidenHandler extends RoomHandler ); private static final Color TRANSPARENT = new Color(0, 0, 0, 0); private static final Color FREEZE = new Color(0, 226, 255, 255); - private List bloodThrows = new ArrayList<>(); - private List bloodSpawns = new ArrayList<>(); + private final List bloodThrows = new ArrayList<>(); + private final List bloodSpawns = new ArrayList<>(); private List bloodSpawnLocation = new ArrayList<>(); - private List bloodSpawnTarget = new ArrayList<>(); + private final List bloodSpawnTarget = new ArrayList<>(); private NPC maiden; private String nyloCall; - private Set nylos = new HashSet<>(); - private List healers = new ArrayList<>(); + private final Set nylos = new HashSet<>(); + private final List healers = new ArrayList<>(); private int healerCount = 0; private int wave = 1; private long startTime = 0; - private ModelOutlineRenderer modelOutline; + private final ModelOutlineRenderer modelOutline; public MaidenHandler(final Client client, final TheatrePlugin plugin, final ModelOutlineRenderer modelOutline) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java index 6d0ccd8c03..d960fc8edc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java @@ -39,11 +39,11 @@ public class SotetsegHandler extends RoomHandler private int playerY; @Getter(AccessLevel.PUBLIC) private List redOverworld = new ArrayList<>(); - private List blackOverworld = new ArrayList<>(); - private List blackUnderworld = new ArrayList<>(); - private List redUnderworld = new ArrayList<>(); - private List gridPath = new ArrayList<>(); - private Map soteyProjectiles = new HashMap<>(); + private final List blackOverworld = new ArrayList<>(); + private final List blackUnderworld = new ArrayList<>(); + private final List redUnderworld = new ArrayList<>(); + private final List gridPath = new ArrayList<>(); + private final Map soteyProjectiles = new HashMap<>(); private NPC npc; public SotetsegHandler(final Client client, final TheatrePlugin plugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index d267776b63..30868de7e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -34,8 +34,8 @@ public class NyloHandler extends RoomHandler public long startTime = 0L; int startTick = 0; - ArrayList waveSpawns = new ArrayList<>(); - ArrayList waveAgros = new ArrayList<>(); + final ArrayList waveSpawns = new ArrayList<>(); + final ArrayList waveAgros = new ArrayList<>(); @Getter(AccessLevel.PUBLIC) private Map pillars = new HashMap<>(); @Getter(AccessLevel.PUBLIC) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java index e6cc1324eb..d7e2703b93 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java @@ -50,7 +50,7 @@ class NyloOverlay extends Overlay private final TheatrePlugin plugin; private final PanelComponent panelComponent = new PanelComponent(); - private NyloHandler nylohandler; + private final NyloHandler nylohandler; NyloOverlay(final Client client, final TheatrePlugin plugin, final NyloHandler nylohandler) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java index 0aea4d2149..3b3cee1db8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java @@ -46,12 +46,12 @@ public class NyloPredictor new Wave(new Nylocas(NylocasType.RANGE_260, Spawn.WEST), new Nylocas(NylocasType.MAGE_162, Spawn.SOUTH), new Nylocas(NylocasType.MELEE_162, Spawn.SOUTH), new Nylocas(NylocasType.MAGE_260, Spawn.EAST)), new Wave(new Nylocas(NylocasType.MELEE_162, Spawn.WEST), new Nylocas(NylocasType.RANGE_162, Spawn.WEST), new Nylocas(NylocasType.MAGE_162, Spawn.SOUTH), new Nylocas(NylocasType.MELEE_162, Spawn.SOUTH), new Nylocas(NylocasType.RANGE_162, Spawn.EAST), new Nylocas(NylocasType.MAGE_162, Spawn.EAST)) }; - public Client client; + public final Client client; int westBound = 50; int eastBound = 77; int southBound = 42; - private NyloHandler handler; - private Map currentSpawns = new HashMap<>(); + private final NyloHandler handler; + private final Map currentSpawns = new HashMap<>(); private int currentIndex = -1; NyloPredictor(Client client, NyloHandler handler) @@ -451,8 +451,8 @@ public class NyloPredictor public static class Nylocas { - private NylocasType type; - private Spawn spawn; + private final NylocasType type; + private final Spawn spawn; public Nylocas(NylocasType type, Spawn spawn) { @@ -486,7 +486,7 @@ public class NyloPredictor public static class Wave { - private Nylocas[] spawns; + private final Nylocas[] spawns; public Wave(Nylocas... nylocas) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java index 73772c40e6..630fba9c40 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java @@ -16,8 +16,8 @@ import net.runelite.client.ui.overlay.components.table.TableComponent; public class XarpusCounter extends Overlay { - private PanelComponent panelComponent = new PanelComponent(); - private XarpusHandler xarpusHandler; + private final PanelComponent panelComponent = new PanelComponent(); + private final XarpusHandler xarpusHandler; XarpusCounter(final TheatrePlugin plugin, final XarpusHandler xarpushandler) {