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

Merge pull request #2865 from Owain94/upstream-1811

Browse Source
This commit is contained in:
Owain van Brakel
2020-11-18 23:38:00 +01:00
committed by GitHub
parent d28b2e5047 d4314fc9f6
commit af4960cff1
11 changed files with 95 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/Dependencies.kt
+2 -2
View File
@@ -25,9 +25,9 @@
object ProjectVersions {
const val launcherVersion = "2.2.0"
const val rlVersion = "1.6.31"
const val rlVersion = "1.6.32"
const val openosrsVersion = "3.5.3"
const val openosrsVersion = "3.5.4"
const val rsversion = 192
const val cacheversion = 165
runelite-api/src/main/java/net/runelite/api/ItemID.java
+6 -9
View File
@@ -4544,15 +4544,6 @@ public final class ItemID
public static final int EMPTY_SPICE_SHAKER = 7496;
public static final int DIRTY_BLAST = 7497;
public static final int ANTIQUE_LAMP_7498 = 7498;
public static final int EVIL_DAVE = 7499;
public static final int DWARF_7500 = 7500;
public static final int GOBLINS = 7501;
public static final int LUMBRIDGE_GUIDE = 7502;
public static final int MONKEY_7503 = 7503;
public static final int OSMAN = 7504;
public static final int PIRATE_PETE = 7505;
public static final int SIR_AMIK_VARZE = 7506;
public static final int SKRACH = 7507;
public static final int ASGOLDIAN_ALE = 7508;
public static final int DWARVEN_ROCK_CAKE = 7509;
public static final int DWARVEN_ROCK_CAKE_7510 = 7510;
@@ -11552,5 +11543,11 @@ public final class ItemID
public static final int TRAILBLAZER_PICKAXE_25112 = 25112;
public static final int TRAILBLAZER_HARPOON_25114 = 25114;
public static final int LEAGUE_TOMATO = 25117;
public static final int BEEKEEPERS_HAT = 25129;
public static final int BEEKEEPERS_TOP = 25131;
public static final int BEEKEEPERS_LEGS = 25133;
public static final int BEEKEEPERS_GLOVES = 25135;
public static final int BEEKEEPERS_BOOTS = 25137;
public static final int BONE_FRAGMENTS = 25139;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+40 -4
View File
@@ -5704,10 +5704,6 @@ public final class NpcID
public static final int GNOME_WOMAN = 6086;
public static final int GNOME_WOMAN_6087 = 6087;
public static final int CAPTAIN_ERRDO = 6088;
public static final int CAPTAIN_DALBUR = 6089;
public static final int CAPTAIN_BLEEMADGE = 6090;
public static final int CAPTAIN_ERRDO_6091 = 6091;
public static final int CAPTAIN_KLEMFOODLE = 6092;
public static final int GNOME_6094 = 6094;
public static final int GNOME_6095 = 6095;
public static final int GNOME_6096 = 6096;
@@ -8828,10 +8824,50 @@ public final class NpcID
public static final int SPIDER_10442 = 10442;
public static final int SPIDER_10443 = 10443;
public static final int BEES = 10444;
public static final int GNORMADIUM_AVLAFRIM_10445 = 10445;
public static final int GNORMADIUM_AVLAFRIM_10446 = 10446;
public static final int GNORMADIUM_AVLAFRIM_10447 = 10447;
public static final int GNORMADIUM_AVLAFRIM_10448 = 10448;
public static final int EVE_10449 = 10449;
public static final int GNORMADIUM_AVLAFRIM_10450 = 10450;
public static final int GNORMADIUM_AVLAFRIM_10451 = 10451;
public static final int CAPTAIN_DALBUR = 10452;
public static final int CAPTAIN_DALBUR_10453 = 10453;
public static final int CAPTAIN_DALBUR_10454 = 10454;
public static final int CAPTAIN_DALBUR_10455 = 10455;
public static final int CAPTAIN_DALBUR_10456 = 10456;
public static final int CAPTAIN_DALBUR_10457 = 10457;
public static final int CAPTAIN_DALBUR_10458 = 10458;
public static final int CAPTAIN_BLEEMADGE = 10459;
public static final int JACKOLANTERN = 10460;
public static final int CAPTAIN_BLEEMADGE_10461 = 10461;
public static final int CAPTAIN_BLEEMADGE_10462 = 10462;
public static final int CAPTAIN_BLEEMADGE_10463 = 10463;
public static final int CAPTAIN_BLEEMADGE_10464 = 10464;
public static final int CAPTAIN_BLEEMADGE_10465 = 10465;
public static final int CAPTAIN_BLEEMADGE_10466 = 10466;
public static final int CAPTAIN_ERRDO_10467 = 10467;
public static final int CAPTAIN_ERRDO_10468 = 10468;
public static final int CAPTAIN_ERRDO_10469 = 10469;
public static final int CAPTAIN_ERRDO_10470 = 10470;
public static final int CAPTAIN_ERRDO_10471 = 10471;
public static final int CAPTAIN_ERRDO_10472 = 10472;
public static final int CAPTAIN_ERRDO_10473 = 10473;
public static final int LEAGUES_ASSISTANT = 10476;
public static final int THESSALIA = 10477;
public static final int THESSALIA_10478 = 10478;
public static final int CAPTAIN_KLEMFOODLE = 10479;
public static final int CAPTAIN_KLEMFOODLE_10480 = 10480;
public static final int CAPTAIN_KLEMFOODLE_10481 = 10481;
public static final int CAPTAIN_KLEMFOODLE_10482 = 10482;
public static final int CAPTAIN_KLEMFOODLE_10483 = 10483;
public static final int CAPTAIN_KLEMFOODLE_10484 = 10484;
public static final int CAPTAIN_KLEMFOODLE_10485 = 10485;
public static final int CAPTAIN_SHORACKS_10486 = 10486;
public static final int CAPTAIN_SHORACKS_10487 = 10487;
public static final int CAPTAIN_SHORACKS_10488 = 10488;
public static final int CAPTAIN_SHORACKS_10489 = 10489;
public static final int CAPTAIN_SHORACKS_10490 = 10490;
public static final int CAPTAIN_SHORACKS_10491 = 10491;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+19
View File
@@ -2841,6 +2841,15 @@ public final class NullItemID
public static final int NULL_7452 = 7452;
public static final int NULL_7467 = 7467;
public static final int NULL_7469 = 7469;
public static final int NULL_7499 = 7499;
public static final int NULL_7500 = 7500;
public static final int NULL_7501 = 7501;
public static final int NULL_7502 = 7502;
public static final int NULL_7503 = 7503;
public static final int NULL_7504 = 7504;
public static final int NULL_7505 = 7505;
public static final int NULL_7506 = 7506;
public static final int NULL_7507 = 7507;
public static final int NULL_7522 = 7522;
public static final int NULL_7549 = 7549;
public static final int NULL_7551 = 7551;
@@ -13368,5 +13377,15 @@ public final class NullItemID
public static final int NULL_25126 = 25126;
public static final int NULL_25127 = 25127;
public static final int NULL_25128 = 25128;
public static final int NULL_25130 = 25130;
public static final int NULL_25132 = 25132;
public static final int NULL_25134 = 25134;
public static final int NULL_25136 = 25136;
public static final int NULL_25138 = 25138;
public static final int NULL_25140 = 25140;
public static final int NULL_25141 = 25141;
public static final int NULL_25142 = 25142;
public static final int NULL_25143 = 25143;
public static final int NULL_25144 = 25144;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullNpcID.java
+4
View File
@@ -381,6 +381,10 @@ public final class NullNpcID
public static final int NULL_5903 = 5903;
public static final int NULL_5930 = 5930;
public static final int NULL_5953 = 5953;
public static final int NULL_6089 = 6089;
public static final int NULL_6090 = 6090;
public static final int NULL_6091 = 6091;
public static final int NULL_6092 = 6092;
public static final int NULL_6093 = 6093;
public static final int NULL_6104 = 6104;
public static final int NULL_6105 = 6105;
runelite-api/src/main/java/net/runelite/api/Scene.java
+6
View File
@@ -50,4 +50,10 @@ public interface Scene
int getDrawDistance();
void setDrawDistance(int drawDistance);
/**
* Remove a game object from the scene
* @param gameObject
*/
void removeGameObject(GameObject gameObject);
}
runelite-api/src/main/java/net/runelite/api/ScriptID.java
+1 -1
View File
@@ -225,7 +225,7 @@ public final class ScriptID
* </ul>
*/
@ScriptArguments(string = 1)
public static final int FRIENDS_CHAT_SEND_KICK = 215;
public static final int FRIENDS_CHAT_SEND_KICK = 3764;
/**
* Toggles the bank search
runelite-api/src/main/java/net/runelite/api/SpriteID.java
+9 -9
View File
@@ -977,15 +977,6 @@ public final class SpriteID
public static final int STASH_UNITS_SLANTED_TAB_EDGE_LEFT_HOVERED = 1001;
public static final int STASH_UNITS_SLANTED_TAB_MIDDLE_HOVERED = 1002;
public static final int STASH_UNITS_SLANTED_TAB_EDGE_RIGHT_HOVERED = 1003;
public static final int FRIENDS_CHAT_RANK_SMILEY_FRIEND = 1004;
public static final int FRIENDS_CHAT_RANK_CROWN_JAGEX_MODERATOR = 1005;
public static final int FRIENDS_CHAT_RANK_KEY_CHANNEL_OWNER = 1006;
public static final int FRIENDS_CHAT_RANK_GOLD_STAR_GENERAL = 1007;
public static final int FRIENDS_CHAT_RANK_SILVER_STAR_CAPTAIN = 1008;
public static final int FRIENDS_CHAT_RANK_BRONZE_STAR_LIEUTENANT = 1009;
public static final int FRIENDS_CHAT_RANK_TRIPLE_CHEVRON_SERGEANT = 1010;
public static final int FRIENDS_CHAT_RANK_DOUBLE_CHEVRON_CORPORAL = 1011;
public static final int FRIENDS_CHAT_RANK_SINGLE_CHEVRON_RECRUIT = 1012;
public static final int UNKNOWN_BUTTON_METAL_CORNERS = 1013;
public static final int UNKNOWN_BUTTON_METAL_CORNERS_HOVERED = 1014;
public static final int UNKNOWN_SLANTED_TAB_LONG = 1015;
@@ -1596,4 +1587,13 @@ public final class SpriteID
public static final int HEALTHBAR_DEFAULT_BACK_160PX = 2191;
public static final int WIKI_DESELECTED = 2420;
public static final int WIKI_SELECTED = 2421;
public static final int FRIENDS_CHAT_RANK_SMILEY_FRIEND = 2825;
public static final int FRIENDS_CHAT_RANK_CROWN_JAGEX_MODERATOR = 2826;
public static final int FRIENDS_CHAT_RANK_KEY_CHANNEL_OWNER = 2827;
public static final int FRIENDS_CHAT_RANK_GOLD_STAR_GENERAL = 2828;
public static final int FRIENDS_CHAT_RANK_SILVER_STAR_CAPTAIN = 2829;
public static final int FRIENDS_CHAT_RANK_BRONZE_STAR_LIEUTENANT = 2830;
public static final int FRIENDS_CHAT_RANK_TRIPLE_CHEVRON_SERGEANT = 2831;
public static final int FRIENDS_CHAT_RANK_DOUBLE_CHEVRON_CORPORAL = 2832;
public static final int FRIENDS_CHAT_RANK_SINGLE_CHEVRON_RECRUIT = 2833;
}
runelite-client/src/main/resources/item_variations.json
-5
View File
@@ -3336,7 +3336,6 @@
],
"monkey": [
4033,
7503,
8942,
19556
],
@@ -4107,10 +4106,6 @@
5050,
5052
],
"dwarf": [
5054,
7500
],
"dwarven battleaxe": [
5056,
5057,
runelite-client/src/main/resources/scripts/FriendsChatSendKick.rs2asm
+1 -1
View File
@@ -1,4 +1,4 @@
.id 215
.id 3764
.int_stack_count 0
.string_stack_count 1
.int_var_count 0
runescape-api/src/main/java/net/runelite/rs/api/RSScene.java
+7
View File
@@ -1,5 +1,6 @@
package net.runelite.rs.api;
import net.runelite.api.GameObject;
import net.runelite.api.Scene;
import net.runelite.api.Tile;
import net.runelite.mapping.Import;
@@ -45,4 +46,10 @@ public interface RSScene extends Scene
@Import("newGroundItemPile")
void newGroundItemPile(int plane, int x, int y, int hash, RSEntity var5, long var6, RSEntity var7, RSEntity var8);
@Import("newGameObject")
boolean newGameObject(int plane, int startX, int startY, int var4, int var5, int centerX, int centerY, int height, RSEntity entity, int orientation, boolean tmp, long tag, int flags);
@Import("removeGameObject")
void removeGameObject(GameObject gameObject);
}