project: Merge upstream

This commit is contained in:
Owain van Brakel
2020-10-21 12:57:38 +02:00
28 changed files with 968 additions and 278 deletions

View File

@@ -50,7 +50,7 @@ import net.runelite.api.widgets.WidgetInfo;
*/
public class Perspective
{
private static final double UNIT = Math.PI / 1024d; // How much of the circle each unit of SINE/COSINE is
public static final double UNIT = Math.PI / 1024d; // How much of the circle each unit of SINE/COSINE is
public static final int LOCAL_COORD_BITS = 7;
public static final int LOCAL_TILE_SIZE = 1 << LOCAL_COORD_BITS; // 128 - size of a tile in local coordinates

View File

@@ -493,6 +493,7 @@ public enum Varbits
FARMING_7909(7909),
FARMING_7910(7910),
FARMING_7911(7911),
FARMING_7912(7912),
/**
* Transmog controllers for grapes

View File

@@ -328,7 +328,7 @@ public class Text
*
* @return true if all search terms matches at least one keyword, or false if otherwise.
*/
public static boolean matchesSearchTerms(String[] searchTerms, final Collection<String> keywords)
public static boolean matchesSearchTerms(Iterable<String> searchTerms, final Collection<String> keywords)
{
for (String term : searchTerms)
{

View File

@@ -173,6 +173,9 @@ public class WidgetID
public static final int GAUNTLET_MAP_GROUP_ID = 638;
public static final int HALLOWED_SEPULCHRE_TIMER_GROUP_ID = 668;
public static final int HEALTH_OVERLAY_BAR_GROUP_ID = 303;
public static final int CHAMBERS_OF_XERIC_STORAGE_UNIT_PRIVATE_GROUP_ID = 271;
public static final int CHAMBERS_OF_XERIC_STORAGE_UNIT_SHARED_GROUP_ID = 550;
public static final int CHAMBERS_OF_XERIC_STORAGE_UNIT_INVENTORY_GROUP_ID = 551;
static class WorldMap
{