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-11-17 16:35:59 +01:00
parent d204950c38 48b12dcf67
commit b9f7ed5078
28 changed files with 154 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-api/src/main/java/net/runelite/api/Client.java
View File

@@ -2339,6 +2339,7 @@ public interface Client extends GameEngine
ClanSettings getClanSettings(int clanId);
void setUnlockedFps(boolean unlock);
void setUnlockedFpsTarget(int fps);
/**
* Gets the ambient sound effects

14
runelite-api/src/main/java/net/runelite/api/ItemID.java
View File

@@ -1933,13 +1933,13 @@ public final class ItemID
public static final int RUNE_SPEARKP = 3175;
public static final int DRAGON_SPEARKP = 3176;
public static final int LEFTHANDED_BANANA = 3177;
public static final int MONKEY_BONES = 3179;
public static final int MONKEY_BONES_3180 = 3180;
public static final int MONKEY_BONES_3181 = 3181;
public static final int MONKEY_BONES_3182 = 3182;
public static final int MONKEY_BONES_3183 = 3183;
public static final int MONKEY_BONES_3185 = 3185;
public static final int MONKEY_BONES_3186 = 3186;
public static final int SMALL_NINJA_MONKEY_BONES = 3179;
public static final int MEDIUM_NINJA_MONKEY_BONES = 3180;
public static final int GORILLA_BONES = 3181;
public static final int BEARDED_GORILLA_BONES = 3182;
public static final int MONKEY_BONES = 3183;
public static final int SMALL_ZOMBIE_MONKEY_BONES = 3185;
public static final int LARGE_ZOMBIE_MONKEY_BONES = 3186;
public static final int BONES_3187 = 3187;
public static final int CLEANING_CLOTH = 3188;
public static final int BRONZE_HALBERD = 3190;

4
runelite-api/src/main/java/net/runelite/api/geometry/RectangleUnion.java
View File

@@ -65,13 +65,13 @@ public class RectangleUnion
boolean trace = log.isTraceEnabled();
// Sort all of the rectangles so they are ordered by their left edge
lefts.sort(Comparator.comparing(Rectangle::getX1));
lefts.sort(Comparator.comparingInt(Rectangle::getX1));
// Again, but for the right edge
// this should be relatively fast if the rectangles are similar sizes because timsort deals with partially
// presorted data well
List<Rectangle> rights = new ArrayList<>(lefts);
rights.sort(Comparator.comparing(Rectangle::getX2));
rights.sort(Comparator.comparingInt(Rectangle::getX2));
// ranges of our scan line with how many rectangles it is occluding
Segments segments = new Segments();