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

4
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)
{ {

3
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;

3
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;

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;

3
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;

1
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

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;

6
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
{ {

5
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)
{ {

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

@@ -118,7 +118,8 @@ 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;
@@ -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;
} }
} }

6
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;
@@ -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;
} }

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

@@ -175,7 +175,8 @@ public class NyloHandler extends RoomHandler
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;
@@ -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)

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 = "";

7
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
@@ -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--;

5
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;