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

checkstyle fixes

Browse Source 
checkstyle fixes
This commit is contained in:
Kyleeld
2019-05-30 17:05:00 +01:00
parent 54da439263
commit f8cd5e55fe
19 changed files with 106 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java
View File

@@ -33,12 +33,10 @@ import net.runelite.api.Hitsplat;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.NPCComposition; import net.runelite.api.NPCComposition;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.api.Projectile;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
import net.runelite.api.events.HitsplatApplied; import net.runelite.api.events.HitsplatApplied;
import net.runelite.api.events.NpcDespawned;
import net.runelite.api.kit.KitType; import net.runelite.api.kit.KitType;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
@@ -249,8 +247,6 @@ public class CombatCounter extends Plugin
this.playerDamage.clear(); this.playerDamage.clear();
} }
@Subscribe @Subscribe
public void onAnimationChanged(AnimationChanged event) public void onAnimationChanged(AnimationChanged event)
{ {
@@ -271,7 +267,7 @@ public class CombatCounter extends Plugin
* This part handles the Tick Counter. * This part handles the Tick Counter.
*/ */
long ticks = variables.get(animation); long ticks = variables.get(animation);
if(((Player) actor).getPlayerComposition().getEquipmentId(KitType.WEAPON) == 23360) if (((Player) actor).getPlayerComposition().getEquipmentId(KitType.WEAPON) == 23360)
{ {
ticks = 3; ticks = 3;
} }
@@ -296,12 +292,12 @@ public class CombatCounter extends Plugin
List<NPC> actives = new ArrayList<NPC>(); List<NPC> actives = new ArrayList<NPC>();
actives.add(npc); actives.add(npc);
if(animation == 1979 || animation == 7618) if (animation == 1979 || animation == 7618)
{ // Barrage or chin. { // Barrage or chin.
for(NPC nearby : this.client.getNpcs()) for (NPC nearby : this.client.getNpcs())
{ {
int distance = npc.getWorldLocation().distanceTo(nearby.getWorldLocation()); int distance = npc.getWorldLocation().distanceTo(nearby.getWorldLocation());
if(distance <= 1 && npc != nearby) if (distance <= 1 && npc != nearby)
{ {
actives.add(nearby); actives.add(nearby);
} }
@@ -347,7 +343,7 @@ public class CombatCounter extends Plugin
List<Integer> ticksToAdd = new ArrayList<Integer>(); List<Integer> ticksToAdd = new ArrayList<Integer>();
ticksToAdd.add(delay); ticksToAdd.add(delay);
if(canFarcast && delay > 2) if (canFarcast && delay > 2)
{ {
ticksToAdd.add(delay - 1); ticksToAdd.add(delay - 1);
} }
@@ -360,7 +356,7 @@ public class CombatCounter extends Plugin
ticksToAdd.add(delay + 1); ticksToAdd.add(delay + 1);
} }
for(NPC target : actives) for (NPC target : actives)
{ {
NPCDamageCounter dc = new NPCDamageCounter(); NPCDamageCounter dc = new NPCDamageCounter();
if (this.npcDamageMap.containsKey(target)) if (this.npcDamageMap.containsKey(target))
@@ -393,11 +389,11 @@ public class CombatCounter extends Plugin
@Subscribe @Subscribe
public void onGameTick(GameTick event) public void onGameTick(GameTick event)
{ {
if(config.resetOnNewInstance()) if (config.resetOnNewInstance())
{ {
prevInstance = instanced; prevInstance = instanced;
instanced = client.isInInstancedRegion(); instanced = client.isInInstancedRegion();
if(!prevInstance && instanced) if (!prevInstance && instanced)
{ {
this.counter.clear(); this.counter.clear();
this.blowpipe.clear(); this.blowpipe.clear();
@@ -499,10 +495,10 @@ public class CombatCounter extends Plugin
List<Integer> counts = new ArrayList<Integer>(); List<Integer> counts = new ArrayList<Integer>();
counts.add(delay); counts.add(delay);
if(delay > 2) if (delay > 2)
counts.add(delay - 1); counts.add(delay - 1);
for(int tick : counts) for (int tick : counts)
{ {
List<String> attackers = new ArrayList<String>(); List<String> attackers = new ArrayList<String>();
if (dc.attackers.containsKey(tick)) if (dc.attackers.containsKey(tick))
@@ -561,7 +557,7 @@ public class CombatCounter extends Plugin
{ {
int size = 1; int size = 1;
NPCComposition comp = npc.getTransformedComposition(); NPCComposition comp = npc.getTransformedComposition();
if(comp != null) if (comp != null)
{ {
size = comp.getSize(); size = comp.getSize();
} }
@@ -570,14 +566,14 @@ public class CombatCounter extends Plugin
WorldPoint wpNPC = npc.getWorldLocation(); WorldPoint wpNPC = npc.getWorldLocation();
int distance = wpNPC.distanceTo(wpPlayer); int distance = wpNPC.distanceTo(wpPlayer);
if(size > 1) if (size > 1)
for(int x = 0; x < size; x++) for (int x = 0; x < size; x++)
{ {
for(int y = 0; y < size; y++) for (int y = 0; y < size; y++)
{ {
WorldPoint wpNPCB = WorldPoint.fromRegion(wpNPC.getRegionID(), wpNPC.getRegionX() + x, wpNPC.getRegionY() + y, wpNPC.getPlane()); WorldPoint wpNPCB = WorldPoint.fromRegion(wpNPC.getRegionID(), wpNPC.getRegionX() + x, wpNPC.getRegionY() + y, wpNPC.getPlane());
int distB = wpNPCB.distanceTo(wpPlayer); int distB = wpNPCB.distanceTo(wpPlayer);
if(distB >= 1 && distB < distance) if (distB >= 1 && distB < distance)
{ {
distance = distB; distance = distB;
} }

17
runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java
View File

@@ -24,14 +24,11 @@
*/ */
package net.runelite.client.plugins.combatcounter; package net.runelite.client.plugins.combatcounter;
import com.google.inject.Provides;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayMenuEntry; import net.runelite.client.ui.overlay.OverlayMenuEntry;
import net.runelite.client.ui.overlay.OverlayPosition; 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.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.TitleComponent;
@@ -74,29 +71,29 @@ class CombatOverlay extends Overlay
@Override @Override
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
if(config.showTickCounter()) if (config.showTickCounter())
{ {
panelComponent.getChildren().clear(); panelComponent.getChildren().clear();
Player local = client.getLocalPlayer(); Player local = client.getLocalPlayer();
if(local == null || local.getName() == null) if (local == null || local.getName() == null)
return null; return null;
panelComponent.setBackgroundColor(config.bgColor()); panelComponent.setBackgroundColor(config.bgColor());
panelComponent.getChildren().add(TitleComponent.builder().text("Tick Counter").color(config.titleColor()).build()); panelComponent.getChildren().add(TitleComponent.builder().text("Tick Counter").color(config.titleColor()).build());
int total = 0; int total = 0;
if(plugin.getCounter().isEmpty()) if (plugin.getCounter().isEmpty())
{ {
panelComponent.getChildren().add(LineComponent.builder().left(local.getName()).right("0").build()); panelComponent.getChildren().add(LineComponent.builder().left(local.getName()).right("0").build());
} }
else else
{ {
Map<String, Long> map = this.plugin.getCounter(); Map<String, Long> map = this.plugin.getCounter();
if(map == null) if (map == null)
return null; return null;
for(String name : map.keySet()) for (String name : map.keySet())
{ {
if(client.getLocalPlayer().getName().contains(name)) if (client.getLocalPlayer().getName().contains(name))
{ {
panelComponent.getChildren().add(1, LineComponent.builder().left(name).right(Long.toString(map.get(name))).leftColor(config.selfColor()).rightColor(config.selfColor()).build()); panelComponent.getChildren().add(1, LineComponent.builder().left(name).right(Long.toString(map.get(name))).leftColor(config.selfColor()).rightColor(config.selfColor()).build());
} }
@@ -107,7 +104,7 @@ class CombatOverlay extends Overlay
total += map.get(name); total += map.get(name);
} }
if(!map.containsKey(local.getName())) if (!map.containsKey(local.getName()))
{ {
panelComponent.getChildren().add(LineComponent.builder().left(local.getName()).right("0").leftColor(config.selfColor()).rightColor(config.selfColor()).build()); panelComponent.getChildren().add(LineComponent.builder().left(local.getName()).right("0").leftColor(config.selfColor()).rightColor(config.selfColor()).build());
} }

5
runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java
View File

@@ -29,14 +29,11 @@ import net.runelite.api.Player;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayMenuEntry; import net.runelite.client.ui.overlay.OverlayMenuEntry;
import net.runelite.client.ui.overlay.OverlayPosition; 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.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.TitleComponent;
import javax.inject.Inject; import javax.inject.Inject;
import java.awt.*; import java.awt.*;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
@@ -95,7 +92,7 @@ class DamageOverlay extends Overlay
for (String name : map.keySet()) for (String name : map.keySet())
{ {
String val = String.format("%.1f", map.get(name)); String val = String.format("%.1f", map.get(name));
if(client.getLocalPlayer().getName().contains(name)) if (client.getLocalPlayer().getName().contains(name))
{ {
panelComponent.getChildren().add(1, LineComponent.builder().left(name).right(val).leftColor(config.selfColor()).rightColor(config.selfColor()).build()); panelComponent.getChildren().add(1, LineComponent.builder().left(name).right(val).leftColor(config.selfColor()).rightColor(config.selfColor()).build());
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java
View File

@@ -1,7 +1,5 @@
package net.runelite.client.plugins.combatcounter; package net.runelite.client.plugins.combatcounter;
import net.runelite.api.Player;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

9
runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerOverlay.java
View File

@@ -2,9 +2,6 @@ package net.runelite.client.plugins.spawntimer;
import net.runelite.api.*; import net.runelite.api.*;
import net.runelite.api.Point; import net.runelite.api.Point;
import net.runelite.api.coords.LocalPoint;
import net.runelite.client.plugins.npchighlight.NpcIndicatorsConfig;
import net.runelite.client.plugins.npchighlight.NpcIndicatorsPlugin;
import net.runelite.client.plugins.spawntimer.SpawnTimerPlugin; import net.runelite.client.plugins.spawntimer.SpawnTimerPlugin;
import net.runelite.client.plugins.spawntimer.SpawnTimerConfig; import net.runelite.client.plugins.spawntimer.SpawnTimerConfig;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
@@ -40,15 +37,15 @@ public class SpawnTimerOverlay extends Overlay
highlights = plugin.getHighlights(); highlights = plugin.getHighlights();
for (thing npc : plugin.getTicks()) for (thing npc : plugin.getTicks())
{ {
if(npc == null) if (npc == null)
{ {
continue; continue;
} }
if(npc.getNpc() == null) if (npc.getNpc() == null)
{ {
continue; continue;
} }
if(npc.getNpc().getName() == null) if (npc.getNpc().getName() == null)
{ {
continue; continue;
} }

9
runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java
View File

@@ -58,7 +58,6 @@ public class SpawnTimerPlugin extends Plugin
return configManager.getConfig(SpawnTimerConfig.class); return configManager.getConfig(SpawnTimerConfig.class);
} }
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
public int currentTick; public int currentTick;
@Override @Override
@@ -97,7 +96,7 @@ public class SpawnTimerPlugin extends Plugin
@Subscribe @Subscribe
public void onNpcSpawned(NpcSpawned n) public void onNpcSpawned(NpcSpawned n)
{ {
if(n.getNpc() != null) if (n.getNpc() != null)
{ {
final NPC npc = n.getNpc(); final NPC npc = n.getNpc();
highlightedNpcs.add(npc); highlightedNpcs.add(npc);
@@ -112,11 +111,11 @@ public class SpawnTimerPlugin extends Plugin
public void onNpcDespawned(NpcDespawned n) public void onNpcDespawned(NpcDespawned n)
{ {
final NPC npc = n.getNpc(); final NPC npc = n.getNpc();
if(highlightedNpcs.contains(npc)) if (highlightedNpcs.contains(npc))
{ {
highlightedNpcs.remove(npc); highlightedNpcs.remove(npc);
for (Iterator<thing> iterator = ticks.iterator(); iterator.hasNext();) for (Iterator<thing> iterator = ticks.iterator(); iterator.hasNext();)
{ {
thing t = iterator.next(); thing t = iterator.next();
if (t.getNpc() == npc) if (t.getNpc() == npc)
{ {

1
runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreConfig.java
View File

@@ -11,7 +11,6 @@ package net.runelite.client.plugins.theatre;
import net.runelite.client.config.Config; import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigItem;
import net.runelite.client.plugins.theatre.rooms.nylocas.NyloPredictor;
import java.awt.*; import java.awt.*;
@ConfigGroup("Theatre") @ConfigGroup("Theatre")

2
runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreConstant.java
View File

@@ -1,7 +1,5 @@
package net.runelite.client.plugins.theatre; package net.runelite.client.plugins.theatre;
import net.runelite.api.NpcID;
public class TheatreConstant public class TheatreConstant
{ {
public static final int MAIDEN_BLOOD_THROW = 1579; public static final int MAIDEN_BLOOD_THROW = 1579;

8
runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreOverlay.java
View File

@@ -10,18 +10,12 @@ package net.runelite.client.plugins.theatre;
import java.awt.*; import java.awt.*;
import java.util.*; import java.util.*;
import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.*; import net.runelite.api.*;
import net.runelite.api.Point;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldArea;
import net.runelite.api.coords.WorldPoint;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
public class TheatreOverlay extends Overlay public class TheatreOverlay extends Overlay
{ {
@@ -45,7 +39,7 @@ public class TheatreOverlay extends Overlay
@Override @Override
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
switch(plugin.getRoom()) switch (plugin.getRoom())
{ {
case MAIDEN: case MAIDEN:
plugin.getMaidenHandler().render(graphics); plugin.getMaidenHandler().render(graphics);

4
runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java
View File

@@ -225,12 +225,12 @@ public class TheatrePlugin extends Plugin
@Subscribe @Subscribe
public void onProjectileMoved(ProjectileMoved event) public void onProjectileMoved(ProjectileMoved event)
{ {
if(sotetsegHandler != null) if (sotetsegHandler != null)
{ {
sotetsegHandler.onProjectileMoved(event); sotetsegHandler.onProjectileMoved(event);
} }
if(verzikHandler != null) if (verzikHandler != null)
{ {
verzikHandler.onProjectileMoved(event); verzikHandler.onProjectileMoved(event);
} }

4
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java
View File

@@ -117,7 +117,7 @@ public class BloatHandler extends RoomHandler
} }
} }
if(config.showBloatTimer()) if (config.showBloatTimer())
{ {
final String tickCounter = String.valueOf(bloatTimer); final String tickCounter = String.valueOf(bloatTimer);
int secondConversion = (int)(bloatTimer * .6); int secondConversion = (int)(bloatTimer * .6);
@@ -130,7 +130,7 @@ public class BloatHandler extends RoomHandler
} }
else else
{ {
renderTextLocation(graphics, tickCounter+ "( " + secondConversion + " )", 15, Font.BOLD, Color.RED, canvasPoint); renderTextLocation(graphics, tickCounter + "( " + secondConversion + " )", 15, Font.BOLD, Color.RED, canvasPoint);
} }
} }
} }

9
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java
View File

@@ -8,10 +8,8 @@ import net.runelite.api.GraphicsObject;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.NpcID; import net.runelite.api.NpcID;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.NpcSpawned;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.theatre.RoomHandler; import net.runelite.client.plugins.theatre.RoomHandler;
import net.runelite.client.plugins.theatre.TheatreConfig; import net.runelite.client.plugins.theatre.TheatreConfig;
import net.runelite.client.plugins.theatre.TheatreConstant; import net.runelite.client.plugins.theatre.TheatreConstant;
@@ -138,7 +136,8 @@ public class MaidenHandler extends RoomHandler
if (npc.getName() != null && name.equals("The Maiden of Sugadinti")) if (npc.getName() != null && name.equals("The Maiden of Sugadinti"))
{ {
this.onStop(); this.onStop();
} else if (plugin.getRoom() == TheatreRoom.MAIDEN) }
else if (plugin.getRoom() == TheatreRoom.MAIDEN)
{ {
if (id == NpcID.BLOOD_SPAWN) if (id == NpcID.BLOOD_SPAWN)
{ {
@@ -170,7 +169,7 @@ public class MaidenHandler extends RoomHandler
bloodSpawnTarget.add(spawn.getWorldLocation()); bloodSpawnTarget.add(spawn.getWorldLocation());
} }
if(this.healerCount != this.healers.size()) if (this.healerCount != this.healers.size())
{ {
this.healerCount = this.healers.size(); this.healerCount = this.healers.size();
@@ -181,7 +180,7 @@ public class MaidenHandler extends RoomHandler
seconds = seconds % 60; seconds = seconds % 60;
int percentage = 70 - (20 * ((wave++) - 1)); int percentage = 70 - (20 * ((wave++) - 1));
if(config.extraTimers()) if (config.extraTimers())
this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Maiden of Sugadinti - " + percentage + "%' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null); this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Maiden of Sugadinti - " + percentage + "%' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
} }
} }

13
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java
View File

@@ -118,11 +118,12 @@ public class SotetsegHandler extends RoomHandler
{ {
Map<Projectile, String> projectileMap = new HashMap<>(); Map<Projectile, String> projectileMap = new HashMap<>();
for(Projectile p : soteyProjectiles.keySet()){ for (Projectile p : soteyProjectiles.keySet())
{
final int ticksRemaining = p.getRemainingCycles()/30; final int ticksRemaining = p.getRemainingCycles()/30;
int id = p.getId(); int id = p.getId();
String countdownStr; String countdownStr;
if(id == 1607) if (id == 1607)
{ {
countdownStr = "R " + String.valueOf(ticksRemaining); countdownStr = "R " + String.valueOf(ticksRemaining);
} }
@@ -173,7 +174,7 @@ public class SotetsegHandler extends RoomHandler
if (loc != null) if (loc != null)
{ {
if(id == TheatreConstant.SOTETSEG_BOMB) if (id == TheatreConstant.SOTETSEG_BOMB)
{ {
graphics.setFont(new Font("Arial", Font.BOLD, 20)); graphics.setFont(new Font("Arial", Font.BOLD, 20));
} }
@@ -254,7 +255,8 @@ public class SotetsegHandler extends RoomHandler
{ {
Tile t = event.getTile(); Tile t = event.getTile();
WorldPoint p = t.getWorldLocation(); WorldPoint p = t.getWorldLocation();
if (p.getPlane() == 0){ if (p.getPlane() == 0)
{
if (!redTiles.containsValue(t)) if (!redTiles.containsValue(t))
{ {
redTiles.put(o, t); redTiles.put(o, t);
@@ -362,7 +364,8 @@ public class SotetsegHandler extends RoomHandler
{ {
minX = x; minX = x;
} }
if (y < minY){ if (y < minY)
{
minY = y; minY = y;
} }
} }

64
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java
View File

@@ -22,11 +22,8 @@ import net.runelite.client.plugins.theatre.TheatreConfig;
import net.runelite.client.plugins.theatre.TheatreConstant; import net.runelite.client.plugins.theatre.TheatreConstant;
import net.runelite.client.plugins.theatre.TheatrePlugin; import net.runelite.client.plugins.theatre.TheatrePlugin;
import net.runelite.client.plugins.theatre.TheatreRoom; import net.runelite.client.plugins.theatre.TheatreRoom;
import net.runelite.client.ui.overlay.OverlayUtil;
import java.awt.*; import java.awt.*;
import java.util.*; import java.util.*;
import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -113,9 +110,9 @@ public class VerzikHandler extends RoomHandler
if (config.showVerzikAttacks()) if (config.showVerzikAttacks())
{ {
if (id == TheatreConstant.VERZIK_ID_P1) if (id == TheatreConstant.VERZIK_ID_P1)
{ {
if(config.p1attacks()) if (config.p1attacks())
{ {
if (this.versikCounter >= 0) if (this.versikCounter >= 0)
{ {
@@ -127,25 +124,25 @@ public class VerzikHandler extends RoomHandler
renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point); renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point);
} }
} }
} }
else if (id == TheatreConstant.VERZIK_ID_P2) else if (id == TheatreConstant.VERZIK_ID_P2)
{ {
if(config.p2attacks()) if (config.p2attacks())
{ {
if (this.versikCounter >= 0) if (this.versikCounter >= 0)
{ {
String str = Integer.toString(versikCounter); String str = Integer.toString(versikCounter);
LocalPoint lp = npc.getLocalLocation(); LocalPoint lp = npc.getLocalLocation();
Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0);
renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point); renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point);
} }
} }
} }
/* /*
if(npc.getAnimation() == 8117){ if (npc.getAnimation() == 8117){
if (this.redCrabsTimer > 0){ if (this.redCrabsTimer > 0){
String str = Integer.toString(redCrabsTimer); String str = Integer.toString(redCrabsTimer);
@@ -159,7 +156,7 @@ public class VerzikHandler extends RoomHandler
else if (id == TheatreConstant.VERZIK_ID_P3) else if (id == TheatreConstant.VERZIK_ID_P3)
{ {
if(config.p3attacks()) if (config.p3attacks())
{ {
Model model = npc.getModel(); Model model = npc.getModel();
if (versikCounter > 0 && versikCounter < 8) if (versikCounter > 0 && versikCounter < 8)
@@ -175,12 +172,12 @@ public class VerzikHandler extends RoomHandler
} }
} }
if(config.VerzikTankTile()) if (config.VerzikTankTile())
{ {
if(id == TheatreConstant.VERZIK_ID_P3) if (id == TheatreConstant.VERZIK_ID_P3)
{ {
WorldPoint wp = new WorldPoint(npc.getWorldLocation().getX() + 3, npc.getWorldLocation().getY() + 3, client.getPlane()); WorldPoint wp = new WorldPoint(npc.getWorldLocation().getX() + 3, npc.getWorldLocation().getY() + 3, client.getPlane());
drawTile2(graphics,wp,new Color(75, 0, 130), 2, 255, 0); drawTile2(graphics, wp, new Color(75, 0, 130), 2, 255, 0);
//renderNpcOverlay(graphics, boss, new Color(75, 0, 130), 1, 255, 0); //renderNpcOverlay(graphics, boss, new Color(75, 0, 130), 1, 255, 0);
} }
@@ -196,7 +193,7 @@ public class VerzikHandler extends RoomHandler
{ {
if (object.getId() == TheatreConstant.GRAPHIC_ID_YELLOWS) if (object.getId() == TheatreConstant.GRAPHIC_ID_YELLOWS)
{ {
drawTile(graphics, WorldPoint.fromLocal(client, object.getLocation()), Color.YELLOW,3,255,0); drawTile(graphics, WorldPoint.fromLocal(client, object.getLocation()), Color.YELLOW, 3, 255, 0);
LocalPoint lp = object.getLocation(); LocalPoint lp = object.getLocation();
Point point = Perspective.getCanvasTextLocation(client, graphics, lp, text, 0); Point point = Perspective.getCanvasTextLocation(client, graphics, lp, text, 0);
renderTextLocation(graphics, text, 12, Font.BOLD, Color.WHITE, point); renderTextLocation(graphics, text, 12, Font.BOLD, Color.WHITE, point);
@@ -239,7 +236,7 @@ public void onProjectileMoved(ProjectileMoved event)
Projectile projectile = event.getProjectile(); Projectile projectile = event.getProjectile();
if (projectile.getId() == 1583) if (projectile.getId() == 1583)
{ {
WorldPoint p = WorldPoint.fromLocal(client,event.getPosition()); WorldPoint p = WorldPoint.fromLocal(client, event.getPosition());
Verzik_RangeProjectiles.put(projectile, p); Verzik_RangeProjectiles.put(projectile, p);
} }
} }
@@ -351,14 +348,14 @@ public void onProjectileMoved(ProjectileMoved event)
break; break;
} }
} }
// } //}
} }
else else
{ {
this.yellows--; this.yellows--;
} }
if(npc != null) if (npc != null)
{ {
if (npc.getAnimation() == 8117) if (npc.getAnimation() == 8117)
{ {
@@ -376,7 +373,8 @@ public void onProjectileMoved(ProjectileMoved event)
{ {
foundVerzik = true; foundVerzik = true;
this.npc = npc; this.npc = npc;
} else if (npc.getId() == TheatreConstant.NPC_ID_TORNADO) }
else if (npc.getId() == TheatreConstant.NPC_ID_TORNADO)
{ {
foundTornado = true; foundTornado = true;
} }
@@ -411,7 +409,7 @@ public void onProjectileMoved(ProjectileMoved event)
long minutes = seconds / 60L; long minutes = seconds / 60L;
seconds = seconds % 60; seconds = seconds % 60;
if(config.extraTimers()) if (config.extraTimers())
this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Final Challenge - Part 1' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null); this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Final Challenge - Part 1' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
} }
else if (id == TheatreConstant.VERZIK_ID_P2_TRANSFORM && this.startTime != 0) else if (id == TheatreConstant.VERZIK_ID_P2_TRANSFORM && this.startTime != 0)
@@ -425,7 +423,7 @@ public void onProjectileMoved(ProjectileMoved event)
this.attackTick = this.client.getTickCount() - 4; this.attackTick = this.client.getTickCount() - 4;
this.versikCounter = -1; this.versikCounter = -1;
this.attacksLeft = 9; this.attacksLeft = 9;
if(config.extraTimers()) if (config.extraTimers())
this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Final Challenge - Part 2' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null); this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Final Challenge - Part 2' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
} }
} }
@@ -449,7 +447,7 @@ public void onProjectileMoved(ProjectileMoved event)
} }
else if (id == TheatreConstant.VERZIK_ID_P3) else if (id == TheatreConstant.VERZIK_ID_P3)
{ {
if(foundTornado && !this.tornados) if (foundTornado && !this.tornados)
{ {
this.tornados = true; this.tornados = true;
} }

15
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java
View File

@@ -101,7 +101,7 @@ public class NyloHandler extends RoomHandler
if (this.startTime != 0) if (this.startTime != 0)
{ {
if(config.extraTimers()) if (config.extraTimers())
this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Nylocas - Waves' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null); this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Nylocas - Waves' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
} }
System.out.println("Stopping Nylocas Room"); System.out.println("Stopping Nylocas Room");
@@ -169,14 +169,15 @@ public class NyloHandler extends RoomHandler
} }
} }
switch(config.showNylocasExplosions()) switch (config.showNylocasExplosions())
{ {
case TILE: case TILE:
for (NPC npc : spiders.keySet()) for (NPC npc : spiders.keySet())
{ {
int ticksLeft = spiders.get(npc); int ticksLeft = spiders.get(npc);
if (ticksLeft > -1 && ticksLeft < 6) { if (ticksLeft > -1 && ticksLeft < 6)
Color color = new Color(255, 255,0 ,180); {
Color color = new Color(255, 255, 0, 180);
int outlineWidth = 2; int outlineWidth = 2;
int outlineAlpha = 150; int outlineAlpha = 150;
renderNpcOverlay(graphics, npc, color, outlineWidth, outlineAlpha, 15); renderNpcOverlay(graphics, npc, color, outlineWidth, outlineAlpha, 15);
@@ -264,7 +265,8 @@ public class NyloHandler extends RoomHandler
color = Color.LIGHT_GRAY; color = Color.LIGHT_GRAY;
renderPoly(graphics, color, objectClickbox); renderPoly(graphics, color, objectClickbox);
} catch (Exception ex) }
catch (Exception ex)
{ {
} }
@@ -327,7 +329,8 @@ public class NyloHandler extends RoomHandler
{ {
Pattern p = Pattern.compile("Nylocas (Hagios|Toxobolos|Ischyros)"); Pattern p = Pattern.compile("Nylocas (Hagios|Toxobolos|Ischyros)");
Matcher m = p.matcher(npc.getName()); Matcher m = p.matcher(npc.getName());
if (m.matches()) { if (m.matches())
{
this.spiders.put(npc, 52); this.spiders.put(npc, 52);
if (this.predictor != null) if (this.predictor != null)

6
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java
View File

@@ -100,9 +100,9 @@ class NyloOverlay extends Overlay
panelComponent.getChildren().clear(); panelComponent.getChildren().clear();
int nyloCount = (hagios + toxobolos + ischyros); int nyloCount = (hagios + toxobolos + ischyros);
if(nylohandler.getWave() < 21) if (nylohandler.getWave() < 21)
{ {
if(nyloCount > 12) if (nyloCount > 12)
{ {
panelComponent.getChildren().add(LineComponent.builder() panelComponent.getChildren().add(LineComponent.builder()
.left("Total Nylocas:") .left("Total Nylocas:")
@@ -123,7 +123,7 @@ class NyloOverlay extends Overlay
} }
else else
{ {
if(nyloCount > 24) if (nyloCount > 24)
{ {
panelComponent.getChildren().add(LineComponent.builder() panelComponent.getChildren().add(LineComponent.builder()
.left("Total Nylocas:") .left("Total Nylocas:")

15
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java
View File

@@ -3,9 +3,7 @@ package net.runelite.client.plugins.theatre.rooms.nylocas;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.NpcSpawned;
import net.runelite.client.plugins.theatre.TheatreConfig;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@@ -383,7 +381,9 @@ public class NyloPredictor
else if (wave == 21 && spawn == Spawn.EAST) else if (wave == 21 && spawn == Spawn.EAST)
{ {
return true; return true;
} else if (wave == 22 && spawn == Spawn.SOUTH) { }
else if (wave == 22 && spawn == Spawn.SOUTH)
{
return true; return true;
} }
else if (wave == 23) else if (wave == 23)
@@ -409,7 +409,8 @@ public class NyloPredictor
else if (spawn == Spawn.WEST && type == NylocasType.MELEE_162) else if (spawn == Spawn.WEST && type == NylocasType.MELEE_162)
return true; return true;
} else if (wave == 29 && spawn == Spawn.EAST) }
else if (wave == 29 && spawn == Spawn.EAST)
{ {
return true; return true;
} }
@@ -433,7 +434,8 @@ public class NyloPredictor
{ {
Wave nextWave = NYLOCAS_WAVES[currentIndex + 1]; Wave nextWave = NYLOCAS_WAVES[currentIndex + 1];
return nextWave; return nextWave;
} else }
else
{ {
return null; return null;
} }
@@ -444,7 +446,8 @@ public class NyloPredictor
if (wave == null || spawn == null) if (wave == null || spawn == null)
{ {
return null; return null;
} else }
else
{ {
String types = ""; String types = "";

11
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java
View File

@@ -19,13 +19,9 @@ import net.runelite.client.plugins.theatre.TheatreConfig;
import net.runelite.client.plugins.theatre.TheatreConstant; import net.runelite.client.plugins.theatre.TheatreConstant;
import net.runelite.client.plugins.theatre.TheatrePlugin; import net.runelite.client.plugins.theatre.TheatrePlugin;
import net.runelite.client.plugins.theatre.TheatreRoom; import net.runelite.client.plugins.theatre.TheatreRoom;
import net.runelite.client.plugins.theatre.timers.Timeable;
import net.runelite.client.ui.overlay.OverlayUtil;
import java.awt.*; import java.awt.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.Map; import java.util.Map;
public class XarpusHandler extends RoomHandler public class XarpusHandler extends RoomHandler
@@ -120,7 +116,7 @@ public class XarpusHandler extends RoomHandler
seconds = seconds % 60; seconds = seconds % 60;
this.ticksUntilShoot = 8; this.ticksUntilShoot = 8;
if(config.extraTimers()) if (config.extraTimers())
this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'Xarpus - Recovery' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null); this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'Xarpus - Recovery' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
} }
@@ -241,7 +237,8 @@ public class XarpusHandler extends RoomHandler
if (i >= 0) if (i >= 0)
{ {
exhumes.replace(key, i); exhumes.replace(key, i);
} else }
else
{ {
exhumes.remove(key); exhumes.remove(key);
this.exhumesCount--; this.exhumesCount--;
@@ -259,7 +256,7 @@ public class XarpusHandler extends RoomHandler
long minutes = seconds / 60L; long minutes = seconds / 60L;
seconds = seconds % 60; seconds = seconds % 60;
if(config.extraTimers()) if (config.extraTimers())
this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'Xarpus - Acid' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null); this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'Xarpus - Acid' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
} }

11
runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/RoomTimer.java
View File

@@ -7,15 +7,10 @@ import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayMenuEntry; import net.runelite.client.ui.overlay.OverlayMenuEntry;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.TitleComponent;
import javax.inject.Inject; import javax.inject.Inject;
import java.awt.*; import java.awt.*;
import java.util.Map;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
@@ -30,9 +25,9 @@ public class RoomTimer extends Overlay
@Inject @Inject
public RoomTimer(Client client, TheatrePlugin plugin) public RoomTimer (Client client, TheatrePlugin plugin)
{ {
super(plugin); super (plugin);
setPosition(OverlayPosition.ABOVE_CHATBOX_RIGHT); setPosition(OverlayPosition.ABOVE_CHATBOX_RIGHT);
setPriority(OverlayPriority.HIGH); setPriority(OverlayPriority.HIGH);
@@ -53,7 +48,7 @@ public class RoomTimer extends Overlay
if (local == null || local.getName() == null) if (local == null || local.getName() == null)
return null; return null;
switch(plugin.getRoom()) switch (plugin.getRoom())
{ {
case MAIDEN: case MAIDEN:
plugin.getMaidenHandler().render(graphics); plugin.getMaidenHandler().render(graphics);