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

Merge remote-tracking branch 'upstream/master' into runelite

Browse Source 
# Conflicts:
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	http-api/pom.xml
#	http-service/pom.xml
#	pom.xml
#	runelite-api/pom.xml
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/FarmingTrackerTest.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
#	runelite-client/src/test/java/net/runelite/client/chat/ChatMessageManagerTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/ClueScrollPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/grounditems/GroundItemsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java
#	runelite-script-assembler-plugin/pom.xml
This commit is contained in:
ThatGamerBlue
2021-02-14 00:31:56 +00:00
parent 3550d70e92 1684eccd00
commit f4580f37e0
81 changed files with 3354 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runelite-api/src/main/java/net/runelite/api/AnimationID.java
View File

@@ -97,6 +97,7 @@ public final class AnimationID
public static final int CRAFTING_SPINNING = 894;
public static final int CRAFTING_POTTERS_WHEEL = 883;
public static final int CRAFTING_POTTERY_OVEN = 24975;
public static final int CRAFTING_LOOM = 2270;
public static final int SMITHING_SMELTING = 899;
public static final int SMITHING_CANNONBALL = 827; //cball smithing uses this and SMITHING_SMELTING
public static final int SMITHING_ANVIL = 898;
@@ -209,6 +210,12 @@ public final class AnimationID
public static final int HOME_MAKE_TABLET = 4067;
public static final int DRAGONFIRE_SHIELD_SPECIAL = 6696;
// Ectofuntus animations
public static final int ECTOFUNTUS_FILL_SLIME_BUCKET = 4471;
public static final int ECTOFUNTUS_GRIND_BONES = 1648;
public static final int ECTOFUNTUS_INSERT_BONES = 1649;
public static final int ECTOFUNTUS_EMPTY_BIN = 1650;
// NPC animations
public static final int TZTOK_JAD_MAGIC_ATTACK = 2656;
public static final int TZTOK_JAD_RANGE_ATTACK = 2652;

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

@@ -124,12 +124,25 @@ public interface Client extends GameEngine
/**
* Adds a new chat message to the chatbox.
*
* @param type the type of message
* @param name the name of the player that sent the message
* @param type the type of message
* @param name the name of the player that sent the message
* @param message the message contents
* @param sender the sender/channel name
* @param sender the sender/channel name
* @return the message node for the message
*/
void addChatMessage(ChatMessageType type, String name, String message, String sender);
MessageNode addChatMessage(ChatMessageType type, String name, String message, String sender);
/**
* Adds a new chat message to the chatbox.
*
* @param type the type of message
* @param name the name of the player that sent the message
* @param message the message contents
* @param sender the sender/channel name
* @param postEvent whether to post the chat message event
* @return the message node for the message
*/
MessageNode addChatMessage(ChatMessageType type, String name, String message, String sender, boolean postEvent);
/**
* Gets the current game state.
@@ -1542,7 +1555,7 @@ public interface Client extends GameEngine
*
* @param state the new player hidden state
*/
void setPlayersHidden(boolean state);
void setOthersHidden(boolean state);
/**
* Sets whether 2D sprites related to the other players are hidden.
@@ -1550,7 +1563,7 @@ public interface Client extends GameEngine
*
* @param state the new player 2D hidden state
*/
void setPlayersHidden2D(boolean state);
void setOthersHidden2D(boolean state);
/**
* Sets whether or not friends are hidden.
@@ -1566,6 +1579,13 @@ public interface Client extends GameEngine
*/
void setFriendsChatMembersHidden(boolean state);
/**
* Sets whether or not ignored players are hidden.
*
* @param state the new ignored player hidden state
*/
void setIgnoresHidden(boolean state);
/**
* Sets whether the local player is hidden.
*

18
runelite-api/src/main/java/net/runelite/api/Perspective.java
View File

@@ -376,7 +376,7 @@ public class Perspective
*/
public static Polygon getCanvasTilePoly(@Nonnull Client client, @Nonnull LocalPoint localLocation, int zOffset)
{
return getCanvasTileAreaPoly(client, localLocation, 1, zOffset);
return getCanvasTileAreaPoly(client, localLocation, 1, 1, zOffset);
}
/**
@@ -389,7 +389,7 @@ public class Perspective
*/
public static Polygon getCanvasTileAreaPoly(@Nonnull Client client, @Nonnull LocalPoint localLocation, int size)
{
return getCanvasTileAreaPoly(client, localLocation, size, 0);
return getCanvasTileAreaPoly(client, localLocation, size, size, 0);
}
/**
@@ -397,23 +397,25 @@ public class Perspective
*
* @param client the game client
* @param localLocation the center location of the AoE
* @param size the size of the area (ie. 3x3 AoE evaluates to size 3)
* @param sizeX the size of the area in tiles on the x axis
* @param sizeY the size of the area in tiles on the y axis
* @param zOffset offset from ground plane
* @return a polygon representing the tiles in the area
*/
public static Polygon getCanvasTileAreaPoly(
@Nonnull Client client,
@Nonnull LocalPoint localLocation,
int size,
int sizeX,
int sizeY,
int zOffset)
{
final int plane = client.getPlane();
final int swX = localLocation.getX() - (size * LOCAL_TILE_SIZE / 2);
final int swY = localLocation.getY() - (size * LOCAL_TILE_SIZE / 2);
final int swX = localLocation.getX() - (sizeX * LOCAL_TILE_SIZE / 2);
final int swY = localLocation.getY() - (sizeY * LOCAL_TILE_SIZE / 2);
final int neX = localLocation.getX() + (size * LOCAL_TILE_SIZE / 2);
final int neY = localLocation.getY() + (size * LOCAL_TILE_SIZE / 2);
final int neX = localLocation.getX() + (sizeX * LOCAL_TILE_SIZE / 2);
final int neY = localLocation.getY() + (sizeY * LOCAL_TILE_SIZE / 2);
final byte[][][] tileSettings = client.getTileSettings();