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
2020-01-29 14:20:52 +01:00
parent add4ca8005 38c6478c40
commit 7f2f43364b
6 changed files with 109 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+4
View File
@@ -11394,5 +11394,9 @@ public final class ItemID
public static final int OPENED_COAL_BAG = 24480;
public static final int OPENED_GEM_BAG = 24481;
public static final int OPEN_SEED_BOX = 24482;
public static final int PHOENIX_24483 = 24483;
public static final int PHOENIX_24484 = 24484;
public static final int PHOENIX_24485 = 24485;
public static final int PHOENIX_24486 = 24486;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+21 -13
View File
@@ -235,12 +235,12 @@ public final class NpcID
public static final int BUTTERFLY_238 = 238;
public static final int KING_BLACK_DRAGON = 239;
public static final int BLACK_DEMON = 240;
public static final int BABY_DRAGON = 241;
public static final int BABY_DRAGON_242 = 242;
public static final int BABY_DRAGON_243 = 243;
public static final int BABY_DRAGON_244 = 244;
public static final int BABY_DRAGON_245 = 245;
public static final int BABY_DRAGON_246 = 246;
public static final int BABY_BLUE_DRAGON = 241;
public static final int BABY_BLUE_DRAGON_242 = 242;
public static final int BABY_BLUE_DRAGON_243 = 243;
public static final int BABY_RED_DRAGON_244 = 244;
public static final int BABY_RED_DRAGON_245 = 245;
public static final int BABY_RED_DRAGON_246 = 246;
public static final int RED_DRAGON = 247;
public static final int RED_DRAGON_248 = 248;
public static final int RED_DRAGON_249 = 249;
@@ -1767,8 +1767,8 @@ public final class NpcID
public static final int SIR_AMIK_VARZE = 1867;
public static final int SIR_AMIK_VARZE_1869 = 1869;
public static final int EVIL_CHICKEN = 1870;
public static final int BABY_DRAGON_1871 = 1871;
public static final int BABY_DRAGON_1872 = 1872;
public static final int BABY_BLACK_DRAGON = 1871;
public static final int BABY_BLACK_DRAGON_1872 = 1872;
public static final int KKLIK = 1873;
public static final int ICE_TROLL_RUNT = 1874;
public static final int ICE_TROLL_MALE = 1875;
@@ -2884,6 +2884,14 @@ public final class NpcID
public static final int GOBLIN_3074 = 3074;
public static final int GOBLIN_3075 = 3075;
public static final int GOBLIN_3076 = 3076;
public static final int PHOENIX = 3077;
public static final int PHOENIX_3078 = 3078;
public static final int PHOENIX_3079 = 3079;
public static final int PHOENIX_3080 = 3080;
public static final int PHOENIX_3081 = 3081;
public static final int PHOENIX_3082 = 3082;
public static final int PHOENIX_3083 = 3083;
public static final int PHOENIX_3084 = 3084;
public static final int PORTAL_3086 = 3086;
public static final int PORTAL_3088 = 3088;
public static final int BANKER_3089 = 3089;
@@ -4864,7 +4872,7 @@ public final class NpcID
public static final int CAPTAIN_LAWGOF = 5191;
public static final int GOBLIN_5192 = 5192;
public static final int GOBLIN_5193 = 5193;
public static final int BABY_DRAGON_5194 = 5194;
public static final int BABY_GREEN_DRAGON = 5194;
public static final int GOBLIN_5195 = 5195;
public static final int GOBLIN_5196 = 5196;
public static final int GOBLIN_5197 = 5197;
@@ -5501,8 +5509,8 @@ public final class NpcID
public static final int SUMMONED_SOUL_5869 = 5869;
public static final int KEY_MASTER = 5870;
public static final int KING_ARTHUR_5871 = 5871;
public static final int BABY_DRAGON_5872 = 5872;
public static final int BABY_DRAGON_5873 = 5873;
public static final int BABY_GREEN_DRAGON_5872 = 5872;
public static final int BABY_GREEN_DRAGON_5873 = 5873;
public static final int BLACK_DEMON_5874 = 5874;
public static final int BLACK_DEMON_5875 = 5875;
public static final int BLACK_DEMON_5876 = 5876;
@@ -6677,7 +6685,7 @@ public final class NpcID
public static final int RIFT_GUARDIAN_7365 = 7365;
public static final int RIFT_GUARDIAN_7366 = 7366;
public static final int RIFT_GUARDIAN_7367 = 7367;
public static final int PHOENIX = 7368;
public static final int PHOENIX_7368 = 7368;
public static final int WESLEY = 7369;
public static final int PHOENIX_7370 = 7370;
public static final int PYROMANCER = 7371;
@@ -7175,7 +7183,7 @@ public final class NpcID
public static final int ERDAN = 7952;
public static final int PRIMULA = 7953;
public static final int MYSTERIOUS_ADVENTURER = 7954;
public static final int BABY_DRAGON_7955 = 7955;
public static final int BABY_BLACK_DRAGON_7955 = 7955;
public static final int CAPTAIN_TOCK = 7956;
public static final int CAPTAIN_TOCK_7957 = 7957;
public static final int CAPTAIN_TOCK_7958 = 7958;
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+1
View File
@@ -12880,5 +12880,6 @@ public final class NullItemID
public static final int NULL_24474 = 24474;
public static final int NULL_24476 = 24476;
public static final int NULL_24477 = 24477;
public static final int NULL_24487 = 24487;
/* This file is automatically generated. Do not edit. */
}