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

Refactor flinching

Browse Source
This commit is contained in:
Scott Burns
2019-05-16 00:50:34 +02:00
parent 2004c3d4bf
commit 07cfe6c421
4 changed files with 412 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java
View File

@@ -50,7 +50,7 @@ public class FlinchingOverlay extends Overlay
private Color color;
private Color borderColor;
private int overlaySize = 25;
private int overlaySize;
@Inject
FlinchingOverlay(Client client, FlinchingPlugin plugin, FlinchingConfig config)

52
runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java
View File

@@ -24,28 +24,28 @@
*/
package net.runelite.client.plugins.flinching;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.api.Client;
import net.runelite.api.Player;
import com.google.inject.Provides;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.NPC;
import net.runelite.api.Player;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.HitsplatApplied;
import net.runelite.api.events.NpcDespawned;
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.plugins.PluginType;
import net.runelite.client.ui.overlay.OverlayManager;
import javax.inject.Inject;
import net.runelite.api.Actor;
import net.runelite.api.NPC;
import net.runelite.api.GameState;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.NpcDespawned;
import net.runelite.client.config.ConfigManager;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.HitsplatApplied;
import com.google.inject.Provides;
@Slf4j
@@ -73,7 +73,7 @@ public class FlinchingPlugin extends Plugin
private int currentWorld = -1;
private int currentInteractingId = -1;
private final Map<Integer, FlinchingTarget> flinchingTargets = new HashMap<Integer, FlinchingTarget>();
private final Map<Integer, FlinchingTarget> flinchingTargets = new HashMap<>();
private boolean resetOnHit = true;
private boolean resetOnHitReceived = true;
@@ -111,10 +111,9 @@ public class FlinchingPlugin extends Plugin
resetOnHit = config.getFlinchResetOnHit();
resetOnHitReceived = config.getFlinchResetOnHitReceived();
Iterator<Map.Entry<Integer, FlinchingTarget>> it = flinchingTargets.entrySet().iterator();
while (it.hasNext())
for (Map.Entry<Integer, FlinchingTarget> integerFlinchingTargetEntry : flinchingTargets.entrySet())
{
FlinchingTarget target = it.next().getValue();
FlinchingTarget target = integerFlinchingTargetEntry.getValue();
if (target != null)
{
target.SetDelayTime(config.getFlinchDelay(), config.getFlinchAttackedDelay());
@@ -152,16 +151,14 @@ public class FlinchingPlugin extends Plugin
@Subscribe
private void onGameTick(GameTick tick)
{
if (client.getGameState() != GameState.LOGGED_IN)
if (client.getGameState() == GameState.LOGGED_IN)
{
return;
}
else
{
TickTargets();
checkInteracting();
}
}
@Subscribe
public void onHitsplatApplied(HitsplatApplied hitsplatApplied)
@@ -229,7 +226,7 @@ public class FlinchingPlugin extends Plugin
if (target != null)
{
target.Tick();
if(target.isActive == false)
if (!target.isActive)
{
it.remove();
}
@@ -265,12 +262,11 @@ public class FlinchingPlugin extends Plugin
flinchingTargets.put(_newTarget.getId(), newTarget);
}
public void PlayerHit()
private void PlayerHit()
{
Iterator<Map.Entry<Integer, FlinchingTarget>> it = flinchingTargets.entrySet().iterator();
while (it.hasNext())
for (Map.Entry<Integer, FlinchingTarget> integerFlinchingTargetEntry : flinchingTargets.entrySet())
{
FlinchingTarget target = it.next().getValue();
FlinchingTarget target = integerFlinchingTargetEntry.getValue();
if (target != null)
{
target.PlayerHit();
@@ -278,7 +274,7 @@ public class FlinchingPlugin extends Plugin
}
}
public Map<Integer, FlinchingTarget> GetTargets()
Map<Integer, FlinchingTarget> GetTargets()
{
return (flinchingTargets);
}

14
runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java
View File

@@ -40,7 +40,7 @@ public class FlinchingTarget
private int displayHitReceivedLength = 6600;
private Instant lastAttacked;
public boolean isActive = false;
public boolean isActive;
@Getter
private int objectId;
@@ -49,7 +49,7 @@ public class FlinchingTarget
@Getter
public WorldPoint worldLocation;
public FlinchingTarget(NPC target)
FlinchingTarget(NPC target)
{
isActive = true;
@@ -59,7 +59,7 @@ public class FlinchingTarget
this.worldLocation = target.getWorldLocation();
}
public void TargetHit()
void TargetHit()
{
boolean shouldHit = true;
if (usingHitDelay)
@@ -79,7 +79,7 @@ public class FlinchingTarget
}
}
public double GetRemainingTimePercent()
double GetRemainingTimePercent()
{
double remainingTime = GetRemainingTime();
double timePercent = remainingTime / currentDisplayLength;
@@ -101,7 +101,7 @@ public class FlinchingTarget
return ((currentDisplayLength - ((double) duration.toMillis())));
}
public void Tick()
void Tick()
{
if (targetObject == null)
{
@@ -119,7 +119,7 @@ public class FlinchingTarget
}
}
public void SetDelayTime(int delayTime, int delayHitReceivedTime)
void SetDelayTime(int delayTime, int delayHitReceivedTime)
{
displayLength = delayTime;
displayHitReceivedLength = delayHitReceivedTime;
@@ -134,7 +134,7 @@ public class FlinchingTarget
}
}
public void PlayerHit()
void PlayerHit()
{
usingHitDelay = true;
currentDisplayLength = displayHitReceivedLength;