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

upstream: merge and version bump

Browse Source 
upstream: merge and version bump
This commit is contained in:
Kyle
2020-04-25 23:53:09 +01:00
parent 967c3be8ba c507d0b4ff
commit 8216dfa20f
24 changed files with 356 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/AnimationID.java
+1
View File
@@ -162,6 +162,7 @@ public final class AnimationID
public static final int MAGIC_ENCHANTING_AMULET_1 = 719; // sapphire, opal, diamond
public static final int MAGIC_ENCHANTING_AMULET_2 = 720; // emerald, jade, dragonstone
public static final int MAGIC_ENCHANTING_AMULET_3 = 721; // ruby, topaz, onyx, zenyte
public static final int MAGIC_ENCHANTING_BOLTS = 4462;
public static final int BURYING_BONES = 827;
public static final int USING_GILDED_ALTAR = 3705;
public static final int LOOKING_INTO = 832;
runelite-api/src/main/java/net/runelite/api/Hitsplat.java
+72
View File
@@ -52,6 +52,38 @@ public class Hitsplat
* Taking damage by others (red).
*/
DAMAGE_OTHER,
/**
* Taking damage by me (cyan).
*/
DAMAGE_ME_CYAN,
/**
* Taking damage by others (cyan).
*/
DAMAGE_OTHER_CYAN,
/**
* Taking damage by me (orange).
*/
DAMAGE_ME_ORANGE,
/**
* Taking damage by others (orange).
*/
DAMAGE_OTHER_ORANGE,
/**
* Taking damage by me (yellow).
*/
DAMAGE_ME_YELLOW,
/**
* Taking damage by others (yellow).
*/
DAMAGE_OTHER_YELLOW,
/**
* Taking damage by me (white).
*/
DAMAGE_ME_WHITE,
/**
* Taking damage by others (white/black).
*/
DAMAGE_OTHER_WHITE,
/**
* Damage from poison (green).
*/
@@ -88,6 +120,14 @@ public class Hitsplat
case 4: return DISEASE;
case 5: return VENOM;
case 6: return HEAL;
case 18: return DAMAGE_ME_CYAN;
case 19: return DAMAGE_OTHER_CYAN;
case 20: return DAMAGE_ME_ORANGE;
case 21: return DAMAGE_OTHER_ORANGE;
case 22: return DAMAGE_ME_YELLOW;
case 23: return DAMAGE_OTHER_YELLOW;
case 24: return DAMAGE_ME_WHITE;
case 25: return DAMAGE_OTHER_WHITE;
}
return null;
}
@@ -117,4 +157,36 @@ public class Hitsplat
this.amount = amount;
this.disappearsOnGameCycle = disappearsOnGameCycle;
}
public boolean isMine()
{
switch (this.getHitsplatType())
{
case BLOCK_ME:
case DAMAGE_ME:
case DAMAGE_ME_CYAN:
case DAMAGE_ME_YELLOW:
case DAMAGE_ME_ORANGE:
case DAMAGE_ME_WHITE:
return true;
default:
return false;
}
}
public boolean isOthers()
{
switch (this.getHitsplatType())
{
case BLOCK_OTHER:
case DAMAGE_OTHER:
case DAMAGE_OTHER_CYAN:
case DAMAGE_OTHER_YELLOW:
case DAMAGE_OTHER_ORANGE:
case DAMAGE_OTHER_WHITE:
return true;
default:
return false;
}
}
}
runelite-api/src/main/java/net/runelite/api/ItemContainer.java
+32
View File
@@ -24,6 +24,9 @@
*/
package net.runelite.api;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/**
* Represents an inventory that contains items.
*/
@@ -34,5 +37,34 @@ public interface ItemContainer extends Node
*
* @return the items held
*/
@Nonnull
Item[] getItems();
/**
* Gets an item from the container at the given slot.
*
* @param slot
* @return the item
* @see Item
*/
@Nullable
Item getItem(int slot);
/**
* Check if this item container contains the given item
*
* @param itemId
* @return
* @see ItemID
*/
boolean contains(int itemId);
/**
* Counts how many of an item this item container contains
*
* @param itemId
* @return
* @see ItemID
*/
int count(int itemId);
}
runelite-api/src/main/java/net/runelite/api/ItemID.java
+26
View File
@@ -11434,5 +11434,31 @@ public final class ItemID
public static final int TANGLEROOT_24559 = 24559;
public static final int TANGLEROOT_24561 = 24561;
public static final int TANGLEROOT_24563 = 24563;
public static final int ANTIQUE_EMBLEM_TIER_1 = 24565;
public static final int ANTIQUE_EMBLEM_TIER_2 = 24567;
public static final int ANTIQUE_EMBLEM_TIER_3 = 24569;
public static final int ANTIQUE_EMBLEM_TIER_4 = 24571;
public static final int ANTIQUE_EMBLEM_TIER_5 = 24573;
public static final int ANTIQUE_EMBLEM_TIER_6 = 24575;
public static final int ANTIQUE_EMBLEM_TIER_7 = 24577;
public static final int ANTIQUE_EMBLEM_TIER_8 = 24579;
public static final int ANTIQUE_EMBLEM_TIER_9 = 24581;
public static final int ANTIQUE_EMBLEM_TIER_10 = 24583;
public static final int LOOTING_BAG_NOTE = 24585;
public static final int RUNE_POUCH_NOTE = 24587;
public static final int BLIGHTED_MANTA_RAY = 24589;
public static final int BLIGHTED_ANGLERFISH = 24592;
public static final int BLIGHTED_KARAMBWAN = 24595;
public static final int BLIGHTED_SUPER_RESTORE4 = 24598;
public static final int BLIGHTED_SUPER_RESTORE3 = 24601;
public static final int BLIGHTED_SUPER_RESTORE2 = 24603;
public static final int BLIGHTED_SUPER_RESTORE1 = 24605;
public static final int BLIGHTED_ICE_BARRAGE_SACK = 24607;
public static final int BLIGHTED_BIND_SACK = 24609;
public static final int BLIGHTED_SNARE_SACK = 24611;
public static final int BLIGHTED_ENTANGLE_SACK = 24613;
public static final int BLIGHTED_TELEBLOCK_SACK = 24615;
public static final int VESTAS_BLIGHTED_LONGSWORD = 24617;
public static final int VESTAS_LONGSWORD_INACTIVE = 24619;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+1
View File
@@ -5993,6 +5993,7 @@ public final class NpcID
public static final int SISTER_SCAROPHIA = 6590;
public static final int LAVA_DRAGON = 6593;
public static final int ENT = 6594;
public static final int PRIFDDINAS_GUARD = 6595;
public static final int ZOMBIE_6596 = 6596;
public static final int ZOMBIE_6597 = 6597;
public static final int ZOMBIE_6598 = 6598;
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+30
View File
@@ -12922,5 +12922,35 @@ public final class NullItemID
public static final int NULL_24560 = 24560;
public static final int NULL_24562 = 24562;
public static final int NULL_24564 = 24564;
public static final int NULL_24566 = 24566;
public static final int NULL_24568 = 24568;
public static final int NULL_24570 = 24570;
public static final int NULL_24572 = 24572;
public static final int NULL_24574 = 24574;
public static final int NULL_24576 = 24576;
public static final int NULL_24578 = 24578;
public static final int NULL_24580 = 24580;
public static final int NULL_24582 = 24582;
public static final int NULL_24584 = 24584;
public static final int NULL_24586 = 24586;
public static final int NULL_24588 = 24588;
public static final int NULL_24590 = 24590;
public static final int NULL_24591 = 24591;
public static final int NULL_24593 = 24593;
public static final int NULL_24594 = 24594;
public static final int NULL_24596 = 24596;
public static final int NULL_24597 = 24597;
public static final int NULL_24599 = 24599;
public static final int NULL_24600 = 24600;
public static final int NULL_24602 = 24602;
public static final int NULL_24604 = 24604;
public static final int NULL_24606 = 24606;
public static final int NULL_24608 = 24608;
public static final int NULL_24610 = 24610;
public static final int NULL_24612 = 24612;
public static final int NULL_24614 = 24614;
public static final int NULL_24616 = 24616;
public static final int NULL_24618 = 24618;
public static final int NULL_24620 = 24620;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ScriptEvent.java
+14
View File
@@ -66,4 +66,18 @@ public interface ScriptEvent
* Parent relative x coordinate for mouse related events
*/
int getMouseX();
/**
* Jagex typed keycode
*
* @return
*/
int getTypedKeyCode();
/**
* Get the typed character, ascii.
*
* @return
*/
int getTypedKeyChar();
}
runelite-api/src/main/java/net/runelite/api/ScriptID.java
-6
View File
@@ -271,12 +271,6 @@ public final class ScriptID
@ScriptArguments(integer = 3)
public static final int QUESTLIST_PROGRESS_LIST_SHOW = 1354;
/**
* Procedure called when the toplevel interface is resized
*/
@ScriptArguments(integer = 2)
public static final int TOPLEVEL_RESIZE = 909;
/**
* Called when the friends list is updated
* <ul>
runelite-api/src/main/java/net/runelite/api/hooks/DrawCallbacks.java
+4 -1
View File
@@ -24,6 +24,7 @@
*/
package net.runelite.api.hooks;
import net.runelite.api.Model;
import net.runelite.api.Entity;
import net.runelite.api.TileModel;
import net.runelite.api.TilePaint;
@@ -44,7 +45,9 @@ public interface DrawCallbacks
void draw();
boolean drawFace(Model model, int face);
void drawScene(int cameraX, int cameraY, int cameraZ, int cameraPitch, int cameraYaw, int plane);
void animate(Texture texture, int diff);
}
}
runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
+20 -2
View File
@@ -692,12 +692,23 @@ public interface Widget
void revalidateScroll();
/**
* Array of widget key listeners
* Gets the script and arguments to be ran when a menu action is clicked.
*
* @return
*/
Object[] getOnOpListener();
/**
* Gets the script and arguments to be ran when a key is pressed.
*
* @return
*/
Object[] getOnKeyListener();
/**
* Array of widget load listeners
* Gets the script and arguments to be ran when a interface is loaded.
*
* @return
*/
Object[] getOnLoadListener();
@@ -705,6 +716,13 @@ public interface Widget
Object[] getOnOp();
/**
* Gets the script and arguments to be ran when one of the listened for inventories changes.
*
* @return
*/
Object[] getOnInvTransmitListener();
/**
* Returns the archive id of the font used
*