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

Refactor WildernessLocations

Browse Source
This commit is contained in:
Scott Burns
2019-05-16 01:21:39 +02:00
parent 65074d0447
commit 4baf218f2f
2 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java
View File

@@ -28,14 +28,13 @@ public class WildernessLocationsOverlay extends Overlay
private WildernessLocationsConfig wildyConfig; private WildernessLocationsConfig wildyConfig;
@Inject @Inject
public WildernessLocationsOverlay(Client client, WildernessLocationsPlugin plugin) public WildernessLocationsOverlay(WildernessLocationsPlugin plugin)
{ {
this.plugin = plugin; this.plugin = plugin;
setLayer(OverlayLayer.ABOVE_WIDGETS); setLayer(OverlayLayer.ABOVE_WIDGETS);
setPriority(OverlayPriority.HIGH); setPriority(OverlayPriority.HIGH);
setPosition(OverlayPosition.BOTTOM_RIGHT); setPosition(OverlayPosition.BOTTOM_RIGHT);
textComponent = new TextComponent(); textComponent = new TextComponent();
} }
@Override @Override

21
runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java
View File

@@ -10,13 +10,12 @@
package net.runelite.client.plugins.wildernesslocations; package net.runelite.client.plugins.wildernesslocations;
import com.google.inject.Provides;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import javax.inject.Inject; import javax.inject.Inject;
import com.google.inject.Provides;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -34,7 +33,6 @@ import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.input.KeyManager; import net.runelite.client.input.KeyManager;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginManager;
import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.PluginType;
import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.util.HotkeyListener; import net.runelite.client.util.HotkeyListener;
@@ -42,10 +40,10 @@ import net.runelite.client.util.WildernessLocation;
@Slf4j @Slf4j
@PluginDescriptor( @PluginDescriptor(
name = "Wild Locations", name = "Wild Locations",
description = "Indicates the players current location in the wild", description = "Indicates the players current location in the wild",
tags = {"Wildy", "Wilderness Location", "location", "loc", "pvp", "pklite"}, tags = {"Wildy", "Wilderness Location", "location", "loc", "pvp", "pklite"},
type = PluginType.PVP type = PluginType.PVP
) )
public class WildernessLocationsPlugin extends Plugin public class WildernessLocationsPlugin extends Plugin
{ {
@@ -76,7 +74,6 @@ public class WildernessLocationsPlugin extends Plugin
private String oldChat = ""; private String oldChat = "";
private int currentCooldown = 0; private int currentCooldown = 0;
private final int COOLDOWN_TICKS = 30;
private WorldPoint worldPoint = null; private WorldPoint worldPoint = null;
private final HashMap<WorldArea, String> wildLocs = getLocationMap(); private final HashMap<WorldArea, String> wildLocs = getLocationMap();
@@ -154,7 +151,7 @@ public class WildernessLocationsPlugin extends Plugin
} }
} }
if (client.getLocalPlayer().getWorldLocation().getY() > if (client.getLocalPlayer().getWorldLocation().getY() >
(Objects.requireNonNull(closestArea).toWorldPoint().getY() + closestArea.getHeight())) (Objects.requireNonNull(closestArea).toWorldPoint().getY() + closestArea.getHeight()))
{ {
s = s + "N"; s = s + "N";
} }
@@ -167,7 +164,7 @@ public class WildernessLocationsPlugin extends Plugin
s = s + "W"; s = s + "W";
} }
if (client.getLocalPlayer().getWorldLocation().getX() > if (client.getLocalPlayer().getWorldLocation().getX() >
(closestArea.toWorldPoint().getX() + closestArea.getWidth())) (closestArea.toWorldPoint().getX() + closestArea.getWidth()))
{ {
s = s + "E"; s = s + "E";
} }
@@ -184,7 +181,7 @@ public class WildernessLocationsPlugin extends Plugin
{ {
HashMap<WorldArea, String> hashMap = new HashMap<>(); HashMap<WorldArea, String> hashMap = new HashMap<>();
Arrays.stream(WildernessLocation.values()).forEach(wildernessLocation -> Arrays.stream(WildernessLocation.values()).forEach(wildernessLocation ->
hashMap.put(wildernessLocation.getWorldArea(), wildernessLocation.getName())); hashMap.put(wildernessLocation.getWorldArea(), wildernessLocation.getName()));
return hashMap; return hashMap;
} }
@@ -234,6 +231,6 @@ public class WildernessLocationsPlugin extends Plugin
return; return;
} }
sendMessage("/World: " + client.getWorld() + " Location: " + location); sendMessage("/World: " + client.getWorld() + " Location: " + location);
currentCooldown = COOLDOWN_TICKS; currentCooldown = 30;
} }
} }