From 9b70d64960e7ffd60d2efc8018ac69930fbd53e4 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 6 Jan 2021 12:18:00 +0000 Subject: [PATCH 1/4] Update Item IDs to 2021-01-06-rev193 --- .../main/java/net/runelite/api/ItemID.java | 68 +++++++++++++++---- .../java/net/runelite/api/NullItemID.java | 28 ++++++++ .../woodcutting/CrowdsourcingWoodcutting.java | 2 +- .../client/plugins/fishing/FishingPlugin.java | 2 +- .../client/plugins/mining/Pickaxe.java | 4 +- .../client/plugins/woodcutting/Axe.java | 4 +- 6 files changed, 89 insertions(+), 19 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index 6301bf633d..66ef6c0323 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -624,7 +624,7 @@ public final class ItemID public static final int SILK = 950; public static final int SPADE = 952; public static final int ROPE = 954; - public static final int FLIER = 956; + public static final int FLYER = 956; public static final int GREY_WOLF_FUR = 958; public static final int PLANK = 960; public static final int CHRISTMAS_CRACKER = 962; @@ -5007,7 +5007,7 @@ public final class ItemID public static final int SARADOMIN_ICON = 8058; public static final int ZAMORAK_ICON = 8059; public static final int GUTHIX_ICON = 8060; - public static final int ICON_OF_BOB = 8061; + public static final int BOB_ICON = 8061; public static final int OAK_ALTAR = 8062; public static final int TEAK_ALTAR = 8063; public static final int CLOTHCOVERED_ALTAR = 8064; @@ -10753,7 +10753,7 @@ public final class ItemID public static final int CRYSTAL_SAPLING = 23659; public static final int CRYSTAL_ACORN = 23661; public static final int DRAGONSTONE_ARMOUR_SET = 23667; - public static final int FLIER_23670 = 23670; + public static final int FLYER_23670 = 23670; public static final int CRYSTAL_AXE = 23673; public static final int CRYSTAL_AXE_INACTIVE = 23675; public static final int DRAGON_PICKAXE_OR = 23677; @@ -11491,19 +11491,18 @@ public final class ItemID public static final int CABBAGE_24994 = 24994; public static final int CABBAGE_24996 = 24996; public static final int TRAILBLAZER_HOOD_T3 = 25001; - public static final int TRAILBLAZER_COAT_T3 = 25004; + public static final int TRAILBLAZER_TOP_T3 = 25004; public static final int TRAILBLAZER_TROUSERS_T3 = 25007; public static final int TRAILBLAZER_BOOTS_T3 = 25010; public static final int TRAILBLAZER_CANE = 25013; public static final int TRAILBLAZER_HOOD_T2 = 25016; - public static final int TRAILBLAZER_COAT_T2 = 25019; + public static final int TRAILBLAZER_TOP_T2 = 25019; public static final int TRAILBLAZER_TROUSERS_T2 = 25022; public static final int TRAILBLAZER_BOOTS_T2 = 25025; public static final int TRAILBLAZER_HOOD_T1 = 25028; - public static final int TRAILBLAZER_COAT_T1 = 25031; + public static final int TRAILBLAZER_TOP_T1 = 25031; public static final int TRAILBLAZER_TROUSERS_T1 = 25034; public static final int TRAILBLAZER_BOOTS_T1 = 25037; - public static final int TRAILBLAZER_TROPHY = 25040; public static final int TRAILBLAZER_DRAGON_TROPHY = 25042; public static final int TRAILBLAZER_RUNE_TROPHY = 25044; public static final int TRAILBLAZER_ADAMANT_TROPHY = 25046; @@ -11512,9 +11511,9 @@ public final class ItemID public static final int TRAILBLAZER_IRON_TROPHY = 25052; public static final int TRAILBLAZER_BRONZE_TROPHY = 25054; public static final int TRAILBLAZER_BANNER = 25056; - public static final int TRAILBLAZER_HARPOON = 25059; - public static final int TRAILBLAZER_PICKAXE = 25063; - public static final int TRAILBLAZER_AXE = 25066; + public static final int INFERNAL_HARPOON_OR = 25059; + public static final int INFERNAL_PICKAXE_OR = 25063; + public static final int INFERNAL_AXE_OR = 25066; public static final int GRACEFUL_HOOD_25069 = 25069; public static final int GRACEFUL_HOOD_25071 = 25071; public static final int GRACEFUL_CAPE_25072 = 25072; @@ -11536,9 +11535,9 @@ public final class ItemID public static final int CRYSTAL_OF_MEMORIES = 25104; public static final int EXTRADIMENSIONAL_BAG = 25106; public static final int EXTRADIMENSIONAL_BAG_25108 = 25108; - public static final int TRAILBLAZER_AXE_25110 = 25110; - public static final int TRAILBLAZER_PICKAXE_25112 = 25112; - public static final int TRAILBLAZER_HARPOON_25114 = 25114; + public static final int TRAILBLAZER_AXE = 25110; + public static final int TRAILBLAZER_PICKAXE = 25112; + public static final int TRAILBLAZER_HARPOON = 25114; public static final int LEAGUE_TOMATO = 25117; public static final int BEEKEEPERS_HAT = 25129; public static final int BEEKEEPERS_TOP = 25131; @@ -11656,5 +11655,48 @@ public final class ItemID public static final int GOBLIN_GIFTS = 25290; public static final int GIANT_BOULDER = 25314; public static final int GOBLIN_DECORATIONS = 25316; + public static final int GNOME_CHILD_ICON = 25319; + public static final int GNOME_CHILD = 25320; + public static final int GNOME_CHILD_25321 = 25321; + public static final int _20TH_ANNIVERSARY_HAT = 25322; + public static final int _20TH_ANNIVERSARY_TOP = 25324; + public static final int _20TH_ANNIVERSARY_BOTTOM = 25326; + public static final int _20TH_ANNIVERSARY_BOOTS = 25328; + public static final int _20TH_ANNIVERSARY_GLOVES = 25330; + public static final int _20TH_ANNIVERSARY_NECKLACE = 25332; + public static final int _20TH_ANNIVERSARY_CAPE = 25334; + public static final int GNOME_CHILD_MASK = 25336; + public static final int GNOME_CHILD_ICON_25338 = 25338; + public static final int ECTOPLASMATOR = 25340; + public static final int SPOILS_OF_WAR = 25342; + public static final int SOUL_CAPE = 25344; + public static final int SOUL_CAPE_25346 = 25346; + public static final int LIL_CREATOR = 25348; + public static final int LIL_DESTRUCTOR = 25350; + public static final int TROPHY_PEDESTAL = 25351; + public static final int ORNATE_TROPHY_PEDESTAL = 25352; + public static final int OAK_TROPHY_CASE = 25353; + public static final int MAHOGANY_TROPHY_CASE = 25354; + public static final int BANNER_STAND = 25355; + public static final int ORNATE_BANNER_STAND = 25356; + public static final int OAK_OUTFIT_STAND = 25357; + public static final int MAHOGANY_OUTFIT_STAND = 25358; + public static final int LEAGUE_STATUE = 25359; + public static final int ORNATE_LEAGUE_STATUE = 25360; + public static final int TRAILBLAZER_GLOBE_25361 = 25361; + public static final int RUG_25362 = 25362; + public static final int OPULENT_RUG_25363 = 25363; + public static final int TRAILBLAZER_RUG_25364 = 25364; + public static final int LEAGUE_ACCOMPLISHMENTS_SCROLL = 25365; + public static final int LEAGUE_HALL = 25366; + public static final int INFERNAL_HARPOON_UNCHARGED_25367 = 25367; + public static final int INFERNAL_PICKAXE_UNCHARGED_25369 = 25369; + public static final int INFERNAL_AXE_UNCHARGED_25371 = 25371; + public static final int DRAGON_HARPOON_OR = 25373; + public static final int DRAGON_PICKAXE_OR_25376 = 25376; + public static final int DRAGON_AXE_OR = 25378; + public static final int TRAILBLAZER_RELIC_HUNTER_T1_ARMOUR_SET = 25380; + public static final int TRAILBLAZER_RELIC_HUNTER_T2_ARMOUR_SET = 25383; + public static final int TRAILBLAZER_RELIC_HUNTER_T3_ARMOUR_SET = 25386; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index bccd666609..c6fa2aadf0 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -13326,6 +13326,7 @@ public final class NullItemID public static final int NULL_25036 = 25036; public static final int NULL_25038 = 25038; public static final int NULL_25039 = 25039; + public static final int NULL_25040 = 25040; public static final int NULL_25041 = 25041; public static final int NULL_25043 = 25043; public static final int NULL_25045 = 25045; @@ -13452,5 +13453,32 @@ public final class NullItemID public static final int NULL_25315 = 25315; public static final int NULL_25317 = 25317; public static final int NULL_25318 = 25318; + public static final int NULL_25323 = 25323; + public static final int NULL_25325 = 25325; + public static final int NULL_25327 = 25327; + public static final int NULL_25329 = 25329; + public static final int NULL_25331 = 25331; + public static final int NULL_25333 = 25333; + public static final int NULL_25335 = 25335; + public static final int NULL_25337 = 25337; + public static final int NULL_25339 = 25339; + public static final int NULL_25341 = 25341; + public static final int NULL_25343 = 25343; + public static final int NULL_25345 = 25345; + public static final int NULL_25347 = 25347; + public static final int NULL_25349 = 25349; + public static final int NULL_25368 = 25368; + public static final int NULL_25370 = 25370; + public static final int NULL_25372 = 25372; + public static final int NULL_25374 = 25374; + public static final int NULL_25375 = 25375; + public static final int NULL_25377 = 25377; + public static final int NULL_25379 = 25379; + public static final int NULL_25381 = 25381; + public static final int NULL_25382 = 25382; + public static final int NULL_25384 = 25384; + public static final int NULL_25385 = 25385; + public static final int NULL_25387 = 25387; + public static final int NULL_25388 = 25388; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java index c8499575cf..e61a017960 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java @@ -88,7 +88,7 @@ public class CrowdsourcingWoodcutting put(AnimationID.WOODCUTTING_INFERNAL, ItemID.INFERNAL_AXE). put(AnimationID.WOODCUTTING_3A_AXE, ItemID._3RD_AGE_AXE). put(AnimationID.WOODCUTTING_CRYSTAL, ItemID.CRYSTAL_AXE). - put(AnimationID.WOODCUTTING_TRAILBLAZER, ItemID.TRAILBLAZER_AXE).build(); + put(AnimationID.WOODCUTTING_TRAILBLAZER, ItemID.INFERNAL_AXE_OR).build(); private static final Set SUCCESS_MESSAGES = new ImmutableSet.Builder(). add("You get some logs."). diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java index 65257adeb8..4715450f79 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java @@ -274,8 +274,8 @@ public class FishingPlugin extends Plugin case ItemID.KARAMBWAN_VESSEL_3159: case ItemID.CORMORANTS_GLOVE: case ItemID.CORMORANTS_GLOVE_22817: + case ItemID.INFERNAL_HARPOON_OR: case ItemID.TRAILBLAZER_HARPOON: - case ItemID.TRAILBLAZER_HARPOON_25114: case ItemID.CRYSTAL_HARPOON: case ItemID.CRYSTAL_HARPOON_23864: case ItemID.CRYSTAL_HARPOON_INACTIVE: diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Pickaxe.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Pickaxe.java index edfd2826ff..c0531ac091 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Pickaxe.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Pickaxe.java @@ -73,7 +73,7 @@ import static net.runelite.api.ItemID.MITHRIL_PICKAXE; import static net.runelite.api.ItemID.RUNE_PICKAXE; import static net.runelite.api.ItemID.STEEL_PICKAXE; import static net.runelite.api.ItemID._3RD_AGE_PICKAXE; -import static net.runelite.api.ItemID.TRAILBLAZER_PICKAXE; +import static net.runelite.api.ItemID.INFERNAL_PICKAXE_OR; import net.runelite.api.Player; @Getter @@ -93,7 +93,7 @@ enum Pickaxe INFERNAL(INFERNAL_PICKAXE, MINING_INFERNAL_PICKAXE, MINING_MOTHERLODE_INFERNAL), THIRDAGE(_3RD_AGE_PICKAXE, MINING_3A_PICKAXE, MINING_MOTHERLODE_3A), CRYSTAL(CRYSTAL_PICKAXE, MINING_CRYSTAL_PICKAXE, MINING_MOTHERLODE_CRYSTAL), - TRAILBLAZER(TRAILBLAZER_PICKAXE, MINING_TRAILBLAZER_PICKAXE, MINING_TRAILBLAZER_PICKAXE_2, + TRAILBLAZER(INFERNAL_PICKAXE_OR, MINING_TRAILBLAZER_PICKAXE, MINING_TRAILBLAZER_PICKAXE_2, MINING_TRAILBLAZER_PICKAXE_3, MINING_MOTHERLODE_TRAILBLAZER); private final int itemId; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java index 306e9dd346..90797e265d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java @@ -52,7 +52,7 @@ import static net.runelite.api.ItemID.IRON_AXE; import static net.runelite.api.ItemID.MITHRIL_AXE; import static net.runelite.api.ItemID.RUNE_AXE; import static net.runelite.api.ItemID.STEEL_AXE; -import static net.runelite.api.ItemID.TRAILBLAZER_AXE; +import static net.runelite.api.ItemID.INFERNAL_AXE_OR; import static net.runelite.api.ItemID._3RD_AGE_AXE; import net.runelite.api.Player; @@ -72,7 +72,7 @@ enum Axe INFERNAL(WOODCUTTING_INFERNAL, INFERNAL_AXE), THIRDAGE(WOODCUTTING_3A_AXE, _3RD_AGE_AXE), CRYSTAL(WOODCUTTING_CRYSTAL, CRYSTAL_AXE), - TRAILBLAZER(WOODCUTTING_TRAILBLAZER, TRAILBLAZER_AXE); + TRAILBLAZER(WOODCUTTING_TRAILBLAZER, INFERNAL_AXE_OR); private final Integer animId; private final Integer itemId; From c1c2403b3dc5bd9ae4b4e63e40e5c5152c72ff5b Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 6 Jan 2021 12:18:00 +0000 Subject: [PATCH 2/4] Update Item variations to 2021-01-06-rev193 --- .../src/main/resources/item_variations.json | 68 ++++++++++++++----- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 80dd7dd319..62877d1869 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -1623,7 +1623,7 @@ 11046, 20587 ], - "flier": [ + "flyer": [ 956, 23670 ], @@ -4838,6 +4838,10 @@ 23595, 25264 ], + "dragon axe": [ + 6739, + 25378 + ], "darklight": [ 6746, 8281 @@ -5878,6 +5882,14 @@ 8315, 8508 ], + "rug": [ + 8317, + 25362 + ], + "opulent rug": [ + 8318, + 25363 + ], "wooden bookcase": [ 8319, 24902 @@ -7470,7 +7482,8 @@ "dragon pickaxe": [ 11920, 12797, - 23677 + 23677, + 25376 ], "malediction ward": [ 11924, @@ -7936,11 +7949,15 @@ ], "infernal axe": [ 13241, - 13242 + 13242, + 25066, + 25371 ], "infernal pickaxe": [ 13243, - 13244 + 13244, + 25063, + 25369 ], "abyssal dagger": [ 13265, @@ -8530,9 +8547,15 @@ 21009, 21206 ], + "dragon harpoon": [ + 21028, + 25373 + ], "infernal harpoon": [ 21031, - 21033 + 21033, + 25059, + 25367 ], "medium storage unit": [ 21038, @@ -9510,7 +9533,7 @@ 25016, 25028 ], - "trailblazer coat": [ + "trailblazer top": [ 25004, 25019, 25031 @@ -9525,17 +9548,13 @@ 25025, 25037 ], - "trailblazer harpoon": [ - 25059, - 25114 + "trailblazer globe": [ + 25093, + 25361 ], - "trailblazer pickaxe": [ - 25063, - 25112 - ], - "trailblazer axe": [ - 25066, - 25110 + "trailblazer rug": [ + 25096, + 25364 ], "extradimensional bag": [ 25106, @@ -9599,5 +9618,22 @@ 25241, 25242, 25243 + ], + "gnome child icon": [ + 25319, + 25338 + ], + "gnome child": [ + 25320, + 25321 + ], + "soul cape": [ + 25344, + 25346 + ], + "trailblazer relic hunter armour set": [ + 25380, + 25383, + 25386 ] } \ No newline at end of file From b584d710c8c1b8bc7899f9cccf9155a63e1238d2 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 6 Jan 2021 12:18:00 +0000 Subject: [PATCH 3/4] Update Object IDs to 2021-01-06-rev193 --- .../java/net/runelite/api/NullObjectID.java | 105 ++++++-- .../main/java/net/runelite/api/ObjectID.java | 253 +++++++++++++++--- 2 files changed, 301 insertions(+), 57 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index c17eb35c8e..1df3543f9f 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -890,6 +890,7 @@ public final class NullObjectID public static final int NULL_1807 = 1807; public static final int NULL_1808 = 1808; public static final int NULL_1809 = 1809; + public static final int NULL_1812 = 1812; public static final int NULL_1815 = 1815; public static final int NULL_1818 = 1818; public static final int NULL_1819 = 1819; @@ -5407,16 +5408,8 @@ public final class NullObjectID public static final int NULL_12383 = 12383; public static final int NULL_12384 = 12384; public static final int NULL_12385 = 12385; - public static final int NULL_12392 = 12392; - public static final int NULL_12393 = 12393; - public static final int NULL_12394 = 12394; - public static final int NULL_12395 = 12395; public static final int NULL_12397 = 12397; public static final int NULL_12398 = 12398; - public static final int NULL_12403 = 12403; - public static final int NULL_12404 = 12404; - public static final int NULL_12405 = 12405; - public static final int NULL_12406 = 12406; public static final int NULL_12416 = 12416; public static final int NULL_12417 = 12417; public static final int NULL_12418 = 12418; @@ -20009,31 +20002,93 @@ public final class NullObjectID public static final int NULL_40890 = 40890; public static final int NULL_40895 = 40895; public static final int NULL_40898 = 40898; - public static final int NULL_40900 = 40900; public static final int NULL_40907 = 40907; public static final int NULL_40908 = 40908; - public static final int NULL_40912 = 40912; - public static final int NULL_40913 = 40913; - public static final int NULL_40914 = 40914; - public static final int NULL_40915 = 40915; - public static final int NULL_40916 = 40916; - public static final int NULL_40917 = 40917; - public static final int NULL_40918 = 40918; - public static final int NULL_40919 = 40919; - public static final int NULL_40920 = 40920; - public static final int NULL_40921 = 40921; - public static final int NULL_40922 = 40922; - public static final int NULL_40923 = 40923; - public static final int NULL_40924 = 40924; public static final int NULL_40925 = 40925; public static final int NULL_40926 = 40926; public static final int NULL_40927 = 40927; public static final int NULL_40928 = 40928; - public static final int NULL_40929 = 40929; - public static final int NULL_40930 = 40930; - public static final int NULL_40931 = 40931; public static final int NULL_40934 = 40934; public static final int NULL_40935 = 40935; public static final int NULL_40936 = 40936; + public static final int NULL_40942 = 40942; + public static final int NULL_40943 = 40943; + public static final int NULL_40944 = 40944; + public static final int NULL_40945 = 40945; + public static final int NULL_40946 = 40946; + public static final int NULL_40947 = 40947; + public static final int NULL_40948 = 40948; + public static final int NULL_40949 = 40949; + public static final int NULL_40950 = 40950; + public static final int NULL_40951 = 40951; + public static final int NULL_40952 = 40952; + public static final int NULL_40953 = 40953; + public static final int NULL_40954 = 40954; + public static final int NULL_40955 = 40955; + public static final int NULL_40956 = 40956; + public static final int NULL_40957 = 40957; + public static final int NULL_40958 = 40958; + public static final int NULL_40959 = 40959; + public static final int NULL_40960 = 40960; + public static final int NULL_40961 = 40961; + public static final int NULL_40962 = 40962; + public static final int NULL_40963 = 40963; + public static final int NULL_40964 = 40964; + public static final int NULL_40965 = 40965; + public static final int NULL_40966 = 40966; + public static final int NULL_40967 = 40967; + public static final int NULL_40968 = 40968; + public static final int NULL_40969 = 40969; + public static final int NULL_40970 = 40970; + public static final int NULL_40971 = 40971; + public static final int NULL_40972 = 40972; + public static final int NULL_40973 = 40973; + public static final int NULL_40974 = 40974; + public static final int NULL_40975 = 40975; + public static final int NULL_40976 = 40976; + public static final int NULL_40977 = 40977; + public static final int NULL_40978 = 40978; + public static final int NULL_40979 = 40979; + public static final int NULL_40980 = 40980; + public static final int NULL_40981 = 40981; + public static final int NULL_40982 = 40982; + public static final int NULL_40983 = 40983; + public static final int NULL_40984 = 40984; + public static final int NULL_40985 = 40985; + public static final int NULL_40987 = 40987; + public static final int NULL_40988 = 40988; + public static final int NULL_40989 = 40989; + public static final int NULL_40990 = 40990; + public static final int NULL_40991 = 40991; + public static final int NULL_40992 = 40992; + public static final int NULL_40993 = 40993; + public static final int NULL_40994 = 40994; + public static final int NULL_40995 = 40995; + public static final int NULL_40996 = 40996; + public static final int NULL_40997 = 40997; + public static final int NULL_40998 = 40998; + public static final int NULL_40999 = 40999; + public static final int NULL_41000 = 41000; + public static final int NULL_41001 = 41001; + public static final int NULL_41002 = 41002; + public static final int NULL_41003 = 41003; + public static final int NULL_41004 = 41004; + public static final int NULL_41005 = 41005; + public static final int NULL_41006 = 41006; + public static final int NULL_41007 = 41007; + public static final int NULL_41008 = 41008; + public static final int NULL_41009 = 41009; + public static final int NULL_41010 = 41010; + public static final int NULL_41011 = 41011; + public static final int NULL_41012 = 41012; + public static final int NULL_41013 = 41013; + public static final int NULL_41014 = 41014; + public static final int NULL_41015 = 41015; + public static final int NULL_41016 = 41016; + public static final int NULL_41018 = 41018; + public static final int NULL_41019 = 41019; + public static final int NULL_41020 = 41020; + public static final int NULL_41021 = 41021; + public static final int NULL_41022 = 41022; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index 63f154fe47..076045bc19 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -928,8 +928,7 @@ public final class ObjectID public static final int DOOR_1805 = 1805; public static final int WEB_1810 = 1810; public static final int SLICED_WEB = 1811; - public static final int PORTAL = 1812; - public static final int STONE_STAND = 1813; + public static final int BANDAGE_TABLE = 1813; public static final int LEVER_1814 = 1814; public static final int LEVER_1816 = 1816; public static final int LEVER_1817 = 1817; @@ -2233,7 +2232,7 @@ public final class ObjectID public static final int SHELF_4062 = 4062; public static final int SINK_4063 = 4063; public static final int SMASHED_TABLE_4064 = 4064; - public static final int STONE_STAND_4065 = 4065; + public static final int STONE_STAND = 4065; public static final int SIGNPOST_4066 = 4066; public static final int WARNING_SIGN = 4067; public static final int BROKEN_WALL = 4068; @@ -2312,7 +2311,7 @@ public final class ObjectID public static final int CAVE_ENTRANCE_4147 = 4147; public static final int DOOR_4148 = 4148; public static final int LALLIS_STEW = 4149; - public static final int PORTAL_4150 = 4150; + public static final int PORTAL = 4150; public static final int PORTAL_4151 = 4151; public static final int PORTAL_4152 = 4152; public static final int PORTAL_4153 = 4153; @@ -6988,11 +6987,19 @@ public final class ObjectID public static final int LADDER_12389 = 12389; public static final int LADDER_12390 = 12390; public static final int LADDER_12391 = 12391; + public static final int SACKS_12392 = 12392; + public static final int SACKS_12393 = 12393; + public static final int SACK_PILE = 12394; + public static final int SACK_PILE_12395 = 12395; public static final int SACK_12396 = 12396; public static final int SACK_12399 = 12399; public static final int CAULDRON_12400 = 12400; public static final int CAULDRON_12401 = 12401; public static final int EXPLOSION = 12402; + public static final int SHELVES_12403 = 12403; + public static final int SHELVES_12404 = 12404; + public static final int CUPBOARD_12405 = 12405; + public static final int CUPBOARD_12406 = 12406; public static final int STOOL_12407 = 12407; public static final int STOOL_12408 = 12408; public static final int STOOL_12409 = 12409; @@ -9024,7 +9031,7 @@ public final class ObjectID public static final int LARGE_DOOR_15758 = 15758; public static final int DOOR_15759 = 15759; public static final int SACK_15760 = 15760; - public static final int SACK_PILE = 15761; + public static final int SACK_PILE_15761 = 15761; public static final int SACKS_15762 = 15762; public static final int BED_15767 = 15767; public static final int CRATE_15768 = 15768; @@ -20674,7 +20681,7 @@ public final class ObjectID public static final int NEUTRAL_BARRIER = 40439; public static final int PORTAL_40440 = 40440; public static final int PORTAL_40441 = 40441; - public static final int BANDAGE_TABLE = 40442; + public static final int BANDAGE_TABLE_40442 = 40442; public static final int BARRICADE_TABLE = 40443; public static final int BARRICADE_TABLE_40444 = 40444; public static final int EXPLOSIVE_POTION_TABLE = 40445; @@ -20851,22 +20858,22 @@ public final class ObjectID public static final int DOOR_40859 = 40859; public static final int DOOR_40860 = 40860; public static final int DOOR_40861 = 40861; - public static final int SACKS_40871 = 40871; - public static final int SACKS_40872 = 40872; - public static final int SACKS_40873 = 40873; - public static final int SACKS_40874 = 40874; - public static final int SACK_PILE_40875 = 40875; - public static final int SACK_PILE_40876 = 40876; - public static final int SACK_PILE_40877 = 40877; - public static final int SACK_PILE_40878 = 40878; - public static final int SHELVES_40879 = 40879; - public static final int SHELVES_40880 = 40880; - public static final int SHELVES_40881 = 40881; - public static final int SHELVES_40882 = 40882; - public static final int CUPBOARD_40883 = 40883; - public static final int CUPBOARD_40884 = 40884; - public static final int CUPBOARD_40885 = 40885; - public static final int CUPBOARD_40886 = 40886; + public static final int ICON_OF_GNOME_CHILD = 40871; + public static final int ALTAR_40872 = 40872; + public static final int ALTAR_40873 = 40873; + public static final int ALTAR_40874 = 40874; + public static final int ALTAR_40875 = 40875; + public static final int ALTAR_40876 = 40876; + public static final int ALTAR_40877 = 40877; + public static final int ALTAR_40878 = 40878; + public static final int DECORATIVE_WINDOW_40879 = 40879; + public static final int STAINEDGLASS_WINDOW_40880 = 40880; + public static final int DECORATIVE_WINDOW_40881 = 40881; + public static final int STAINEDGLASS_WINDOW_40882 = 40882; + public static final int DECORATIVE_WINDOW_40883 = 40883; + public static final int STAINEDGLASS_WINDOW_40884 = 40884; + public static final int DECORATIVE_WINDOW_40885 = 40885; + public static final int STAINEDGLASS_WINDOW_40886 = 40886; public static final int CAVE_ENTRANCE_40887 = 40887; public static final int CAVE_EXIT_40888 = 40888; public static final int CREVICE_40889 = 40889; @@ -20876,19 +20883,201 @@ public final class ObjectID public static final int SLOPE_END = 40894; public static final int PEBBLES = 40896; public static final int BOULDER_40897 = 40897; - public static final int BOULDER_40899 = 40899; - public static final int STICK_40901 = 40901; - public static final int STICK_40902 = 40902; - public static final int CAULDRON_40903 = 40903; - public static final int TREASURE_CHEST_40904 = 40904; + public static final int DECORATIVE_WINDOW_40899 = 40899; + public static final int STAINEDGLASS_WINDOW_40900 = 40900; + public static final int DECORATIVE_WINDOW_40901 = 40901; + public static final int STAINEDGLASS_WINDOW_40902 = 40902; + public static final int DECORATIVE_WINDOW_40903 = 40903; + public static final int STAINEDGLASS_WINDOW_40904 = 40904; public static final int ROCKS_40905 = 40905; public static final int ROCKS_40906 = 40906; - public static final int SOCKING = 40909; - public static final int SOCKING_40910 = 40910; - public static final int SOCKING_40911 = 40911; + public static final int DECORATIVE_WINDOW_40909 = 40909; + public static final int STAINEDGLASS_WINDOW_40910 = 40910; + public static final int DECORATIVE_WINDOW_40911 = 40911; + public static final int STAINEDGLASS_WINDOW_40912 = 40912; + public static final int DECORATIVE_WINDOW_40913 = 40913; + public static final int STAINEDGLASS_WINDOW_40914 = 40914; + public static final int STATUE_40915 = 40915; + public static final int STATUE_40916 = 40916; + public static final int STATUE_40917 = 40917; + public static final int INERT_PORTAL = 40918; + public static final int PORTAL_40919 = 40919; + public static final int ODD_FEATHERS = 40920; + public static final int PORTAL_40921 = 40921; + public static final int BARRIER_40922 = 40922; + public static final int SLEEPING_BAG_40923 = 40923; + public static final int STATUE_40924 = 40924; + public static final int ARCHWAY_40929 = 40929; + public static final int LIGHT_40930 = 40930; + public static final int LIGHT_40931 = 40931; public static final int EVERGREEN_40932 = 40932; public static final int EVERGREEN_40933 = 40933; - public static final int TREE_40937 = 40937; - public static final int TREE_40938 = 40938; + public static final int LIGHT_40937 = 40937; + public static final int LIGHT_40938 = 40938; + public static final int LIGHT_40939 = 40939; + public static final int LIGHT_40940 = 40940; + public static final int FIREWORKS = 40941; + public static final int POST_40986 = 40986; + public static final int PARTY_TABLE = 41017; + public static final int POTION_OF_POWER_TABLE_41023 = 41023; + public static final int PEDESTAL_SPACE = 41024; + public static final int PEDESTAL_SPACE_41025 = 41025; + public static final int PEDESTAL_SPACE_41026 = 41026; + public static final int TROPHY_CASE_SPACE = 41027; + public static final int BANNER_STAND_SPACE = 41028; + public static final int OUTFIT_STAND_SPACE = 41029; + public static final int STATUE_SPACE_41030 = 41030; + public static final int RUG_SPACE_41031 = 41031; + public static final int RUG_SPACE_41032 = 41032; + public static final int RUG_SPACE_41033 = 41033; + public static final int ACCOMPLISHMENT_SCROLL_SPACE = 41034; + public static final int TROPHY_PEDESTAL = 41035; + public static final int TROPHY_PEDESTAL_41036 = 41036; + public static final int TROPHY_PEDESTAL_41037 = 41037; + public static final int TROPHY_PEDESTAL_41038 = 41038; + public static final int TROPHY_PEDESTAL_41039 = 41039; + public static final int TROPHY_PEDESTAL_41040 = 41040; + public static final int TROPHY_PEDESTAL_41041 = 41041; + public static final int TROPHY_PEDESTAL_41042 = 41042; + public static final int TROPHY_PEDESTAL_41043 = 41043; + public static final int TROPHY_PEDESTAL_41044 = 41044; + public static final int TROPHY_PEDESTAL_41045 = 41045; + public static final int TROPHY_PEDESTAL_41046 = 41046; + public static final int TROPHY_PEDESTAL_41047 = 41047; + public static final int TROPHY_PEDESTAL_41048 = 41048; + public static final int TROPHY_PEDESTAL_41049 = 41049; + public static final int ORNATE_TROPHY_PEDESTAL = 41050; + public static final int ORNATE_TROPHY_PEDESTAL_41051 = 41051; + public static final int ORNATE_TROPHY_PEDESTAL_41052 = 41052; + public static final int ORNATE_TROPHY_PEDESTAL_41053 = 41053; + public static final int ORNATE_TROPHY_PEDESTAL_41054 = 41054; + public static final int ORNATE_TROPHY_PEDESTAL_41055 = 41055; + public static final int ORNATE_TROPHY_PEDESTAL_41056 = 41056; + public static final int ORNATE_TROPHY_PEDESTAL_41057 = 41057; + public static final int ORNATE_TROPHY_PEDESTAL_41058 = 41058; + public static final int ORNATE_TROPHY_PEDESTAL_41059 = 41059; + public static final int ORNATE_TROPHY_PEDESTAL_41060 = 41060; + public static final int ORNATE_TROPHY_PEDESTAL_41061 = 41061; + public static final int ORNATE_TROPHY_PEDESTAL_41062 = 41062; + public static final int ORNATE_TROPHY_PEDESTAL_41063 = 41063; + public static final int ORNATE_TROPHY_PEDESTAL_41064 = 41064; + public static final int TROPHY_PEDESTAL_41065 = 41065; + public static final int TROPHY_PEDESTAL_41066 = 41066; + public static final int TROPHY_PEDESTAL_41067 = 41067; + public static final int TROPHY_PEDESTAL_41068 = 41068; + public static final int TROPHY_PEDESTAL_41069 = 41069; + public static final int TROPHY_PEDESTAL_41070 = 41070; + public static final int TROPHY_PEDESTAL_41071 = 41071; + public static final int TROPHY_PEDESTAL_41072 = 41072; + public static final int TROPHY_PEDESTAL_41073 = 41073; + public static final int TROPHY_PEDESTAL_41074 = 41074; + public static final int TROPHY_PEDESTAL_41075 = 41075; + public static final int TROPHY_PEDESTAL_41076 = 41076; + public static final int TROPHY_PEDESTAL_41077 = 41077; + public static final int TROPHY_PEDESTAL_41078 = 41078; + public static final int TROPHY_PEDESTAL_41079 = 41079; + public static final int ORNATE_TROPHY_PEDESTAL_41080 = 41080; + public static final int ORNATE_TROPHY_PEDESTAL_41081 = 41081; + public static final int ORNATE_TROPHY_PEDESTAL_41082 = 41082; + public static final int ORNATE_TROPHY_PEDESTAL_41083 = 41083; + public static final int ORNATE_TROPHY_PEDESTAL_41084 = 41084; + public static final int ORNATE_TROPHY_PEDESTAL_41085 = 41085; + public static final int ORNATE_TROPHY_PEDESTAL_41086 = 41086; + public static final int ORNATE_TROPHY_PEDESTAL_41087 = 41087; + public static final int ORNATE_TROPHY_PEDESTAL_41088 = 41088; + public static final int ORNATE_TROPHY_PEDESTAL_41089 = 41089; + public static final int ORNATE_TROPHY_PEDESTAL_41090 = 41090; + public static final int ORNATE_TROPHY_PEDESTAL_41091 = 41091; + public static final int ORNATE_TROPHY_PEDESTAL_41092 = 41092; + public static final int ORNATE_TROPHY_PEDESTAL_41093 = 41093; + public static final int ORNATE_TROPHY_PEDESTAL_41094 = 41094; + public static final int TROPHY_PEDESTAL_41095 = 41095; + public static final int TROPHY_PEDESTAL_41096 = 41096; + public static final int TROPHY_PEDESTAL_41097 = 41097; + public static final int TROPHY_PEDESTAL_41098 = 41098; + public static final int TROPHY_PEDESTAL_41099 = 41099; + public static final int TROPHY_PEDESTAL_41100 = 41100; + public static final int TROPHY_PEDESTAL_41101 = 41101; + public static final int TROPHY_PEDESTAL_41102 = 41102; + public static final int TROPHY_PEDESTAL_41103 = 41103; + public static final int TROPHY_PEDESTAL_41104 = 41104; + public static final int TROPHY_PEDESTAL_41105 = 41105; + public static final int TROPHY_PEDESTAL_41106 = 41106; + public static final int TROPHY_PEDESTAL_41107 = 41107; + public static final int TROPHY_PEDESTAL_41108 = 41108; + public static final int TROPHY_PEDESTAL_41109 = 41109; + public static final int ORNATE_TROPHY_PEDESTAL_41110 = 41110; + public static final int ORNATE_TROPHY_PEDESTAL_41111 = 41111; + public static final int ORNATE_TROPHY_PEDESTAL_41112 = 41112; + public static final int ORNATE_TROPHY_PEDESTAL_41113 = 41113; + public static final int ORNATE_TROPHY_PEDESTAL_41114 = 41114; + public static final int ORNATE_TROPHY_PEDESTAL_41115 = 41115; + public static final int ORNATE_TROPHY_PEDESTAL_41116 = 41116; + public static final int ORNATE_TROPHY_PEDESTAL_41117 = 41117; + public static final int ORNATE_TROPHY_PEDESTAL_41118 = 41118; + public static final int ORNATE_TROPHY_PEDESTAL_41119 = 41119; + public static final int ORNATE_TROPHY_PEDESTAL_41120 = 41120; + public static final int ORNATE_TROPHY_PEDESTAL_41121 = 41121; + public static final int ORNATE_TROPHY_PEDESTAL_41122 = 41122; + public static final int ORNATE_TROPHY_PEDESTAL_41123 = 41123; + public static final int ORNATE_TROPHY_PEDESTAL_41124 = 41124; + public static final int RUG_41125 = 41125; + public static final int OPULENT_RUG = 41126; + public static final int RUG_41127 = 41127; + public static final int OPULENT_RUG_41128 = 41128; + public static final int RUG_41129 = 41129; + public static final int OPULENT_RUG_41130 = 41130; + public static final int TRAILBLAZER_RUG = 41131; + public static final int TRAILBLAZER_RUG_41132 = 41132; + public static final int TRAILBLAZER_RUG_41133 = 41133; + public static final int TRAILBLAZER_RUG_41134 = 41134; + public static final int TRAILBLAZER_RUG_41135 = 41135; + public static final int TRAILBLAZER_RUG_41136 = 41136; + public static final int TRAILBLAZER_RUG_41137 = 41137; + public static final int TRAILBLAZER_RUG_41138 = 41138; + public static final int TRAILBLAZER_RUG_41139 = 41139; + public static final int TRAILBLAZER_RUG_41140 = 41140; + public static final int TRAILBLAZER_RUG_41141 = 41141; + public static final int TRAILBLAZER_RUG_41142 = 41142; + public static final int TRAILBLAZER_RUG_41143 = 41143; + public static final int TRAILBLAZER_RUG_41144 = 41144; + public static final int TRAILBLAZER_RUG_41145 = 41145; + public static final int TRAILBLAZER_RUG_41146 = 41146; + public static final int TRAILBLAZER_RUG_41147 = 41147; + public static final int TRAILBLAZER_RUG_41148 = 41148; + public static final int TRAILBLAZER_RUG_41149 = 41149; + public static final int TRAILBLAZER_RUG_41150 = 41150; + public static final int TRAILBLAZER_RUG_41151 = 41151; + public static final int TRAILBLAZER_RUG_41152 = 41152; + public static final int TRAILBLAZER_RUG_41153 = 41153; + public static final int TRAILBLAZER_RUG_41154 = 41154; + public static final int OAK_TROPHY_CASE = 41155; + public static final int OAK_TROPHY_CASE_41156 = 41156; + public static final int MAHOGANY_TROPHY_CASE = 41157; + public static final int MAHOGANY_TROPHY_CASE_41158 = 41158; + public static final int BANNER_STAND = 41159; + public static final int BANNER_STAND_41160 = 41160; + public static final int BANNER_STAND_41161 = 41161; + public static final int ORNATE_BANNER_STAND = 41162; + public static final int ORNATE_BANNER_STAND_41163 = 41163; + public static final int ORNATE_BANNER_STAND_41164 = 41164; + public static final int OAK_OUTFIT_STAND = 41165; + public static final int OAK_OUTFIT_STAND_41166 = 41166; + public static final int OAK_OUTFIT_STAND_41167 = 41167; + public static final int OAK_OUTFIT_STAND_41168 = 41168; + public static final int OAK_OUTFIT_STAND_41169 = 41169; + public static final int OAK_OUTFIT_STAND_41170 = 41170; + public static final int OAK_OUTFIT_STAND_41171 = 41171; + public static final int MAHOGANY_OUTFIT_STAND = 41172; + public static final int MAHOGANY_OUTFIT_STAND_41173 = 41173; + public static final int MAHOGANY_OUTFIT_STAND_41174 = 41174; + public static final int MAHOGANY_OUTFIT_STAND_41175 = 41175; + public static final int MAHOGANY_OUTFIT_STAND_41176 = 41176; + public static final int MAHOGANY_OUTFIT_STAND_41177 = 41177; + public static final int MAHOGANY_OUTFIT_STAND_41178 = 41178; + public static final int LEAGUE_STATUE = 41179; + public static final int ORNATE_LEAGUE_STATUE = 41180; + public static final int TRAILBLAZER_GLOBE = 41181; + public static final int LEAGUE_ACCOMPLISHMENT_SCROLL = 41182; /* This file is automatically generated. Do not edit. */ } From ff8c1e4c7fc74c636eb73f1f4d38bbb40b8feaca Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 6 Jan 2021 12:18:01 +0000 Subject: [PATCH 4/4] Update NPC IDs to 2021-01-06-rev193 --- .../src/main/java/net/runelite/api/NpcID.java | 43 ++++++++++++++----- .../main/java/net/runelite/api/NullNpcID.java | 7 +-- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index cb028faaad..15460768d9 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -2657,9 +2657,7 @@ public final class NpcID public static final int DRYAD = 2828; public static final int FAIRY_2829 = 2829; public static final int MYSTERIOUS_OLD_MAN = 2830; - public static final int LIZARD_MAN = 2831; - public static final int ORC = 2832; - public static final int TROLL_2833 = 2833; + public static final int LIL_CREATOR = 2833; public static final int GIANT_BAT = 2834; public static final int CAMEL = 2835; public static final int GOLEM = 2836; @@ -3340,9 +3338,9 @@ public final class NpcID public static final int VERONICA = 3561; public static final int PROFESSOR_ODDENSTEIN = 3562; public static final int ERNEST = 3563; - public static final int CHICKEN_3564 = 3564; + public static final int LIL_DESTRUCTOR = 3564; public static final int SKELETON_3565 = 3565; - public static final int WITCH_3566 = 3566; + public static final int LIL_CREATOR_3566 = 3566; public static final int PENTYN = 3568; public static final int ARISTARCHUS = 3569; public static final int BONEGUARD = 3570; @@ -4683,7 +4681,7 @@ public final class NpcID public static final int ELEMENTAL_BALANCE_5004 = 5004; public static final int WIZARD_GRAYZAG = 5006; public static final int IMP_5007 = 5007; - public static final int IMP_5008 = 5008; + public static final int LIL_DESTRUCTOR_5008 = 5008; public static final int ELEMENTAL_BALANCE_5009 = 5009; public static final int ELEMENTAL_BALANCE_5010 = 5010; public static final int ELEMENTAL_BALANCE_5011 = 5011; @@ -8921,13 +8919,38 @@ public final class NpcID public static final int FORGOTTEN_SOUL_10545 = 10545; public static final int DUCK_10546 = 10546; public static final int DUCK_10547 = 10547; - public static final int SCRUBFOOT = 10558; - public static final int SCRUBFOOT_10559 = 10559; + public static final int CHICKEN_10556 = 10556; + public static final int GNOME_CHILD_10557 = 10557; + public static final int GNOME_CHILD_10558 = 10558; + public static final int SCRUBFOOT = 10559; + public static final int GNOME_CHILD_10560 = 10560; public static final int RED_FIREFLIES = 10561; - public static final int RED_FIREFLIES_10562 = 10562; + public static final int GNOME_CHILD_10562 = 10562; + public static final int THRANDER = 10563; public static final int GREEN_FIREFLIES = 10564; - public static final int GREEN_FIREFLIES_10565 = 10565; + public static final int CHUCK_10565 = 10565; public static final int GOBLIN_10566 = 10566; public static final int GOBLIN_10567 = 10567; + public static final int PIOUS_PETE = 10568; + public static final int MYSTERIOUS_WATCHER = 10569; + public static final int MYSTERIOUS_WATCHER_10570 = 10570; + public static final int MYSTERIOUS_WATCHER_10571 = 10571; + public static final int BIG_MO = 10572; + public static final int CHEERLEADER_10573 = 10573; + public static final int CHEERLEADER_10574 = 10574; + public static final int CHEERLEADER_10575 = 10575; + public static final int BLACK_DRAGON_10576 = 10576; + public static final int RED_DRAGON_10577 = 10577; + public static final int BLUE_DRAGON_10578 = 10578; + public static final int KING_BLACK_DRAGON_10579 = 10579; + public static final int BABY_BLUE_DRAGON_10580 = 10580; + public static final int LESSER_DEMON_10581 = 10581; + public static final int GREATER_DEMON_10582 = 10582; + public static final int BLACK_DEMON_10583 = 10583; + public static final int SCORPION_10584 = 10584; + public static final int KING_SCORPION_10585 = 10585; + public static final int ORC = 10586; + public static final int LIZARD_MAN = 10587; + public static final int TROLL_10588 = 10588; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java index ebc7194221..622f0fc904 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -173,6 +173,8 @@ public final class NullNpcID public static final int NULL_2779 = 2779; public static final int NULL_2780 = 2780; public static final int NULL_2781 = 2781; + public static final int NULL_2831 = 2831; + public static final int NULL_2832 = 2832; public static final int NULL_2934 = 2934; public static final int NULL_2935 = 2935; public static final int NULL_2936 = 2936; @@ -421,7 +423,6 @@ public final class NullNpcID public static final int NULL_6140 = 6140; public static final int NULL_6141 = 6141; public static final int NULL_6142 = 6142; - public static final int NULL_6143 = 6143; public static final int NULL_6144 = 6144; public static final int NULL_6145 = 6145; public static final int NULL_6146 = 6146; @@ -1618,9 +1619,5 @@ public final class NullNpcID public static final int NULL_10553 = 10553; public static final int NULL_10554 = 10554; public static final int NULL_10555 = 10555; - public static final int NULL_10556 = 10556; - public static final int NULL_10557 = 10557; - public static final int NULL_10560 = 10560; - public static final int NULL_10563 = 10563; /* This file is automatically generated. Do not edit. */ }