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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2021-09-21 04:41:13 +02:00
parent 03a2041a35 c5d4c757f1
commit 7644d5e2d1
8 changed files with 114 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java
View File

@@ -100,7 +100,7 @@ public enum AgilityShortcut
COAL_TRUCKS_LOG_BALANCE(20, "Log Balance", new WorldPoint(2598, 3475, 0), LOG_BALANCE_23274),
GRAND_EXCHANGE_UNDERWALL_TUNNEL(21, "Underwall Tunnel", new WorldPoint(3139, 3515, 0), UNDERWALL_TUNNEL_16529, UNDERWALL_TUNNEL_16530),
BRIMHAVEN_DUNGEON_PIPE(22, "Pipe Squeeze", new WorldPoint(2654, 9569, 0), PIPE_21728),
OBSERVATORY_SCALE_CLIFF(23, "Grapple Rocks", new WorldPoint(2447, 3155, 0), NULL_31849),
OBSERVATORY_SCALE_CLIFF(23, "Grapple Rocks", new WorldPoint(2447, 3155, 0), NULL_31849, NULL_31852),
EAGLES_PEAK_ROCK_CLIMB(25, "Rock Climb", new WorldPoint(2320, 3499, 0), ROCKS_19849),
FALADOR_UNDERWALL_TUNNEL(26, "Underwall Tunnel", new WorldPoint(2947, 3313, 0), UNDERWALL_TUNNEL, UNDERWALL_TUNNEL_16528),
KOUREND_CATACOMBS_PILLAR_JUMP_NORTH(28, "Pillar Jump", new WorldPoint(1613, 10071, 0)),

34
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
View File

@@ -142,13 +142,6 @@ public class ClueScrollPlugin extends Plugin
private static final Color HIGHLIGHT_BORDER_COLOR = Color.ORANGE;
private static final Color HIGHLIGHT_HOVER_BORDER_COLOR = HIGHLIGHT_BORDER_COLOR.darker();
private static final Color HIGHLIGHT_FILL_COLOR = new Color(0, 255, 0, 20);
private static final int[] REGION_MIRRORS = {
// Prifddinas
12894, 8755,
12895, 8756,
13150, 9011,
13151, 9012
};
private static final String CLUE_TAG_NAME = "clue";
@Getter
@@ -850,7 +843,7 @@ public class ClueScrollPlugin extends Plugin
WorldPoint coordinate = coordinatesToWorldPoint(degX, minX, degY, minY);
// Convert from overworld to real
WorldPoint mirrorPoint = getMirrorPoint(coordinate, false);
WorldPoint mirrorPoint = WorldPoint.getMirrorPoint(coordinate, false);
// Use mirror point as mirrorLocation if there is one
return new CoordinateClue(text, coordinate, coordinate == mirrorPoint ? null : mirrorPoint);
}
@@ -1132,31 +1125,6 @@ public class ClueScrollPlugin extends Plugin
);
}
/**
* Translate a coordinate either between overworld and real, or real and overworld
*
* @param worldPoint
* @param toOverworld whether to convert to overworld coordinates, or to real coordinates
* @return
*/
public static WorldPoint getMirrorPoint(WorldPoint worldPoint, boolean toOverworld)
{
int region = worldPoint.getRegionID();
for (int i = 0; i < REGION_MIRRORS.length; i += 2)
{
int real = REGION_MIRRORS[i];
int overworld = REGION_MIRRORS[i + 1];
// Test against what we are converting from
if (region == (toOverworld ? real : overworld))
{
return WorldPoint.fromRegion(toOverworld ? overworld : real,
worldPoint.getRegionX(), worldPoint.getRegionY(), worldPoint.getPlane());
}
}
return worldPoint;
}
private boolean testClueTag(int itemId)
{
ClueScroll c = clue;

2
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java
View File

@@ -307,7 +307,7 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
}
// Convert from real to overworld
final WorldPoint localWorld = ClueScrollPlugin.getMirrorPoint(plugin.getClient().getLocalPlayer().getWorldLocation(), true);
final WorldPoint localWorld = WorldPoint.getMirrorPoint(plugin.getClient().getLocalPlayer().getWorldLocation(), true);
if (localWorld == null)
{

3
runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java
View File

@@ -34,6 +34,7 @@ import net.runelite.api.Constants;
import net.runelite.api.GameState;
import net.runelite.api.Player;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.BeforeRender;
import net.runelite.api.events.GameStateChanged;
import net.runelite.client.config.ConfigManager;
@@ -108,7 +109,7 @@ public class SkyboxPlugin extends Plugin
return;
}
Color overrideColor = player.getWorldLocation().getY() < Constants.OVERWORLD_MAX_Y
Color overrideColor = WorldPoint.getMirrorPoint(player.getWorldLocation(), true).getY() < Constants.OVERWORLD_MAX_Y
? config.customOverworldColor() : config.customOtherColor();
if (overrideColor != null)
{

14
runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java
View File

@@ -204,6 +204,20 @@ public class WidgetOverlay extends Overlay
this.overlayManager = overlayManager;
}
@Override
public Dimension render(Graphics2D graphics)
{
// The xptracker component layer isn't hidden if the counter and process bar are both configured "Off",
// it just has its children hidden.
if (client.getVar(Varbits.EXPERIENCE_TRACKER_COUNTER) == 30 // Off
&& client.getVar(Varbits.EXPERIENCE_TRACKER_PROGRESS_BAR) == 0) // Off
{
return null;
}
return super.render(graphics);
}
/**
* Get the overlay position of the xptracker based on the configured location in-game.
*