From 2ceb43ec4f2a7c1000cfe949c79698757ee50c22 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sat, 20 Jul 2019 14:29:21 -0700 Subject: [PATCH 01/30] timersplugin: Escape periods in teleblock patterns --- .../net/runelite/client/plugins/timers/TimersPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 9b6b879dd9..f3cdbb197f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -105,9 +105,9 @@ public class TimersPlugin extends Plugin private static final String SUPER_ANTIFIRE_EXPIRED_MESSAGE = "Your super antifire potion has expired."; private static final String SUPER_ANTIVENOM_DRINK_MESSAGE = "You drink some of your super antivenom potion"; - private static final Pattern DEADMAN_HALF_TELEBLOCK_PATTERN = Pattern.compile("A Tele Block spell has been cast on you by (.+). It will expire in 1 minute, 15 seconds."); - private static final Pattern FULL_TELEBLOCK_PATTERN = Pattern.compile("A Tele Block spell has been cast on you by (.+). It will expire in 5 minutes, 0 seconds."); - private static final Pattern HALF_TELEBLOCK_PATTERN = Pattern.compile("A Tele Block spell has been cast on you by (.+). It will expire in 2 minutes, 30 seconds."); + private static final Pattern DEADMAN_HALF_TELEBLOCK_PATTERN = Pattern.compile("A Tele Block spell has been cast on you by (.+)\\. It will expire in 1 minute, 15 seconds\\."); + private static final Pattern FULL_TELEBLOCK_PATTERN = Pattern.compile("A Tele Block spell has been cast on you by (.+)\\. It will expire in 5 minutes, 0 seconds\\."); + private static final Pattern HALF_TELEBLOCK_PATTERN = Pattern.compile("A Tele Block spell has been cast on you by (.+)\\. It will expire in 2 minutes, 30 seconds\\."); private TimerTimer freezeTimer; private int freezeTime = -1; // time frozen, in game ticks From 7a222bbb6f214096a51a42da694111dd86fc0549 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sun, 21 Jul 2019 13:01:46 -0600 Subject: [PATCH 02/30] runelite-api Remove WidgetPositioned It is nearly guaranteed that this event runs every game tick, because there are cs2s that touch widgets every frame. Additionally it should have been run at the end of every client tick, but DeferredEventBus doesn't support that. --- .../runelite/api/events/WidgetPositioned.java | 36 ------------------- .../ChatboxPerformancePlugin.java | 4 +-- .../InterfaceStylesPlugin.java | 4 +-- 3 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java diff --git a/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java b/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java deleted file mode 100644 index d5479e3485..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api.events; - -import lombok.Value; - -/** - * An event where the position of a {@link net.runelite.api.widgets.Widget} - * relative to its parent has changed. - */ -@Value -public class WidgetPositioned -{ -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java index aaf6634ead..b03b75fe54 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java @@ -26,8 +26,8 @@ package net.runelite.client.plugins.chatboxperformance; import javax.inject.Inject; import net.runelite.api.Client; +import net.runelite.api.events.ClientTick; import net.runelite.api.widgets.WidgetType; -import net.runelite.api.events.WidgetPositioned; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetPositionMode; @@ -46,7 +46,7 @@ public class ChatboxPerformancePlugin extends Plugin private Client client; @Subscribe - public void onWidgetPositioned(WidgetPositioned event) + public void onClientTick(ClientTick event) { if (!areWidgetsFixed()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java index c635eb9bd5..839fff4083 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java @@ -36,10 +36,10 @@ import net.runelite.api.HealthBar; import net.runelite.api.SpriteID; import net.runelite.api.SpritePixels; import net.runelite.api.events.BeforeMenuRender; +import net.runelite.api.events.ClientTick; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.PostHealthBar; -import net.runelite.api.events.WidgetPositioned; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; @@ -107,7 +107,7 @@ public class InterfaceStylesPlugin extends Plugin } @Subscribe - public void onWidgetPositioned(WidgetPositioned widgetPositioned) + public void onClientTick(ClientTick event) { adjustWidgetDimensions(); } From 64460ccd7e6180b70cca3b22db2c5d5c0d8f7edc Mon Sep 17 00:00:00 2001 From: Max Weber Date: Fri, 5 Apr 2019 06:24:49 -0600 Subject: [PATCH 03/30] runelite-client: Don't write all images to disk when loading them --- .../src/main/java/net/runelite/client/util/ImageUtil.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java b/runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java index d7f579b722..47df1a4349 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java @@ -52,6 +52,11 @@ import net.runelite.api.SpritePixels; @Slf4j public class ImageUtil { + static + { + ImageIO.setUseCache(false); + } + /** * Creates a {@link BufferedImage} from an {@link Image}. * From bacc5ae6d06d2b34485e0332bed760f8af011b37 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sun, 21 Jul 2019 19:41:27 -0600 Subject: [PATCH 04/30] ChatboxPerformancePlugin: Hook the cs2 to know when to rebuild --- .../ChatboxPerformancePlugin.java | 54 +-- .../scripts/ToplevelChatboxBackground.hash | 1 + .../scripts/ToplevelChatboxBackground.rs2asm | 426 ++++++++++++++++++ 3 files changed, 455 insertions(+), 26 deletions(-) create mode 100644 runelite-client/src/main/scripts/ToplevelChatboxBackground.hash create mode 100644 runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java index b03b75fe54..a548bb44ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java @@ -26,12 +26,15 @@ package net.runelite.client.plugins.chatboxperformance; import javax.inject.Inject; import net.runelite.api.Client; -import net.runelite.api.events.ClientTick; +import net.runelite.api.GameState; +import net.runelite.api.ScriptID; +import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.widgets.WidgetType; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetPositionMode; import net.runelite.api.widgets.WidgetSizeMode; +import net.runelite.client.callback.ClientThread; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -45,36 +48,35 @@ public class ChatboxPerformancePlugin extends Plugin @Inject private Client client; + @Inject + private ClientThread clientThread; + + @Override + public void startUp() + { + if (client.getGameState() == GameState.LOGGED_IN) + { + clientThread.invokeLater(() -> client.runScript(ScriptID.RESET_CHATBOX_INPUT)); + } + } + + @Override + public void shutDown() + { + if (client.getGameState() == GameState.LOGGED_IN) + { + clientThread.invokeLater(() -> client.runScript(ScriptID.RESET_CHATBOX_INPUT)); + } + } + @Subscribe - public void onClientTick(ClientTick event) + private void onScriptCallbackEvent(ScriptCallbackEvent ev) { - if (!areWidgetsFixed()) + if (!"chatboxBackgroundBuilt".equals(ev.getEventName())) { - fixChatbox(); - } - } - - private boolean areWidgetsFixed() - { - Widget widget = client.getWidget(WidgetInfo.CHATBOX_TRANSPARENT_BACKGROUND); - if (widget == null) - { - return true; + return; } - Widget[] widgets = widget.getChildren(); - - if (widgets != null && widgets.length > 0) - { - Widget last = widgets[widgets.length - 1]; - return last != null && last.getOpacity() < 254; - } - - return false; - } - - private void fixChatbox() - { fixDarkBackground(); fixWhiteLines(true); fixWhiteLines(false); diff --git a/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash b/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash new file mode 100644 index 0000000000..96871403a0 --- /dev/null +++ b/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash @@ -0,0 +1 @@ +975C2E20F49CD83A72B6A7BA4CF34F9B476F26DCD2649B0CE79B3F93CBB892DD \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm b/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm new file mode 100644 index 0000000000..3504991537 --- /dev/null +++ b/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm @@ -0,0 +1,426 @@ +.id 923 +.int_stack_count 0 +.string_stack_count 0 +.int_var_count 5 +.string_var_count 0 +; callback "chatboxBackgroundBuilt" +; used by the ChatboxPerformancePlugin to know when it needs to rebuild. +; Unmark the plugin as hidden and toggle it. The chatbox should change opacity +; slightly + iconst 10616834 + cc_deleteall + iconst 0 + istore 0 + get_varc_int 41 + iconst 1337 + if_icmpeq LABEL8 + jump LABEL24 +LABEL8: + invoke 922 + iconst 1 + if_icmpeq LABEL12 + jump LABEL15 +LABEL12: + iconst 1 + istore 0 + jump LABEL24 +LABEL15: + getwindowmode + iconst 1 + if_icmpeq LABEL19 + jump LABEL24 +LABEL19: + iconst 0 + set_varc_int 41 + iconst 0 + iconst 0 + invoke 183 +LABEL24: + iload 0 + iconst 10616869 + if_sethide + get_varbit 6374 + iconst 1 + if_icmpeq LABEL31 + jump LABEL48 +LABEL31: + getwindowmode + iconst 1 + if_icmpne LABEL35 + jump LABEL48 +LABEL35: + iconst 1 + iconst 0 + iconst 2 + iconst 0 + iconst 10616890 + if_setposition + iconst -1 + iconst 0 + iconst 0 + iconst 0 + iconst 10617391 + if_setposition + jump LABEL60 +LABEL48: + iconst 0 + iconst 0 + iconst 0 + iconst 0 + iconst 10616890 + if_setposition + iconst 0 + iconst 0 + iconst 2 + iconst 0 + iconst 10617391 + if_setposition +LABEL60: + iconst 10616870 + cc_deleteall + iconst 10616888 + cc_deleteall + iconst 0 + istore 1 + clientclock + get_varc_int 223 + if_icmplt LABEL70 + jump LABEL82 +LABEL70: + invoke 900 + iconst 1129 + if_icmpne LABEL74 + jump LABEL82 +LABEL74: + iconst 1 + istore 1 + iconst 2155 + get_varc_int 223 + sconst "i" + iconst 10616870 + if_setontimer + jump LABEL86 +LABEL82: + iconst -1 + sconst "" + iconst 10616870 + if_setontimer +LABEL86: + invoke 921 + iconst 0 + if_icmpeq LABEL90 + jump LABEL156 +LABEL90: + iconst 1 + iconst 10616870 + if_setnoclickthrough + iload 1 + iconst 0 + if_icmpeq LABEL97 + jump LABEL135 +LABEL97: + iconst 10616870 + iconst 5 + iconst 0 + cc_create + iconst 0 + iconst 0 + iconst 1 + iconst 1 + cc_setsize + iconst 0 + iconst 0 + iconst 1 + iconst 1 + cc_setposition + iconst 1017 + cc_setgraphic + iconst 0 + cc_settiling + iconst 0 + cc_settrans + iconst 10616888 + iconst 3 + iconst 0 + cc_create + iconst 0 + iconst 1 + iconst 1 + iconst 0 + cc_setsize + iconst 0 + iconst 15 + iconst 1 + iconst 2 + cc_setposition + iconst 8418912 + cc_setcolour + iconst 1 + cc_setfill +LABEL135: + iconst 10617391 + iconst 792 + iconst 789 + iconst 790 + iconst 791 + iconst 773 + iconst 788 + iconst 0 + invoke 838 + invoke 2373 + iconst 1 + if_icmpeq LABEL148 + jump LABEL152 +LABEL148: + iconst 255 + iconst 10616835 + if_settrans + jump LABEL155 +LABEL152: + iconst 0 + iconst 10616835 + if_settrans +LABEL155: + return +LABEL156: + iconst 16384 + iconst 25 + div + istore 2 + iconst 16384 + istore 3 + get_varbit 2570 + iconst 1 + if_icmpeq LABEL166 + jump LABEL170 +LABEL166: + iconst 1 + iconst 10616870 + if_setnoclickthrough + jump LABEL176 +LABEL170: + iconst 0 + iconst 10616870 + if_setnoclickthrough + iconst 1 + iconst 10616870 + 2006 +LABEL176: + iconst 0 + istore 4 + iload 1 + iconst 0 + if_icmpeq LABEL182 + jump LABEL332 +LABEL182: + invoke 1972 + iconst 0 + if_icmpeq LABEL186 + jump LABEL266 +LABEL186: + iload 4 + iconst 20 + if_icmplt LABEL190 + jump LABEL265 +LABEL190: + iconst 10616870 + iconst 3 + iload 4 + cc_create + iconst 0 + iload 3 + iconst 1 + iconst 2 + cc_setsize + iconst 0 + iconst 0 + iconst 1 + iconst 2 + cc_setposition + iconst 0 + cc_setcolour + iconst 1 + cc_setfill + iconst 254 + cc_settrans + iconst 10616888 + iconst 3 + iload 4 + iconst 2 + multiply + cc_create + iconst 10616888 + iconst 3 + iload 4 + iconst 2 + multiply + iconst 1 + add + cc_create 1 + iload 3 + iconst 1 + iconst 2 + iconst 0 + cc_setsize + iload 3 + iconst 1 + iconst 2 + iconst 0 + cc_setsize 1 + iconst 0 + iconst 0 + iconst 0 + iconst 0 + cc_setposition + iconst 0 + iconst 15 + iconst 0 + iconst 2 + cc_setposition 1 + iconst 16777215 + cc_setcolour + iconst 16777215 + cc_setcolour 1 + iconst 1 + cc_setfill + iconst 1 + cc_setfill 1 + iconst 251 + cc_settrans + iconst 250 + cc_settrans 1 + iload 4 + iconst 1 + add + iload 3 + iload 2 + sub + istore 3 + istore 4 + jump LABEL186 +LABEL265: + sconst "chatboxBackgroundBuilt" + runelite_callback + jump LABEL332 +LABEL266: + iconst 10616870 + iconst 3 + iload 4 + cc_create + iconst 0 + iload 3 + iconst 1 + iconst 2 + cc_setsize + iconst 0 + iconst 0 + iconst 1 + iconst 2 + cc_setposition + iconst 0 + cc_setcolour + iconst 1 + cc_setfill + iconst 225 + cc_settrans + iconst 10616888 + iconst 3 + iload 4 + iconst 2 + multiply + cc_create + iconst 10616888 + iconst 3 + iload 4 + iconst 2 + multiply + iconst 1 + add + cc_create 1 + iload 3 + iconst 1 + iconst 2 + iconst 0 + cc_setsize + iload 3 + iconst 1 + iconst 2 + iconst 0 + cc_setsize 1 + iconst 0 + iconst 0 + iconst 0 + iconst 0 + cc_setposition + iconst 0 + iconst 15 + iconst 0 + iconst 2 + cc_setposition 1 + iconst 16777215 + cc_setcolour + iconst 16777215 + cc_setcolour 1 + iconst 1 + cc_setfill + iconst 1 + cc_setfill 1 + iconst 200 + cc_settrans + iconst 130 + cc_settrans 1 +LABEL332: + iconst 10617391 + iconst 1190 + iconst 1187 + iconst 1188 + iconst 1189 + iconst 1185 + iconst 1186 + iconst 1 + invoke 838 + iload 0 + iconst 1 + if_icmpeq LABEL345 + jump LABEL349 +LABEL345: + iconst 255 + iconst 10616835 + if_settrans + jump LABEL380 +LABEL349: + invoke 1972 + iconst 0 + if_icmpeq LABEL353 + jump LABEL357 +LABEL353: + iconst 155 + iconst 10616835 + if_settrans + jump LABEL380 +LABEL357: + iconst 255 + iconst 10616835 + if_settrans + iconst 10616834 + iconst 3 + iconst 0 + cc_create + iconst 0 + iconst 0 + iconst 1 + iconst 1 + cc_setsize + iconst 0 + iconst 0 + iconst 1 + iconst 1 + cc_setposition + iconst 0 + cc_setcolour + iconst 1 + cc_setfill + iconst 225 + cc_settrans +LABEL380: + return From eccbc7f34e774d5a2fccb254ada53b7637b3e247 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sun, 21 Jul 2019 19:42:27 -0600 Subject: [PATCH 05/30] BankTags: Call scripts with all of their arguments explicitly --- .../net/runelite/client/plugins/banktags/tabs/BankSearch.java | 2 +- .../net/runelite/client/plugins/banktags/tabs/TabInterface.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/BankSearch.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/BankSearch.java index 4aed474dae..73bfbc99a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/BankSearch.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/BankSearch.java @@ -85,7 +85,7 @@ public class BankSearch // selecting/changing tab if (closeInput) { - client.runScript(ScriptID.RESET_CHATBOX_INPUT); + client.runScript(ScriptID.RESET_CHATBOX_INPUT, 0, 0); } client.setVar(VarClientInt.INPUT_TYPE, inputType.getType()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index 416dfdc824..ef4c7e027b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -333,7 +333,7 @@ public class TabInterface { bankSearch.reset(true); - clientThread.invokeLater(() -> client.runScript(ScriptID.RESET_CHATBOX_INPUT)); + clientThread.invokeLater(() -> client.runScript(ScriptID.RESET_CHATBOX_INPUT, 0, 0)); } else { From a57954a893d58cf69607d9205b104c2762a0faa2 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 16 Jul 2019 22:19:34 -0700 Subject: [PATCH 06/30] npcindicators: Use "Un-tag" menu option for tagged NPCs Closes runelite/runelite#1177 --- .../client/plugins/npchighlight/NpcIndicatorsPlugin.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java index 5bb9eb357d..7ab9287cbb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java @@ -83,6 +83,7 @@ public class NpcIndicatorsPlugin extends Plugin // Option added to NPC menu private static final String TAG = "Tag"; + private static final String UNTAG = "Un-tag"; private static final Set NPC_MENU_ACTIONS = ImmutableSet.of(MenuAction.NPC_FIRST_OPTION, MenuAction.NPC_SECOND_OPTION, MenuAction.NPC_THIRD_OPTION, MenuAction.NPC_FOURTH_OPTION, MenuAction.NPC_FIFTH_OPTION); @@ -273,7 +274,7 @@ public class NpcIndicatorsPlugin extends Plugin MenuEntry[] menuEntries = client.getMenuEntries(); menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1); final MenuEntry tagEntry = menuEntries[menuEntries.length - 1] = new MenuEntry(); - tagEntry.setOption(TAG); + tagEntry.setOption(highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == event.getIdentifier()) ? UNTAG : TAG); tagEntry.setTarget(event.getTarget()); tagEntry.setParam0(event.getActionParam0()); tagEntry.setParam1(event.getActionParam1()); @@ -286,7 +287,8 @@ public class NpcIndicatorsPlugin extends Plugin @Subscribe public void onMenuOptionClicked(MenuOptionClicked click) { - if (click.getMenuAction() != MenuAction.RUNELITE || !click.getMenuOption().equals(TAG)) + if (click.getMenuAction() != MenuAction.RUNELITE || + !(click.getMenuOption().equals(TAG) || click.getMenuOption().equals(UNTAG))) { return; } From de449113b5fddc1a6c8d7135599db0a0c316054c Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Fri, 19 Jul 2019 20:27:14 -0700 Subject: [PATCH 07/30] objectindicators: Use "Unmark" menu option for marked objects --- .../plugins/objectindicators/ObjectIndicatorsPlugin.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java index 28a1ca85b1..e305c76ff3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java @@ -78,6 +78,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener { private static final String CONFIG_GROUP = "objectindicators"; private static final String MARK = "Mark object"; + private static final String UNMARK = "Unmark object"; private final Gson GSON = new Gson(); @Getter(AccessLevel.PACKAGE) @@ -216,10 +217,12 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener return; } + final Tile tile = client.getScene().getTiles()[client.getPlane()][event.getActionParam0()][event.getActionParam1()]; + MenuEntry[] menuEntries = client.getMenuEntries(); menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1); MenuEntry menuEntry = menuEntries[menuEntries.length - 1] = new MenuEntry(); - menuEntry.setOption(MARK); + menuEntry.setOption(objects.contains(findTileObject(tile, event.getIdentifier())) ? UNMARK : MARK); menuEntry.setTarget(event.getTarget()); menuEntry.setParam0(event.getActionParam0()); menuEntry.setParam1(event.getActionParam1()); @@ -231,7 +234,8 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (event.getMenuAction() != MenuAction.RUNELITE || !event.getMenuOption().equals(MARK)) + if (event.getMenuAction() != MenuAction.RUNELITE + || !(event.getMenuOption().equals(MARK) || event.getMenuOption().equals(UNMARK))) { return; } From 6563ddaffe1cbaf4bb5a3f9f89c2d6bf8dc8dad7 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Fri, 19 Jul 2019 20:45:59 -0700 Subject: [PATCH 08/30] groundmarkers: Use "Unmark" menu option for marked tiles --- .../plugins/groundmarkers/GroundMarkerPlugin.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java index ce82d9fd7f..d9b1a1cac5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java @@ -68,6 +68,7 @@ public class GroundMarkerPlugin extends Plugin { private static final String CONFIG_GROUP = "groundMarker"; private static final String MARK = "Mark tile"; + private static final String UNMARK = "Unmark tile"; private static final String WALK_HERE = "Walk here"; private static final String REGION_PREFIX = "region_"; @@ -213,7 +214,11 @@ public class GroundMarkerPlugin extends Plugin MenuEntry menuEntry = menuEntries[menuEntries.length - 1] = new MenuEntry(); - menuEntry.setOption(MARK); + final WorldPoint worldPoint = WorldPoint.fromLocalInstance(client, client.getSelectedSceneTile().getLocalLocation()); + final int regionId = worldPoint.getRegionID(); + final GroundMarkerPoint point = new GroundMarkerPoint(regionId, worldPoint.getRegionX(), worldPoint.getRegionY(), client.getPlane(), config.markerColor()); + + menuEntry.setOption(getPoints(regionId).contains(point) ? UNMARK : MARK); menuEntry.setTarget(event.getTarget()); menuEntry.setType(MenuAction.RUNELITE.getId()); @@ -224,7 +229,8 @@ public class GroundMarkerPlugin extends Plugin @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (event.getMenuAction().getId() != MenuAction.RUNELITE.getId() || !event.getMenuOption().equals(MARK)) + if (event.getMenuAction().getId() != MenuAction.RUNELITE.getId() || + !(event.getMenuOption().equals(MARK) || event.getMenuOption().equals(UNMARK))) { return; } From 56d8fb313db409338b0c715e2caa49233632aad5 Mon Sep 17 00:00:00 2001 From: Ron Young Date: Fri, 29 Mar 2019 23:22:30 -0500 Subject: [PATCH 09/30] api: import itemCount --- runelite-api/src/main/java/net/runelite/api/Client.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index 95d51c74f9..af40cd1625 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -1644,4 +1644,9 @@ public interface Client extends GameEngine void draw2010Menu(); void resetHealthBarCaches(); + + /** + * Returns the max item index + 1 from cache + */ + int getItemCount(); } From 4aa0cb14b79c841c151fd421f13551c3904fa325 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 23 Jul 2019 17:22:19 -0400 Subject: [PATCH 10/30] api: mark getItemDefinition as nonnull --- runelite-api/src/main/java/net/runelite/api/Client.java | 2 ++ .../src/main/java/net/runelite/client/game/ItemManager.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index af40cd1625..95cf40931a 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.util.EnumSet; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import net.runelite.api.annotations.VisibleForDevtools; import net.runelite.api.coords.LocalPoint; @@ -346,6 +347,7 @@ public interface Client extends GameEngine * @return the corresponding item composition * @see ItemID */ + @Nonnull ItemComposition getItemDefinition(int id); /** diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java index a257dccba1..e758d66969 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java @@ -38,6 +38,7 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; @@ -363,6 +364,7 @@ public class ItemManager * @param itemId item id * @return item composition */ + @Nonnull public ItemComposition getItemComposition(int itemId) { assert client.isClientThread() : "getItemComposition must be called on client thread"; From bcbbb3182de6c69165fc3f5e3192af789755317f Mon Sep 17 00:00:00 2001 From: Ron Young Date: Fri, 29 Mar 2019 23:29:37 -0500 Subject: [PATCH 11/30] chatbox: add ChatboxItemSearch --- .../game/chatbox/ChatboxItemSearch.java | 314 ++++++++++++++++++ .../client/game/chatbox/ChatboxTextInput.java | 2 +- 2 files changed, 315 insertions(+), 1 deletion(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java new file mode 100644 index 0000000000..0ff26af690 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java @@ -0,0 +1,314 @@ +/* + * Copyright (c) 2019, Ron Young + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package net.runelite.client.game.chatbox; + +import com.google.common.primitives.Ints; +import com.google.inject.Inject; +import java.awt.event.KeyEvent; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.function.Consumer; +import javax.inject.Singleton; +import lombok.Getter; +import net.runelite.api.Client; +import net.runelite.api.ItemComposition; +import net.runelite.api.widgets.ItemQuantityMode; +import net.runelite.api.widgets.JavaScriptCallback; +import net.runelite.api.widgets.Widget; +import net.runelite.api.widgets.WidgetPositionMode; +import net.runelite.api.widgets.WidgetSizeMode; +import net.runelite.api.widgets.WidgetTextAlignment; +import net.runelite.api.widgets.WidgetType; +import net.runelite.client.callback.ClientThread; +import net.runelite.client.game.ItemManager; + +@Singleton +public class ChatboxItemSearch extends ChatboxTextInput +{ + private static final int ICON_HEIGHT = 32; + private static final int ICON_WIDTH = 36; + private static final int PADDING = 6; + private static final int MAX_RESULTS = 24; + private static final int FONT_SIZE = 16; + private static final int HOVERED_OPACITY = 128; + + private final ChatboxPanelManager chatboxPanelManager; + private final ItemManager itemManager; + private final Client client; + + private Map results = new LinkedHashMap<>(); + private String tooltipText; + private int index = -1; + + @Getter + private Consumer onItemSelected; + + @Inject + private ChatboxItemSearch(ChatboxPanelManager chatboxPanelManager, ClientThread clientThread, + ItemManager itemManager, Client client) + { + super(chatboxPanelManager, clientThread); + this.chatboxPanelManager = chatboxPanelManager; + this.itemManager = itemManager; + this.client = client; + + lines(1); + prompt("Item Search"); + onChanged(searchString -> + clientThread.invokeLater(() -> + { + filterResults(); + update(); + })); + } + + @Override + protected void update() + { + Widget container = chatboxPanelManager.getContainerWidget(); + container.deleteAllChildren(); + + Widget promptWidget = container.createChild(-1, WidgetType.TEXT); + promptWidget.setText(getPrompt()); + promptWidget.setTextColor(0x800000); + promptWidget.setFontId(getFontID()); + promptWidget.setOriginalX(0); + promptWidget.setOriginalY(5); + promptWidget.setXPositionMode(WidgetPositionMode.ABSOLUTE_CENTER); + promptWidget.setYPositionMode(WidgetPositionMode.ABSOLUTE_TOP); + promptWidget.setOriginalHeight(FONT_SIZE); + promptWidget.setXTextAlignment(WidgetTextAlignment.CENTER); + promptWidget.setYTextAlignment(WidgetTextAlignment.CENTER); + promptWidget.setWidthMode(WidgetSizeMode.MINUS); + promptWidget.revalidate(); + + buildEdit(0, 5 + FONT_SIZE, container.getWidth(), FONT_SIZE); + + Widget separator = container.createChild(-1, WidgetType.LINE); + separator.setOriginalX(0); + separator.setOriginalY(8 + (FONT_SIZE * 2)); + separator.setXPositionMode(WidgetPositionMode.ABSOLUTE_CENTER); + separator.setYPositionMode(WidgetPositionMode.ABSOLUTE_TOP); + separator.setOriginalHeight(0); + separator.setOriginalWidth(16); + separator.setWidthMode(WidgetSizeMode.MINUS); + separator.setTextColor(0x666666); + separator.revalidate(); + + int x = PADDING; + int y = PADDING * 3; + int idx = 0; + for (ItemComposition itemComposition : results.values()) + { + Widget item = container.createChild(-1, WidgetType.GRAPHIC); + item.setXPositionMode(WidgetPositionMode.ABSOLUTE_LEFT); + item.setYPositionMode(WidgetPositionMode.ABSOLUTE_TOP); + item.setOriginalX(x); + item.setOriginalY(y + FONT_SIZE * 2); + item.setOriginalHeight(ICON_HEIGHT); + item.setOriginalWidth(ICON_WIDTH); + item.setName("" + itemComposition.getName()); + item.setItemId(itemComposition.getId()); + item.setItemQuantity(10000); + item.setItemQuantityMode(ItemQuantityMode.NEVER); + item.setBorderType(1); + item.setAction(0, tooltipText); + item.setHasListener(true); + + if (index == idx) + { + item.setOpacity(HOVERED_OPACITY); + } + else + { + item.setOnMouseOverListener((JavaScriptCallback) ev -> item.setOpacity(HOVERED_OPACITY)); + item.setOnMouseLeaveListener((JavaScriptCallback) ev -> item.setOpacity(0)); + } + + item.setOnOpListener((JavaScriptCallback) ev -> + { + if (onItemSelected != null) + { + onItemSelected.accept(itemComposition.getId()); + } + + chatboxPanelManager.close(); + }); + + x += ICON_WIDTH + PADDING; + if (x + ICON_WIDTH >= container.getWidth()) + { + y += ICON_HEIGHT + PADDING; + x = PADDING; + } + + item.revalidate(); + ++idx; + } + } + + @Override + public void keyPressed(KeyEvent ev) + { + switch (ev.getKeyCode()) + { + case KeyEvent.VK_ENTER: + ev.consume(); + if (index > -1) + { + if (onItemSelected != null) + { + onItemSelected.accept(results.keySet().toArray(new Integer[results.size()])[index]); + } + + chatboxPanelManager.close(); + } + break; + case KeyEvent.VK_TAB: + case KeyEvent.VK_RIGHT: + ev.consume(); + if (!results.isEmpty()) + { + index++; + if (index >= results.size()) + { + index = 0; + } + clientThread.invokeLater(this::update); + } + break; + case KeyEvent.VK_LEFT: + ev.consume(); + if (!results.isEmpty()) + { + index--; + if (index < 0) + { + index = results.size() - 1; + } + clientThread.invokeLater(this::update); + } + break; + case KeyEvent.VK_UP: + ev.consume(); + if (results.size() >= (MAX_RESULTS / 2)) + { + index -= MAX_RESULTS / 2; + if (index < 0) + { + if (results.size() == MAX_RESULTS) + { + index += results.size(); + } + else + { + index += MAX_RESULTS; + } + index = Ints.constrainToRange(index, 0, results.size() - 1); + } + + clientThread.invokeLater(this::update); + } + break; + case KeyEvent.VK_DOWN: + ev.consume(); + if (results.size() >= (MAX_RESULTS / 2)) + { + index += MAX_RESULTS / 2; + if (index >= MAX_RESULTS) + { + if (results.size() == MAX_RESULTS) + { + index -= results.size(); + } + else + { + index -= MAX_RESULTS; + } + index = Ints.constrainToRange(index, 0, results.size() - 1); + } + + clientThread.invokeLater(this::update); + } + break; + default: + super.keyPressed(ev); + } + } + + @Override + protected void close() + { + // Clear search string when closed + value(""); + results.clear(); + index = -1; + super.close(); + } + + @Override + @Deprecated + public ChatboxTextInput onDone(Consumer onDone) + { + throw new UnsupportedOperationException(); + } + + private void filterResults() + { + results.clear(); + index = -1; + + String search = getValue().toLowerCase(); + if (search.isEmpty()) + { + return; + } + + for (int i = 0; i < client.getItemCount() && results.size() < MAX_RESULTS; i++) + { + ItemComposition itemComposition = itemManager.getItemComposition(itemManager.canonicalize(i)); + String name = itemComposition.getName(); + // The client assigns "null" to item names of items it doesn't know about + if (!name.equals("null") && name.toLowerCase().contains(search)) + { + // This may already be in the map due to canonicalize mapping the item to something we've already seen + results.putIfAbsent(itemComposition.getId(), itemComposition); + } + } + } + + public ChatboxItemSearch onItemSelected(Consumer onItemSelected) + { + this.onItemSelected = onItemSelected; + return this; + } + + public ChatboxItemSearch tooltipText(final String text) + { + tooltipText = text; + return this; + } +} diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java index e59e47059d..8d4402b368 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java @@ -67,7 +67,7 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse private static final Pattern BREAK_MATCHER = Pattern.compile("[^a-zA-Z0-9']"); private final ChatboxPanelManager chatboxPanelManager; - private final ClientThread clientThread; + protected final ClientThread clientThread; private static IntPredicate getDefaultCharValidator() { From 4ab668fc04662401c89c963246813df81b4e7316 Mon Sep 17 00:00:00 2001 From: Ron Young Date: Fri, 29 Mar 2019 23:40:47 -0500 Subject: [PATCH 12/30] TabInterface: add item searching for change icon --- .../plugins/banktags/tabs/TabInterface.java | 44 ++++++++----------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index 416dfdc824..1a751c7b2e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -78,6 +78,7 @@ import net.runelite.api.widgets.WidgetType; import net.runelite.client.Notifier; import net.runelite.client.callback.ClientThread; import net.runelite.client.game.ItemManager; +import net.runelite.client.game.chatbox.ChatboxItemSearch; import net.runelite.client.game.chatbox.ChatboxPanelManager; import net.runelite.client.plugins.banktags.BankTagsConfig; import net.runelite.client.plugins.banktags.BankTagsPlugin; @@ -126,10 +127,10 @@ public class TabInterface private final Rectangle bounds = new Rectangle(); private final Rectangle canvasBounds = new Rectangle(); + private ChatboxItemSearch searchProvider; private TagTab activeTab; private int maxTabs; private int currentTabIndex; - private TagTab iconToSet = null; private Instant startScroll = Instant.now(); private String rememberedSearch; private boolean waitSearchTick; @@ -156,7 +157,8 @@ public class TabInterface final ChatboxPanelManager chatboxPanelManager, final BankTagsConfig config, final Notifier notifier, - final BankSearch bankSearch) + final BankSearch bankSearch, + final ChatboxItemSearch searchProvider) { this.client = client; this.clientThread = clientThread; @@ -167,6 +169,7 @@ public class TabInterface this.config = config; this.notifier = notifier; this.bankSearch = bankSearch; + this.searchProvider = searchProvider; } public boolean isActive() @@ -343,7 +346,20 @@ public class TabInterface client.playSoundEffect(SoundEffectID.UI_BOOP); break; case Tab.CHANGE_ICON: - iconToSet = tabManager.find(Text.removeTags(event.getOpbase())); + final String tag = Text.removeTags(event.getOpbase()); + searchProvider + .tooltipText(CHANGE_ICON + " (" + tag + ")") + .onItemSelected((itemId) -> + { + TagTab iconToSet = tabManager.find(tag); + if (iconToSet != null) + { + iconToSet.setIconItemId(itemId); + iconToSet.getIcon().setItemId(itemId); + tabManager.setIcon(iconToSet.getTag(), itemId + ""); + } + }) + .build(); break; case Tab.DELETE_TAB: String target = Text.standardize(event.getOpbase()); @@ -526,12 +542,6 @@ public class TabInterface entries = createMenuEntry(event, REMOVE_TAG + " (" + activeTab.getTag() + ")", event.getTarget(), entries); client.setMenuEntries(entries); } - else if (iconToSet != null && (entry.getOption().startsWith("Withdraw-") || entry.getOption().equals("Release"))) - { - // TODO: Do not replace every withdraw option with change icon option - entry.setOption(CHANGE_ICON + " (" + iconToSet.getTag() + ")"); - client.setMenuEntries(entries); - } else if (event.getActionParam1() == WidgetInfo.BANK_DEPOSIT_INVENTORY.getId() && event.getOption().equals("Deposit inventory")) { @@ -582,22 +592,6 @@ public class TabInterface bankSearch.search(InputType.NONE, rememberedSearch, true); } - if (iconToSet != null) - { - if (event.getMenuOption().startsWith(CHANGE_ICON + " (")) - { - ItemComposition item = getItem(event.getActionParam()); - int itemId = itemManager.canonicalize(item.getId()); - iconToSet.setIconItemId(itemId); - iconToSet.getIcon().setItemId(itemId); - tabManager.setIcon(iconToSet.getTag(), itemId + ""); - event.consume(); - } - - // Reset icon selection even when we do not clicked item with icon - iconToSet = null; - } - if (activeTab != null && event.getMenuOption().equals("Search") && client.getWidget(WidgetInfo.BANK_SEARCH_BUTTON_BACKGROUND).getSpriteId() != SpriteID.EQUIPMENT_SLOT_SELECTED) From 262fa3ba47efd65d7f6860cc061f0070e6f22d0f Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 20 Jul 2019 21:47:49 -0400 Subject: [PATCH 13/30] ovelay renderer: more gracefully handle exceptions If an overlay throws an exception it should not prevent other overlays in the layer from being rendererd. --- .../client/ui/overlay/OverlayRenderer.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index a9f2e9f017..9e5820470a 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -37,6 +37,7 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import javax.swing.SwingUtilities; +import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.MenuAction; @@ -56,6 +57,7 @@ import net.runelite.client.ui.JagexColors; import net.runelite.client.util.ColorUtil; @Singleton +@Slf4j public class OverlayRenderer extends MouseAdapter implements KeyListener { private static final int BORDER = 5; @@ -458,8 +460,23 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener } subGraphics.translate(point.x, point.y); - final Dimension dimension = MoreObjects.firstNonNull(overlay.render(subGraphics), new Dimension()); - subGraphics.dispose(); + + final Dimension overlayDimension; + try + { + overlayDimension = overlay.render(subGraphics); + } + catch (Exception ex) + { + log.warn("Error during overlay rendering", ex); + return; + } + finally + { + subGraphics.dispose(); + } + + final Dimension dimension = MoreObjects.firstNonNull(overlayDimension, new Dimension()); overlay.setBounds(new Rectangle(point, dimension)); } From 34243f727c49f5ccd27095016bb56804e5edf29c Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 20 Jul 2019 21:52:33 -0400 Subject: [PATCH 14/30] tooltip overlay: move tooltip clearing to a finally block Tooltips must always be cleared after each frame, and the overlay is responsible for this. This fixes tooltips erroneously stacking up in the event of an exception in the overlay --- .../client/ui/overlay/tooltip/TooltipOverlay.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java index 9436da087f..da1600450e 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java @@ -66,6 +66,19 @@ public class TooltipOverlay extends Overlay return null; } + try + { + return renderTooltips(graphics, tooltips); + } + finally + { + // Tooltips must always be cleared each frame + tooltipManager.clear(); + } + } + + private Dimension renderTooltips(Graphics2D graphics, List tooltips) + { final Rectangle clientCanvasBounds = new Rectangle(client.getRealDimensions()); final net.runelite.api.Point mouseCanvasPosition = client.getMouseCanvasPosition(); final Point mousePosition = new Point(mouseCanvasPosition.getX(), mouseCanvasPosition.getY() + OFFSET); @@ -113,7 +126,6 @@ public class TooltipOverlay extends Overlay newBounds.width = Math.max(newBounds.width, dimension.width); } - tooltipManager.clear(); return newBounds.getSize(); } } From 877df92d11b01f003d3ba7d5986e4f0b31e4f2a8 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 20 Jul 2019 21:37:30 -0400 Subject: [PATCH 15/30] tooltip component: fix exception from malformed tags --- .../overlay/components/TooltipComponent.java | 14 ++++-- .../components/TooltipComponentTest.java | 45 +++++++++++++++++++ 2 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 runelite-client/src/test/java/net/runelite/client/ui/overlay/components/TooltipComponentTest.java diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TooltipComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TooltipComponent.java index 4d606b40ca..2e4b943063 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TooltipComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TooltipComponent.java @@ -24,6 +24,7 @@ */ package net.runelite.client.ui.overlay.components; +import com.google.common.annotations.VisibleForTesting; import java.awt.Color; import java.awt.Dimension; import java.awt.FontMetrics; @@ -96,6 +97,7 @@ public class TooltipComponent implements RenderableEntity char[] chars = line.toCharArray(); int begin = 0; + boolean inTag = false; for (int j = 0; j < chars.length; j++) { if (chars[j] == '<') @@ -110,8 +112,9 @@ public class TooltipComponent implements RenderableEntity lineX += metrics.stringWidth(text); begin = j; + inTag = true; } - else if (chars[j] == '>') + else if (chars[j] == '>' && inTag) { String subLine = line.substring(begin + 1, j); @@ -148,6 +151,7 @@ public class TooltipComponent implements RenderableEntity } begin = j + 1; + inTag = false; } } @@ -162,12 +166,14 @@ public class TooltipComponent implements RenderableEntity return new Dimension(tooltipWidth + OFFSET * 2, tooltipHeight + OFFSET * 2); } - private static int calculateTextWidth(FontMetrics metrics, String line) + @VisibleForTesting + static int calculateTextWidth(FontMetrics metrics, String line) { char[] chars = line.toCharArray(); int textWidth = 0; int begin = 0; + boolean inTag = false; for (int j = 0; j < chars.length; j++) { if (chars[j] == '<') @@ -175,8 +181,9 @@ public class TooltipComponent implements RenderableEntity textWidth += metrics.stringWidth(line.substring(begin, j)); begin = j; + inTag = true; } - else if (chars[j] == '>') + else if (chars[j] == '>' && inTag) { String subLine = line.substring(begin + 1, j); @@ -190,6 +197,7 @@ public class TooltipComponent implements RenderableEntity } begin = j + 1; + inTag = false; } } diff --git a/runelite-client/src/test/java/net/runelite/client/ui/overlay/components/TooltipComponentTest.java b/runelite-client/src/test/java/net/runelite/client/ui/overlay/components/TooltipComponentTest.java new file mode 100644 index 0000000000..f50bf45530 --- /dev/null +++ b/runelite-client/src/test/java/net/runelite/client/ui/overlay/components/TooltipComponentTest.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2019, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.client.ui.overlay.components; + +import java.awt.FontMetrics; +import static net.runelite.client.ui.overlay.components.TooltipComponent.calculateTextWidth; +import static org.junit.Assert.assertEquals; +import org.junit.Test; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class TooltipComponentTest +{ + @Test + public void testCalculateTextWidth() + { + FontMetrics fontMetics = mock(FontMetrics.class); + when(fontMetics.stringWidth(anyString())).thenAnswer((invocation) -> ((String) invocation.getArguments()[0]).length()); + + assertEquals(11, calculateTextWidth(fontMetics, "line1>line2")); + } +} \ No newline at end of file From 2ffe3affbcec3982d3dccaaea8863176ec747a4e Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 23 Jul 2019 10:59:01 -0400 Subject: [PATCH 16/30] api: rename Item to TileItem and add Item value class Item was actually the renderable Item and is being misused for ItemContainer items --- .../src/main/java/net/runelite/api/Item.java | 26 +++-------- .../src/main/java/net/runelite/api/Tile.java | 2 +- .../main/java/net/runelite/api/TileItem.java | 46 +++++++++++++++++++ .../runelite/api/events/ItemDespawned.java | 4 +- .../api/events/ItemQuantityChanged.java | 4 +- .../net/runelite/api/events/ItemSpawned.java | 4 +- 6 files changed, 60 insertions(+), 26 deletions(-) create mode 100644 runelite-api/src/main/java/net/runelite/api/TileItem.java diff --git a/runelite-api/src/main/java/net/runelite/api/Item.java b/runelite-api/src/main/java/net/runelite/api/Item.java index 811b02b0a4..4f8d3c32d6 100644 --- a/runelite-api/src/main/java/net/runelite/api/Item.java +++ b/runelite-api/src/main/java/net/runelite/api/Item.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, Adam + * Copyright (c) 2019, Adam * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -24,23 +24,11 @@ */ package net.runelite.api; -/** - * Represents an item inside an {@link ItemContainer}. - */ -public interface Item extends Renderable -{ - /** - * Gets the items ID. - * - * @return the ID of the item - * @see ItemID - */ - int getId(); +import lombok.Value; - /** - * Gets the items quantity. - * - * @return the items quantity - */ - int getQuantity(); +@Value +public class Item +{ + private final int id; + private final int quantity; } diff --git a/runelite-api/src/main/java/net/runelite/api/Tile.java b/runelite-api/src/main/java/net/runelite/api/Tile.java index 0911c17de1..be35c8c3d2 100644 --- a/runelite-api/src/main/java/net/runelite/api/Tile.java +++ b/runelite-api/src/main/java/net/runelite/api/Tile.java @@ -130,7 +130,7 @@ public interface Tile * * @return the ground items */ - List getGroundItems(); + List getGroundItems(); /** * Return the tile under this one, if this tile is a bridge diff --git a/runelite-api/src/main/java/net/runelite/api/TileItem.java b/runelite-api/src/main/java/net/runelite/api/TileItem.java new file mode 100644 index 0000000000..46a6262910 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/TileItem.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2016-2017, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.api; + +/** + * Represents an item inside an {@link ItemLayer}. + */ +public interface TileItem extends Renderable +{ + /** + * Gets the items ID. + * + * @return the ID of the item + * @see ItemID + */ + int getId(); + + /** + * Gets the items quantity. + * + * @return the items quantity + */ + int getQuantity(); +} diff --git a/runelite-api/src/main/java/net/runelite/api/events/ItemDespawned.java b/runelite-api/src/main/java/net/runelite/api/events/ItemDespawned.java index 4e60837d9d..037044f563 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/ItemDespawned.java +++ b/runelite-api/src/main/java/net/runelite/api/events/ItemDespawned.java @@ -25,7 +25,7 @@ package net.runelite.api.events; import lombok.Value; -import net.runelite.api.Item; +import net.runelite.api.TileItem; import net.runelite.api.Tile; /** @@ -36,5 +36,5 @@ import net.runelite.api.Tile; public class ItemDespawned { private final Tile tile; - private final Item item; + private final TileItem item; } diff --git a/runelite-api/src/main/java/net/runelite/api/events/ItemQuantityChanged.java b/runelite-api/src/main/java/net/runelite/api/events/ItemQuantityChanged.java index fb6b4f37ae..f0d9e2ec1d 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/ItemQuantityChanged.java +++ b/runelite-api/src/main/java/net/runelite/api/events/ItemQuantityChanged.java @@ -25,7 +25,7 @@ package net.runelite.api.events; import lombok.Value; -import net.runelite.api.Item; +import net.runelite.api.TileItem; import net.runelite.api.Tile; /** @@ -34,7 +34,7 @@ import net.runelite.api.Tile; @Value public class ItemQuantityChanged { - private final Item item; + private final TileItem item; private final Tile tile; private final int oldQuantity; private final int newQuantity; diff --git a/runelite-api/src/main/java/net/runelite/api/events/ItemSpawned.java b/runelite-api/src/main/java/net/runelite/api/events/ItemSpawned.java index e02d927cfc..81f1db9eb4 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/ItemSpawned.java +++ b/runelite-api/src/main/java/net/runelite/api/events/ItemSpawned.java @@ -25,7 +25,7 @@ package net.runelite.api.events; import lombok.Value; -import net.runelite.api.Item; +import net.runelite.api.TileItem; import net.runelite.api.Tile; /** @@ -36,5 +36,5 @@ import net.runelite.api.Tile; public class ItemSpawned { private final Tile tile; - private final Item item; + private final TileItem item; } From 29533cd6c70845c9b78755cd284953786cd174bd Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 23 Jul 2019 10:59:14 -0400 Subject: [PATCH 17/30] client: change item layer item uages to TileItem --- .../net/runelite/client/game/LootManager.java | 8 ++-- .../client/plugins/agility/AgilityPlugin.java | 4 +- .../plugins/devtools/DevToolsOverlay.java | 6 +-- .../grounditems/GroundItemsPlugin.java | 14 +++---- .../mta/enchantment/EnchantmentRoom.java | 6 +-- .../client/util/GameEventManager.java | 6 +-- .../bank/ContainerCalculationTest.java | 12 +----- .../itemcharges/ItemChargePluginTest.java | 3 +- .../ItemsKeptOnDeathPluginTest.java | 13 ++----- .../motherlode/MotherlodePluginTest.java | 39 +++++++++---------- 10 files changed, 47 insertions(+), 64 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/LootManager.java b/runelite-client/src/main/java/net/runelite/client/game/LootManager.java index 4e2f11201b..24d9e6128d 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/LootManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/LootManager.java @@ -38,7 +38,7 @@ import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.AnimationID; import net.runelite.api.Client; -import net.runelite.api.Item; +import net.runelite.api.TileItem; import net.runelite.api.ItemID; import net.runelite.api.NPC; import net.runelite.api.NpcID; @@ -156,7 +156,7 @@ public class LootManager @Subscribe public void onItemSpawned(ItemSpawned itemSpawned) { - final Item item = itemSpawned.getItem(); + final TileItem item = itemSpawned.getItem(); final Tile tile = itemSpawned.getTile(); final LocalPoint location = tile.getLocalLocation(); final int packed = location.getSceneX() << 8 | location.getSceneY(); @@ -167,7 +167,7 @@ public class LootManager @Subscribe public void onItemDespawned(ItemDespawned itemDespawned) { - final Item item = itemDespawned.getItem(); + final TileItem item = itemDespawned.getItem(); final LocalPoint location = itemDespawned.getTile().getLocalLocation(); log.debug("Item despawn {} ({}) location {},{}", item.getId(), item.getQuantity(), location); } @@ -175,7 +175,7 @@ public class LootManager @Subscribe public void onItemQuantityChanged(ItemQuantityChanged itemQuantityChanged) { - final Item item = itemQuantityChanged.getItem(); + final TileItem item = itemQuantityChanged.getItem(); final Tile tile = itemQuantityChanged.getTile(); final LocalPoint location = tile.getLocalLocation(); final int packed = location.getSceneX() << 8 | location.getSceneY(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java index c895a07980..d27ca539f7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java @@ -34,13 +34,13 @@ import javax.inject.Inject; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; -import net.runelite.api.Item; import net.runelite.api.ItemID; import static net.runelite.api.ItemID.AGILITY_ARENA_TICKET; import net.runelite.api.Player; import net.runelite.api.Skill; import static net.runelite.api.Skill.AGILITY; import net.runelite.api.Tile; +import net.runelite.api.TileItem; import net.runelite.api.TileObject; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.BoostedLevelChanged; @@ -235,7 +235,7 @@ public class AgilityPlugin extends Plugin return; } - final Item item = itemSpawned.getItem(); + final TileItem item = itemSpawned.getItem(); final Tile tile = itemSpawned.getTile(); if (item.getId() == ItemID.MARK_OF_GRACE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java index fbc132b90f..8bf45eaf83 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java @@ -43,8 +43,8 @@ import net.runelite.api.Constants; import net.runelite.api.DecorativeObject; import net.runelite.api.GameObject; import net.runelite.api.GraphicsObject; +import net.runelite.api.TileItem; import net.runelite.api.GroundObject; -import net.runelite.api.Item; import net.runelite.api.ItemLayer; import net.runelite.api.NPC; import net.runelite.api.NPCComposition; @@ -272,9 +272,9 @@ class DevToolsOverlay extends Overlay if (player.getLocalLocation().distanceTo(itemLayer.getLocalLocation()) <= MAX_DISTANCE) { Node current = itemLayer.getBottom(); - while (current instanceof Item) + while (current instanceof TileItem) { - Item item = (Item) current; + TileItem item = (TileItem) current; OverlayUtil.renderTileOverlay(graphics, itemLayer, "ID: " + item.getId() + " Qty:" + item.getQuantity(), RED); current = current.getNext(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java index 8844fedc0d..4830c3d59d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java @@ -48,7 +48,6 @@ import lombok.Setter; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.GameState; -import net.runelite.api.Item; import net.runelite.api.ItemComposition; import net.runelite.api.ItemID; import net.runelite.api.ItemLayer; @@ -58,6 +57,7 @@ import net.runelite.api.Node; import net.runelite.api.Player; import net.runelite.api.Scene; import net.runelite.api.Tile; +import net.runelite.api.TileItem; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ClientTick; import net.runelite.api.events.ConfigChanged; @@ -216,7 +216,7 @@ public class GroundItemsPlugin extends Plugin @Subscribe public void onItemSpawned(ItemSpawned itemSpawned) { - Item item = itemSpawned.getItem(); + TileItem item = itemSpawned.getItem(); Tile tile = itemSpawned.getTile(); GroundItem groundItem = buildGroundItem(tile, item); @@ -242,7 +242,7 @@ public class GroundItemsPlugin extends Plugin @Subscribe public void onItemDespawned(ItemDespawned itemDespawned) { - Item item = itemDespawned.getItem(); + TileItem item = itemDespawned.getItem(); Tile tile = itemDespawned.getTile(); GroundItem.GroundItemKey groundItemKey = new GroundItem.GroundItemKey(item.getId(), tile.getWorldLocation()); @@ -265,7 +265,7 @@ public class GroundItemsPlugin extends Plugin @Subscribe public void onItemQuantityChanged(ItemQuantityChanged itemQuantityChanged) { - Item item = itemQuantityChanged.getItem(); + TileItem item = itemQuantityChanged.getItem(); Tile tile = itemQuantityChanged.getTile(); int oldQuantity = itemQuantityChanged.getOldQuantity(); int newQuantity = itemQuantityChanged.getNewQuantity(); @@ -365,7 +365,7 @@ public class GroundItemsPlugin extends Plugin } } - private GroundItem buildGroundItem(final Tile tile, final Item item) + private GroundItem buildGroundItem(final Tile tile, final TileItem item) { // Collect the data for the item final int itemId = item.getId(); @@ -473,9 +473,9 @@ public class GroundItemsPlugin extends Plugin int quantity = 1; Node current = itemLayer.getBottom(); - while (current instanceof Item) + while (current instanceof TileItem) { - Item item = (Item) current; + TileItem item = (TileItem) current; if (item.getId() == itemId) { quantity = item.getQuantity(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java index 36d206cf26..5989d79d8a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java @@ -30,10 +30,10 @@ import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; -import net.runelite.api.Item; import net.runelite.api.ItemID; import net.runelite.api.Player; import net.runelite.api.Tile; +import net.runelite.api.TileItem; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; @@ -106,7 +106,7 @@ public class EnchantmentRoom extends MTARoom @Subscribe public void onItemSpawned(ItemSpawned itemSpawned) { - final Item item = itemSpawned.getItem(); + final TileItem item = itemSpawned.getItem(); final Tile tile = itemSpawned.getTile(); if (item.getId() == ItemID.DRAGONSTONE_6903) @@ -120,7 +120,7 @@ public class EnchantmentRoom extends MTARoom @Subscribe public void onItemDespawned(ItemDespawned itemDespawned) { - final Item item = itemDespawned.getItem(); + final TileItem item = itemDespawned.getItem(); final Tile tile = itemDespawned.getTile(); if (item.getId() == ItemID.DRAGONSTONE_6903) diff --git a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java index e837bb54d9..31bf351af4 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java +++ b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java @@ -33,8 +33,8 @@ import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.GameState; +import net.runelite.api.TileItem; import net.runelite.api.InventoryID; -import net.runelite.api.Item; import net.runelite.api.ItemContainer; import net.runelite.api.NPC; import net.runelite.api.Node; @@ -180,9 +180,9 @@ public class GameEventManager { Node current = itemLayer.getBottom(); - while (current instanceof Item) + while (current instanceof TileItem) { - final Item item = (Item) current; + final TileItem item = (TileItem) current; current = current.getNext(); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/bank/ContainerCalculationTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/bank/ContainerCalculationTest.java index 6e53c5ab25..8697f78859 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/bank/ContainerCalculationTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/bank/ContainerCalculationTest.java @@ -67,17 +67,9 @@ public class ContainerCalculationTest @Test public void testCalculate() { - Item coins = mock(Item.class); - when(coins.getId()) - .thenReturn(ItemID.COINS_995); - when(coins.getQuantity()) - .thenReturn(Integer.MAX_VALUE); + Item coins = new Item(ItemID.COINS_995, Integer.MAX_VALUE); - Item whip = mock(Item.class); - when(whip.getId()) - .thenReturn(ItemID.ABYSSAL_WHIP); - when(whip.getQuantity()) - .thenReturn(1_000_000_000); + Item whip = new Item(ItemID.ABYSSAL_WHIP, 1_000_000_000); Item[] items = ImmutableList.of( coins, diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java index bccf1c69c5..703b0a7c51 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java @@ -136,8 +136,7 @@ public class ItemChargePluginTest when(client.getItemContainer(eq(InventoryID.EQUIPMENT))).thenReturn(equipmentItemContainer); Item[] items = new Item[EquipmentInventorySlot.RING.getSlotIdx() + 1]; when(equipmentItemContainer.getItems()).thenReturn(items); - Item ring = mock(Item.class); - when(ring.getId()).thenReturn(ItemID.RING_OF_FORGING); + Item ring = new Item(ItemID.RING_OF_FORGING, 1); items[EquipmentInventorySlot.RING.getSlotIdx()] = ring; // Run message chatMessage = new ChatMessage(null, ChatMessageType.GAMEMESSAGE, "", USED_RING_OF_FORGING, "", 0); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java index 37e8a7d99d..86eb869a80 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java @@ -100,18 +100,13 @@ public class ItemsKeptOnDeathPluginTest when(itemManager.canonicalize(id)).thenReturn(id); when(itemManager.getItemPrice(id, true)).thenReturn(price); - return mockItem(id, qty); + return item(id, qty); } - // Creates a mocked item - private Item mockItem(final int id, final int qty) + // Creates a new item + private static Item item(final int id, final int qty) { - Item item = mock(Item.class); - - when(item.getId()).thenReturn(id); - when(item.getQuantity()).thenReturn(qty); - - return item; + return new Item(id, qty); } @Test diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java index 43b2dc75f3..34df2247f3 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java @@ -111,12 +111,12 @@ public class MotherlodePluginTest // Create before inventory ItemContainer inventory = mock(ItemContainer.class); Item[] items = new Item[]{ - mockItem(ItemID.RUNITE_ORE, 1), - mockItem(ItemID.GOLDEN_NUGGET, 4), - mockItem(ItemID.COAL, 1), - mockItem(ItemID.COAL, 1), - mockItem(ItemID.COAL, 1), - mockItem(ItemID.COAL, 1), + item(ItemID.RUNITE_ORE, 1), + item(ItemID.GOLDEN_NUGGET, 4), + item(ItemID.COAL, 1), + item(ItemID.COAL, 1), + item(ItemID.COAL, 1), + item(ItemID.COAL, 1), }; when(inventory.getItems()) @@ -130,16 +130,16 @@ public class MotherlodePluginTest inventory = mock(ItemContainer.class); // +1 rune, +4 nugget, +2 coal, +1 addy items = new Item[]{ - mockItem(ItemID.RUNITE_ORE, 1), - mockItem(ItemID.RUNITE_ORE, 1), - mockItem(ItemID.GOLDEN_NUGGET, 8), - mockItem(ItemID.COAL, 1), - mockItem(ItemID.COAL, 1), - mockItem(ItemID.COAL, 1), - mockItem(ItemID.COAL, 1), - mockItem(ItemID.COAL, 1), - mockItem(ItemID.COAL, 1), - mockItem(ItemID.ADAMANTITE_ORE, 1), + item(ItemID.RUNITE_ORE, 1), + item(ItemID.RUNITE_ORE, 1), + item(ItemID.GOLDEN_NUGGET, 8), + item(ItemID.COAL, 1), + item(ItemID.COAL, 1), + item(ItemID.COAL, 1), + item(ItemID.COAL, 1), + item(ItemID.COAL, 1), + item(ItemID.COAL, 1), + item(ItemID.ADAMANTITE_ORE, 1), }; when(inventory.getItems()) @@ -156,11 +156,8 @@ public class MotherlodePluginTest verifyNoMoreInteractions(motherlodeSession); } - private static Item mockItem(int itemId, int quantity) + private static Item item(int itemId, int quantity) { - Item item = mock(Item.class); - when(item.getId()).thenReturn(itemId); - when(item.getQuantity()).thenReturn(quantity); - return item; + return new Item(itemId, quantity); } } From 4f71fb91f097e4e201d505416ee740df5b5608d5 Mon Sep 17 00:00:00 2001 From: xDemoN Date: Wed, 24 Jul 2019 11:25:41 -0400 Subject: [PATCH 18/30] clue scrolls: Use consistent label for "Location" (#9421) --- .../runelite/client/plugins/cluescrolls/clues/AnagramClue.java | 2 +- .../runelite/client/plugins/cluescrolls/clues/CipherClue.java | 2 +- .../runelite/client/plugins/cluescrolls/clues/HotColdClue.java | 2 +- .../runelite/client/plugins/cluescrolls/clues/MusicClue.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java index a8b59775e5..a25e4c7e10 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java @@ -203,7 +203,7 @@ public class AnagramClue extends ClueScroll implements TextClueScroll, NpcClueSc .leftColor(TITLED_CONTENT_COLOR) .build()); - panelComponent.getChildren().add(LineComponent.builder().left("Area:").build()); + panelComponent.getChildren().add(LineComponent.builder().left("Location:").build()); panelComponent.getChildren().add(LineComponent.builder() .left(getArea()) .leftColor(TITLED_CONTENT_COLOR) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CipherClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CipherClue.java index 404ce70eae..1126e24492 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CipherClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CipherClue.java @@ -85,7 +85,7 @@ public class CipherClue extends ClueScroll implements TextClueScroll, NpcClueScr .leftColor(TITLED_CONTENT_COLOR) .build()); - panelComponent.getChildren().add(LineComponent.builder().left("Area:").build()); + panelComponent.getChildren().add(LineComponent.builder().left("Location:").build()); panelComponent.getChildren().add(LineComponent.builder() .left(getArea()) .leftColor(TITLED_CONTENT_COLOR) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java index e28ee82b9e..a4f4126656 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java @@ -160,7 +160,7 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat else { panelComponent.getChildren().add(LineComponent.builder() - .left("Possible areas:") + .left("Possible locations:") .build()); final Map locationCounts = new EnumMap<>(HotColdArea.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MusicClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MusicClue.java index 6ed7ce176f..cc27dabbbb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MusicClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MusicClue.java @@ -61,7 +61,7 @@ public class MusicClue extends ClueScroll implements NpcClueScroll .leftColor(TITLED_CONTENT_COLOR) .build()); - panelComponent.getChildren().add(LineComponent.builder().left("Area:").build()); + panelComponent.getChildren().add(LineComponent.builder().left("Location:").build()); panelComponent.getChildren().add(LineComponent.builder() .left("Falador Park") .leftColor(TITLED_CONTENT_COLOR) From 5969a2d97249fedfa7f2ccd44796176cae31d992 Mon Sep 17 00:00:00 2001 From: Decorth <38436593+Decorth@users.noreply.github.com> Date: Wed, 24 Jul 2019 08:44:21 -0700 Subject: [PATCH 19/30] loottracker: Add Hespori loot tracking Closes runelite/runelite#9249 --- .../plugins/loottracker/LootTrackerPlugin.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 17d709cdca..a58cd128bf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -105,6 +105,11 @@ public class LootTrackerPlugin extends Plugin private static final String HERBIBOAR_LOOTED_MESSAGE = "You harvest herbs from the herbiboar, whereupon it escapes."; private static final String HERBIBOR_EVENT = "Herbiboar"; + // Hespori loot handling + private static final String HESPORI_LOOTED_MESSAGE = "You have successfully cleared this patch for new crops."; + private static final String HESPORI_EVENT = "Hespori"; + private static final int HESPORI_REGION = 5021; + // Chest loot handling private static final String CHEST_LOOTED_MESSAGE = "You find some treasure in the chest!"; private static final Pattern LARRAN_LOOTED_PATTERN = Pattern.compile("You have opened Larran's (big|small) chest .*"); @@ -432,6 +437,12 @@ public class LootTrackerPlugin extends Plugin return; } + if (HESPORI_REGION == client.getLocalPlayer().getWorldLocation().getRegionID() && message.equals(HESPORI_LOOTED_MESSAGE)) + { + eventType = HESPORI_EVENT; + takeInventorySnapshot(); + } + // Check if message is for a clue scroll reward final Matcher m = CLUE_SCROLL_PATTERN.matcher(Text.removeTags(message)); if (m.find()) @@ -464,7 +475,7 @@ public class LootTrackerPlugin extends Plugin @Subscribe public void onItemContainerChanged(ItemContainerChanged event) { - if (eventType != null && (CHEST_EVENT_TYPES.containsValue(eventType) || HERBIBOR_EVENT.equals(eventType))) + if (eventType != null && (CHEST_EVENT_TYPES.containsValue(eventType) || HERBIBOR_EVENT.equals(eventType) || HESPORI_EVENT.equals(eventType))) { if (event.getItemContainer() != client.getItemContainer(InventoryID.INVENTORY)) { From b59405eec0d03b5b56f21f42d5163560a37110fa Mon Sep 17 00:00:00 2001 From: Sander de Groot Date: Wed, 24 Jul 2019 14:01:47 -0500 Subject: [PATCH 20/30] chat filter: fix filtering messages containing nbsp The chat history plugin replays messages by replacing spaces with nbsp to avoid triggering notifications and chat commands, and this was preventing the chat filter from filtering replayed messages. censorMessage already does a nbsp to space replacement. --- .../plugins/chatfilter/JagexPrintableCharMatcher.java | 2 +- .../plugins/chatfilter/ChatFilterPluginTest.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/JagexPrintableCharMatcher.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/JagexPrintableCharMatcher.java index 53b76cbc19..72591d71f0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/JagexPrintableCharMatcher.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/JagexPrintableCharMatcher.java @@ -34,6 +34,6 @@ class JagexPrintableCharMatcher extends CharMatcher // Characters which are printable return (c >= 32 && c <= 126) || c == 128 - || (c >= 161 && c <= 255); + || (c >= 160 && c <= 255); } } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java index a12a8b257b..d4b528b4c2 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java @@ -120,6 +120,16 @@ public class ChatFilterPluginTest assertNull(chatFilterPlugin.censorMessage("te\u008Cst")); } + @Test + public void testReplayedMessage() + { + when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.REMOVE_MESSAGE); + when(chatFilterConfig.filteredWords()).thenReturn("hello osrs"); + + chatFilterPlugin.updateFilteredPatterns(); + assertNull(chatFilterPlugin.censorMessage("hello\u00A0osrs")); + } + @Test public void testMessageFromFriendIsFiltered() { From 87ec3f0bea3d5a9b38ec2cb6f8b5b4cf16684813 Mon Sep 17 00:00:00 2001 From: William Collishaw Date: Wed, 24 Jul 2019 13:06:31 -0600 Subject: [PATCH 21/30] emoji plugin: support nbsp in messages --- .../client/plugins/emojis/EmojiPlugin.java | 5 +++-- .../client/plugins/emojis/EmojiPluginTest.java | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java index 21eb1eab10..68b97817c3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java @@ -55,6 +55,7 @@ import net.runelite.client.util.ImageUtil; public class EmojiPlugin extends Plugin { private static final Pattern TAG_REGEXP = Pattern.compile("<[^>]*>"); + private static final Pattern WHITESPACE_REGEXP = Pattern.compile("[\\s\\u00A0]"); @Inject private Client client; @@ -166,9 +167,9 @@ public class EmojiPlugin extends Plugin } @Nullable - private String updateMessage(final String message) + String updateMessage(final String message) { - final String[] messageWords = message.split(" "); + final String[] messageWords = WHITESPACE_REGEXP.split(message); boolean editedMessage = false; for (int i = 0; i < messageWords.length; i++) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java index 3427246946..5fd260b110 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java @@ -44,6 +44,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.mockito.runners.MockitoJUnitRunner; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; @RunWith(MockitoJUnitRunner.class) public class EmojiPluginTest @@ -113,4 +115,17 @@ public class EmojiPluginTest verify(messageNode).setRuneLiteFormatMessage(""); } + + @Test + public void testEmojiUpdateMessage() + { + String PARTY_POPPER = "'; + String OPEN_MOUTH = "'; + assertNull(emojiPlugin.updateMessage("@@@@@")); + assertEquals(PARTY_POPPER, emojiPlugin.updateMessage("@@@")); + assertEquals(PARTY_POPPER + ' ' + PARTY_POPPER, emojiPlugin.updateMessage("@@@ @@@")); + assertEquals(PARTY_POPPER + ' ' + OPEN_MOUTH, emojiPlugin.updateMessage("@@@\u00A0:O")); + assertEquals(PARTY_POPPER + ' ' + OPEN_MOUTH + ' ' + PARTY_POPPER, emojiPlugin.updateMessage("@@@\u00A0:O @@@")); + assertEquals(PARTY_POPPER + " Hello World " + PARTY_POPPER, emojiPlugin.updateMessage("@@@\u00A0Hello World\u00A0@@@")); + } } \ No newline at end of file From f2cfea57ccbb72fdc54d6c1ae7ebcadf6fc843d2 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 24 Jul 2019 15:10:47 -0400 Subject: [PATCH 22/30] chatfilter test: remove player bind --- .../runelite/client/plugins/chatfilter/ChatFilterPluginTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java index d4b528b4c2..1c9aa48601 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java @@ -54,7 +54,6 @@ public class ChatFilterPluginTest private ChatFilterConfig chatFilterConfig; @Mock - @Bind private Player localPlayer; @Inject From e741770083f7bcfd0cb966d583b980381c041498 Mon Sep 17 00:00:00 2001 From: 15987632 Date: Wed, 24 Jul 2019 20:40:14 -0400 Subject: [PATCH 23/30] hot cold clues: center kandarin outpost dig location --- .../plugins/cluescrolls/clues/hotcold/HotColdLocation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java index b3bd0c91db..8df5cac37c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java @@ -108,7 +108,7 @@ public enum HotColdLocation KANDARIN_KHAZARD_BATTLEFIELD(new WorldPoint(2518, 3249, 0), KANDARIN, "Khazard Battlefield, in the small ruins south of tracker gnome 2."), KANDARIN_WEST_ARDY(new WorldPoint(2533, 3320, 0), KANDARIN, "West Ardougne, near the staircase outside the Civic Office."), KANDARIN_SW_TREE_GNOME_STRONGHOLD(new WorldPoint(2411, 3431, 0), KANDARIN, "South-west Tree Gnome Stronghold"), - KANDARIN_OUTPOST(new WorldPoint(2458, 3364, 0), KANDARIN, "South of the Tree Gnome Stronghold, north-east of the Outpost."), + KANDARIN_OUTPOST(new WorldPoint(2457, 3362, 0), KANDARIN, "South of the Tree Gnome Stronghold, north-east of the Outpost."), KANDARIN_BAXTORIAN_FALLS(new WorldPoint(2534, 3479, 0), KANDARIN, "South-east of Almera's house on Baxtorian Falls."), KANDARIN_BA_AGILITY_COURSE(new WorldPoint(2536, 3546, 0), KANDARIN, "Inside the Barbarian Agility Course. Completion of Alfred Grimhand's Barcrawl is required."), KARAMJA_MUSA_POINT(new WorldPoint(2914, 3168, 0), KARAMJA, "Musa Point, banana plantation."), From 50d25f5ea2e9a8912aa0864cb361ed8ff26e7284 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 25 Jul 2019 09:33:31 +0000 Subject: [PATCH 24/30] Update Item IDs to 2019-07-25-rev181 --- .../main/java/net/runelite/api/ItemID.java | 301 ++++++++++++++++-- .../java/net/runelite/api/NullItemID.java | 199 +++++++++++- 2 files changed, 461 insertions(+), 39 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 81211d3710..246fe50c34 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -181,12 +181,12 @@ public final class ItemID public static final int RESEARCH_PACKAGE = 290; public static final int NOTES = 291; public static final int BOOK_ON_BAXTORIAN = 292; - public static final int A_KEY = 293; + public static final int KEY_293 = 293; public static final int GLARIALS_PEBBLE = 294; public static final int GLARIALS_AMULET = 295; public static final int GLARIALS_URN = 296; - public static final int GLARIALS_URN_297 = 297; - public static final int A_KEY_298 = 298; + public static final int GLARIALS_URN_EMPTY = 297; + public static final int KEY_298 = 298; public static final int MITHRIL_SEEDS = 299; public static final int RATS_TAIL = 300; public static final int LOBSTER_POT = 301; @@ -261,7 +261,7 @@ public final class ItemID public static final int PIGEON_CAGE_425 = 425; public static final int PRIEST_GOWN = 426; public static final int PRIEST_GOWN_428 = 428; - public static final int DOCTORS_GOWN = 430; + public static final int MEDICAL_GOWN = 430; public static final int KARAMJAN_RUM = 431; public static final int CHEST_KEY = 432; public static final int PIRATE_MESSAGE = 433; @@ -364,7 +364,7 @@ public final class ItemID public static final int LIT_TORCH = 594; public static final int TORCH = 595; public static final int UNLIT_TORCH = 596; - public static final int BRONZE_FIRE_ARROWS = 598; + public static final int BRONZE_FIRE_ARROW = 598; public static final int ASTRONOMY_BOOK = 600; public static final int GOBLIN_KITCHEN_KEY = 601; public static final int LENS_MOULD = 602; @@ -616,7 +616,7 @@ public final class ItemID public static final int ADAMANT_ARROWP = 891; public static final int RUNE_ARROW = 892; public static final int RUNE_ARROWP = 893; - public static final int BRONZE_FIRE_ARROWS_942 = 942; + public static final int BRONZE_FIRE_ARROW_LIT = 942; public static final int WORM = 943; public static final int THROWING_ROPE = 945; public static final int KNIFE = 946; @@ -891,7 +891,7 @@ public final class ItemID public static final int ORB_OF_LIGHT_1482 = 1482; public static final int ORB_OF_LIGHT_1483 = 1483; public static final int ORB_OF_LIGHT_1484 = 1484; - public static final int DAMP_CLOTH = 1485; + public static final int OILY_CLOTH = 1485; public static final int PIECE_OF_RAILING = 1486; public static final int UNICORN_HORN_1487 = 1487; public static final int PALADINS_BADGE = 1488; @@ -911,7 +911,7 @@ public final class ItemID public static final int IBANS_ASHES = 1502; public static final int WARRANT = 1503; public static final int HANGOVER_CURE = 1504; - public static final int A_MAGIC_SCROLL = 1505; + public static final int ARDOUGNE_TELEPORT_SCROLL = 1505; public static final int GAS_MASK = 1506; public static final int A_SMALL_KEY = 1507; public static final int A_SCRUFFY_NOTE = 1508; @@ -1507,16 +1507,16 @@ public final class ItemID public static final int LAMP = 2528; public static final int DEAD_ORB = 2529; public static final int BONES_2530 = 2530; - public static final int IRON_FIRE_ARROWS = 2532; - public static final int IRON_FIRE_ARROWS_2533 = 2533; - public static final int STEEL_FIRE_ARROWS = 2534; - public static final int STEEL_FIRE_ARROWS_2535 = 2535; - public static final int MITHRIL_FIRE_ARROWS = 2536; - public static final int MITHRIL_FIRE_ARROWS_2537 = 2537; - public static final int ADAMANT_FIRE_ARROWS = 2538; - public static final int ADAMANT_FIRE_ARROWS_2539 = 2539; - public static final int RUNE_FIRE_ARROWS = 2540; - public static final int RUNE_FIRE_ARROWS_2541 = 2541; + public static final int IRON_FIRE_ARROW = 2532; + public static final int IRON_FIRE_ARROW_LIT = 2533; + public static final int STEEL_FIRE_ARROW = 2534; + public static final int STEEL_FIRE_ARROW_LIT = 2535; + public static final int MITHRIL_FIRE_ARROW = 2536; + public static final int MITHRIL_FIRE_ARROW_LIT = 2537; + public static final int ADAMANT_FIRE_ARROW = 2538; + public static final int ADAMANT_FIRE_ARROW_LIT = 2539; + public static final int RUNE_FIRE_ARROW = 2540; + public static final int RUNE_FIRE_ARROW_LIT = 2541; public static final int RING_OF_RECOIL = 2550; public static final int RING_OF_DUELING8 = 2552; public static final int RING_OF_DUELING7 = 2554; @@ -1961,7 +1961,7 @@ public final class ItemID public static final int BARREL_3216 = 3216; public static final int BARREL_BOMB = 3218; public static final int BARREL_BOMB_3219 = 3219; - public static final int BARREL_OF_COALTAR = 3220; + public static final int BARREL_OF_COAL_TAR = 3220; public static final int BARREL_OF_NAPHTHA = 3221; public static final int NAPHTHA_MIX = 3222; public static final int NAPHTHA_MIX_3223 = 3223; @@ -2526,10 +2526,11 @@ public final class ItemID public static final int LETTER = 4204; public static final int CONSECRATION_SEED = 4205; public static final int CONSECRATION_SEED_4206 = 4206; - public static final int CRYSTAL_SEED = 4207; + public static final int CRYSTAL_WEAPON_SEED = 4207; public static final int CADARN_LINEAGE = 4209; public static final int ELF_CRYSTAL = 4211; public static final int NEW_CRYSTAL_BOW = 4212; + public static final int NEW_CRYSTAL_BOW_4213 = 4213; public static final int CRYSTAL_BOW_FULL = 4214; public static final int CRYSTAL_BOW_910 = 4215; public static final int CRYSTAL_BOW_810 = 4216; @@ -2551,6 +2552,7 @@ public final class ItemID public static final int CRYSTAL_SHIELD_310 = 4232; public static final int CRYSTAL_SHIELD_210 = 4233; public static final int CRYSTAL_SHIELD_110 = 4234; + public static final int NEW_CRYSTAL_SHIELD_4235 = 4235; public static final int SIGNED_OAK_BOW = 4236; public static final int NETTLEWATER = 4237; public static final int PUDDLE_OF_SLIME = 4238; @@ -2611,7 +2613,7 @@ public final class ItemID public static final int HAM_LOGO = 4306; public static final int HAM_GLOVES = 4308; public static final int HAM_BOOTS = 4310; - public static final int CRYSTAL_OF_SEREN = 4313; + public static final int CRYSTAL_SINGING_FOR_BEGINNERS = 4313; public static final int TEAM1_CAPE = 4315; public static final int TEAM2_CAPE = 4317; public static final int TEAM3_CAPE = 4319; @@ -3628,8 +3630,8 @@ public final class ItemID public static final int SPIRIT_TREE = 6063; public static final int BLOODY_MOURNER_TOP = 6064; public static final int MOURNER_TOP = 6065; - public static final int MOURNER_TROUSERS = 6066; - public static final int MOURNER_TROUSERS_6067 = 6067; + public static final int RIPPED_MOURNER_TROUSERS = 6066; + public static final int MOURNER_TROUSERS = 6067; public static final int MOURNER_GLOVES = 6068; public static final int MOURNER_BOOTS = 6069; public static final int MOURNER_CLOAK = 6070; @@ -3661,7 +3663,7 @@ public final class ItemID public static final int TELEPORT_CRYSTAL_3 = 6100; public static final int TELEPORT_CRYSTAL_2 = 6101; public static final int TELEPORT_CRYSTAL_1 = 6102; - public static final int TINY_ELF_CRYSTAL = 6103; + public static final int CRYSTAL_TELEPORT_SEED = 6103; public static final int NEW_KEY = 6104; public static final int ELF = 6105; public static final int GHOSTLY_BOOTS = 6106; @@ -4182,7 +4184,7 @@ public final class ItemID public static final int BEER_SOAKED_HAND = 6946; public static final int BERTS_ROTA = 6947; public static final int SANDYS_ROTA = 6948; - public static final int A_MAGIC_SCROLL_6949 = 6949; + public static final int A_MAGIC_SCROLL = 6949; public static final int MAGICAL_ORB = 6950; public static final int MAGICAL_ORB_A = 6951; public static final int TRUTH_SERUM = 6952; @@ -5957,7 +5959,7 @@ public final class ItemID public static final int A_VIOLET_SQUARE = 9623; public static final int A_VIOLET_PENTAGON = 9624; public static final int CRYSTAL_SAW = 9625; - public static final int SMALL_CRYSTAL_SEED = 9626; + public static final int CRYSTAL_SAW_SEED = 9626; public static final int A_HANDWRITTEN_BOOK = 9627; public static final int TYRAS_HELM = 9629; public static final int DAEYALT_ORE = 9632; @@ -7109,8 +7111,8 @@ public final class ItemID public static final int GOLDEN_GOBLIN = 11210; public static final int MAGIC_BEANS = 11211; public static final int DRAGON_ARROW = 11212; - public static final int DRAGON_FIRE_ARROWS = 11217; - public static final int DRAGON_FIRE_ARROWS_11222 = 11222; + public static final int DRAGON_FIRE_ARROW = 11217; + public static final int DRAGON_FIRE_ARROW_LIT = 11222; public static final int DRAGON_ARROWP = 11227; public static final int DRAGON_ARROWP_11228 = 11228; public static final int DRAGON_ARROWP_11229 = 11229; @@ -7827,7 +7829,7 @@ public final class ItemID public static final int PEST_CONTROL_TELEPORT = 12407; public static final int PISCATORIS_TELEPORT = 12408; public static final int TAI_BWO_WANNAI_TELEPORT = 12409; - public static final int ELF_CAMP_TELEPORT = 12410; + public static final int IORWERTH_CAMP_TELEPORT = 12410; public static final int MOS_LEHARMLESS_TELEPORT = 12411; public static final int PIRATE_HAT__PATCH = 12412; public static final int DRAGON_CHAINBODY_G = 12414; @@ -8786,6 +8788,12 @@ public final class ItemID public static final int CABBAGE_RUNE = 13680; public static final int CRUCIFEROUS_CODEX = 13681; public static final int USELESS_KEY_16684 = 16684; + public static final int NEW_CRYSTAL_BOW_16888 = 16888; + public static final int NEW_CRYSTAL_BOW_I_16889 = 16889; + public static final int NEW_CRYSTAL_SHIELD_16890 = 16890; + public static final int NEW_CRYSTAL_SHIELD_I_16891 = 16891; + public static final int NEW_CRYSTAL_HALBERD_FULL_I_16892 = 16892; + public static final int NEW_CRYSTAL_HALBERD_FULL_16893 = 16893; public static final int DEAD_ORB_17152 = 17152; public static final int BAG_FULL_OF_GEMS = 19473; public static final int ACHIEVEMENT_DIARY_CAPE = 19476; @@ -9823,8 +9831,8 @@ public final class ItemID public static final int AMETHYST_JAVELINP_21322 = 21322; public static final int AMETHYST_JAVELINP_21324 = 21324; public static final int AMETHYST_ARROW = 21326; - public static final int AMETHYST_FIRE_ARROWS = 21328; - public static final int AMETHYST_FIRE_ARROWS_21330 = 21330; + public static final int AMETHYST_FIRE_ARROW = 21328; + public static final int AMETHYST_FIRE_ARROW_LIT = 21330; public static final int AMETHYST_ARROWP = 21332; public static final int AMETHYST_ARROWP_21334 = 21334; public static final int AMETHYST_ARROWP_21336 = 21336; @@ -10934,5 +10942,236 @@ public final class ItemID public static final int MAGES_BOOK_23652 = 23652; public static final int AHRIMS_STAFF_23653 = 23653; public static final int OCCULT_NECKLACE_23654 = 23654; + public static final int CRYSTAL_SEEDLING = 23655; + public static final int CRYSTAL_SEEDLING_W = 23657; + 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 CRYSTAL_AXE = 23673; + public static final int CRYSTAL_AXE_INACTIVE = 23675; + public static final int DRAGON_PICKAXEOR = 23677; + public static final int CRYSTAL_PICKAXE = 23680; + public static final int CRYSTAL_PICKAXE_INACTIVE = 23682; + public static final int DIVINE_SUPER_COMBAT_POTION4 = 23685; + public static final int DIVINE_SUPER_COMBAT_POTION3 = 23688; + public static final int DIVINE_SUPER_COMBAT_POTION2 = 23691; + public static final int DIVINE_SUPER_COMBAT_POTION1 = 23694; + public static final int DIVINE_SUPER_ATTACK_POTION4 = 23697; + public static final int DIVINE_SUPER_ATTACK_POTION3 = 23700; + public static final int DIVINE_SUPER_ATTACK_POTION2 = 23703; + public static final int DIVINE_SUPER_ATTACK_POTION1 = 23706; + public static final int DIVINE_SUPER_STRENGTH_POTION4 = 23709; + public static final int DIVINE_SUPER_STRENGTH_POTION3 = 23712; + public static final int DIVINE_SUPER_STRENGTH_POTION2 = 23715; + public static final int DIVINE_SUPER_STRENGTH_POTION1 = 23718; + public static final int DIVINE_SUPER_DEFENCE_POTION4 = 23721; + public static final int DIVINE_SUPER_DEFENCE_POTION3 = 23724; + public static final int DIVINE_SUPER_DEFENCE_POTION2 = 23727; + public static final int DIVINE_SUPER_DEFENCE_POTION1 = 23730; + public static final int DIVINE_RANGING_POTION4 = 23733; + public static final int DIVINE_RANGING_POTION3 = 23736; + public static final int DIVINE_RANGING_POTION2 = 23739; + public static final int DIVINE_RANGING_POTION1 = 23742; + public static final int DIVINE_MAGIC_POTION4 = 23745; + public static final int DIVINE_MAGIC_POTION3 = 23748; + public static final int DIVINE_MAGIC_POTION2 = 23751; + public static final int DIVINE_MAGIC_POTION1 = 23754; + public static final int YOUNGLLEF = 23757; + public static final int CORRUPTED_YOUNGLLEF = 23759; + public static final int SMOLCANO = 23760; + public static final int CRYSTAL_HARPOON = 23762; + public static final int CRYSTAL_HARPOON_INACTIVE = 23764; + public static final int CRYSTAL_IMPLING_JAR = 23768; + public static final int CLUE_SCROLL_ELITE_23770 = 23770; + public static final int PRIFDDINAS_TELEPORT = 23771; + public static final int SCRAWLED_NOTES = 23773; + public static final int HAND_MIRROR_23775 = 23775; + public static final int RED_CRYSTAL_23776 = 23776; + public static final int YELLOW_CRYSTAL_23777 = 23777; + public static final int GREEN_CRYSTAL_23778 = 23778; + public static final int CYAN_CRYSTAL_23779 = 23779; + public static final int BLUE_CRYSTAL_23780 = 23780; + public static final int MAGENTA_CRYSTAL_23781 = 23781; + public static final int BLACK_CRYSTAL = 23782; + public static final int GREEN_CRYSTAL_23783 = 23783; + public static final int FRACTURED_CRYSTAL_23784 = 23784; + public static final int ARDOUGNE_KNIGHT_HELM = 23785; + public static final int ARDOUGNE_KNIGHT_PLATEBODY = 23787; + public static final int ARDOUGNE_KNIGHT_PLATELEGS = 23789; + public static final int ARDOUGNE_KNIGHT_TABARD = 23791; + public static final int BLUE_LIQUID = 23792; + public static final int GREEN_POWDER = 23793; + public static final int CLEAR_LIQUID = 23794; + public static final int RED_POWDER = 23795; + public static final int ODE_TO_ETERNITY = 23796; + public static final int ELDER_CADANTINE = 23798; + public static final int ELDER_CADANTINE_POTION_UNF = 23800; + public static final int CRYSTAL_23802 = 23802; + public static final int CRYSTAL_DUST = 23804; + public static final int INVERSION_POTION = 23806; + public static final int CRYSTAL_SEED = 23808; + public static final int CRYSTAL_SEED_23810 = 23810; + public static final int ORB_OF_LIGHT_23812 = 23812; + public static final int CLUE_SCROLL_23814 = 23814; + public static final int CLUE_SCROLL_23815 = 23815; + public static final int CLUE_SCROLL_23816 = 23816; + public static final int CLUE_SCROLL_23817 = 23817; + public static final int EXPLOSIVE_POTION_23818 = 23818; + public static final int CORRUPTED_SCEPTRE = 23820; + public static final int CORRUPTED_AXE = 23821; + public static final int CORRUPTED_PICKAXE = 23822; + public static final int CORRUPTED_HARPOON = 23823; + public static final int CORRUPTED_SHARDS = 23824; + public static final int CORRUPTED_DUST = 23830; + public static final int CORRUPTED_SPIKE = 23831; + public static final int CORRUPTED_BOWSTRING = 23832; + public static final int CORRUPTED_ORB = 23833; + public static final int WEAPON_FRAME = 23834; + public static final int GRYM_LEAF = 23835; + public static final int LINUM_TIRINUM = 23836; + public static final int CORRUPTED_ORE = 23837; + public static final int PHREN_BARK = 23838; + public static final int VIAL_23839 = 23839; + public static final int CORRUPTED_HELM_BASIC = 23840; + public static final int CORRUPTED_HELM_ATTUNED = 23841; + public static final int CORRUPTED_HELM_PERFECTED = 23842; + public static final int CORRUPTED_BODY_BASIC = 23843; + public static final int CORRUPTED_BODY_ATTUNED = 23844; + public static final int CORRUPTED_BODY_PERFECTED = 23845; + public static final int CORRUPTED_LEGS_BASIC = 23846; + public static final int CORRUPTED_LEGS_ATTUNED = 23847; + public static final int CORRUPTED_LEGS_PERFECTED = 23848; + public static final int CORRUPTED_HALBERD_BASIC = 23849; + public static final int CORRUPTED_HALBERD_ATTUNED = 23850; + public static final int CORRUPTED_HALBERD_PERFECTED = 23851; + public static final int CORRUPTED_STAFF_BASIC = 23852; + public static final int CORRUPTED_STAFF_ATTUNED = 23853; + public static final int CORRUPTED_STAFF_PERFECTED = 23854; + public static final int CORRUPTED_BOW_BASIC = 23855; + public static final int CORRUPTED_BOW_ATTUNED = 23856; + public static final int CORRUPTED_BOW_PERFECTED = 23857; + public static final int CORRUPTED_TELEPORT_CRYSTAL = 23858; + public static final int GAUNTLET_CAPE = 23859; + public static final int CRYSTAL_SCEPTRE = 23861; + public static final int CRYSTAL_AXE_23862 = 23862; + public static final int CRYSTAL_PICKAXE_23863 = 23863; + public static final int CRYSTAL_HARPOON_23864 = 23864; + public static final int PESTLE_AND_MORTAR_23865 = 23865; + public static final int CRYSTAL_SHARDS = 23866; + public static final int CRYSTAL_DUST_23867 = 23867; + public static final int CRYSTAL_SPIKE = 23868; + public static final int CRYSTALLINE_BOWSTRING = 23869; + public static final int CRYSTAL_ORB = 23870; + public static final int WEAPON_FRAME_23871 = 23871; + public static final int RAW_PADDLEFISH = 23872; + public static final int BURNT_FISH_23873 = 23873; + public static final int PADDLEFISH = 23874; + public static final int GRYM_LEAF_23875 = 23875; + public static final int LINUM_TIRINUM_23876 = 23876; + public static final int CRYSTAL_ORE = 23877; + public static final int PHREN_BARK_23878 = 23878; + public static final int VIAL_23879 = 23879; + public static final int WATERFILLED_VIAL = 23880; + public static final int GRYM_POTION_UNF = 23881; + public static final int EGNIOL_POTION_1 = 23882; + public static final int EGNIOL_POTION_2 = 23883; + public static final int EGNIOL_POTION_3 = 23884; + public static final int EGNIOL_POTION_4 = 23885; + public static final int CRYSTAL_HELM_BASIC = 23886; + public static final int CRYSTAL_HELM_ATTUNED = 23887; + public static final int CRYSTAL_HELM_PERFECTED = 23888; + public static final int CRYSTAL_BODY_BASIC = 23889; + public static final int CRYSTAL_BODY_ATTUNED = 23890; + public static final int CRYSTAL_BODY_PERFECTED = 23891; + public static final int CRYSTAL_LEGS_BASIC = 23892; + public static final int CRYSTAL_LEGS_ATTUNED = 23893; + public static final int CRYSTAL_LEGS_PERFECTED = 23894; + public static final int CRYSTAL_HALBERD_BASIC = 23895; + public static final int CRYSTAL_HALBERD_ATTUNED = 23896; + public static final int CRYSTAL_HALBERD_PERFECTED = 23897; + public static final int CRYSTAL_STAFF_BASIC = 23898; + public static final int CRYSTAL_STAFF_ATTUNED = 23899; + public static final int CRYSTAL_STAFF_PERFECTED = 23900; + public static final int CRYSTAL_BOW_BASIC = 23901; + public static final int CRYSTAL_BOW_ATTUNED = 23902; + public static final int CRYSTAL_BOW_PERFECTED = 23903; + public static final int TELEPORT_CRYSTAL = 23904; + public static final int TEPHRA = 23905; + public static final int REFINED_TEPHRA = 23906; + public static final int IMBUED_TEPHRA = 23907; + public static final int ZALCANO_SHARD = 23908; + public static final int CRYSTAL_CROWN = 23911; + public static final int CRYSTAL_CROWN_23913 = 23913; + public static final int CRYSTAL_CROWN_23915 = 23915; + public static final int CRYSTAL_CROWN_23917 = 23917; + public static final int CRYSTAL_CROWN_23919 = 23919; + public static final int CRYSTAL_CROWN_23921 = 23921; + public static final int CRYSTAL_CROWN_23923 = 23923; + public static final int CRYSTAL_CROWN_23925 = 23925; + public static final int CRYSTAL_OF_ITHELL = 23927; + public static final int CRYSTAL_OF_IORWERTH = 23929; + public static final int CRYSTAL_OF_TRAHAEARN = 23931; + public static final int CRYSTAL_OF_CADARN = 23933; + public static final int CRYSTAL_OF_CRWYS = 23935; + public static final int CRYSTAL_OF_MEILYR = 23937; + public static final int CRYSTAL_OF_HEFIN = 23939; + public static final int CRYSTAL_OF_AMLODD = 23941; + public static final int ELVEN_SIGNET = 23943; + public static final int ETERNAL_TELEPORT_CRYSTAL = 23946; + public static final int ELVEN_DAWN = 23948; + public static final int ENHANCED_CRYSTAL_KEY = 23951; + public static final int CRYSTAL_TOOL_SEED = 23953; + public static final int CRYSTAL_ARMOUR_SEED = 23956; + public static final int ENHANCED_CRYSTAL_TELEPORT_SEED = 23959; + public static final int CRYSTAL_SHARD = 23962; + public static final int CRYSTAL_DUST_23964 = 23964; + public static final int CRYSTAL_HELM = 23971; + public static final int CRYSTAL_HELM_INACTIVE = 23973; + public static final int CRYSTAL_BODY = 23975; + public static final int CRYSTAL_BODY_INACTIVE = 23977; + public static final int CRYSTAL_LEGS = 23979; + public static final int CRYSTAL_LEGS_INACTIVE = 23981; + public static final int CRYSTAL_BOW = 23983; + public static final int CRYSTAL_BOW_INACTIVE = 23985; + public static final int CRYSTAL_HALBERD = 23987; + public static final int CRYSTAL_HALBERD_INACTIVE = 23989; + public static final int CRYSTAL_SHIELD = 23991; + public static final int CRYSTAL_SHIELD_INACTIVE = 23993; + public static final int BLADE_OF_SAELDOR = 23995; + public static final int BLADE_OF_SAELDOR_INACTIVE = 23997; + public static final int CRYSTAL_GRAIL = 24000; + public static final int ELVEN_BOOTS = 24003; + public static final int ELVEN_GLOVES = 24006; + public static final int ELVEN_TOP = 24009; + public static final int ELVEN_SKIRT = 24012; + public static final int ELVEN_TOP_24015 = 24015; + public static final int ELVEN_SKIRT_24018 = 24018; + public static final int ELVEN_TOP_24021 = 24021; + public static final int ELVEN_LEGWEAR = 24024; + public static final int ELVEN_TOP_24027 = 24027; + public static final int MEMORIAM_CRYSTAL_1 = 24030; + public static final int MEMORIAM_CRYSTAL_2 = 24031; + public static final int MEMORIAM_CRYSTAL_3 = 24032; + public static final int MEMORIAM_CRYSTAL_4 = 24033; + public static final int DRAGONSTONE_FULL_HELM = 24034; + public static final int DRAGONSTONE_PLATEBODY = 24037; + public static final int DRAGONSTONE_PLATELEGS = 24040; + public static final int DRAGONSTONE_BOOTS = 24043; + public static final int DRAGONSTONE_GAUNTLETS = 24046; + public static final int CRAZED_SCRIBBLES = 24049; + public static final int A_DEAR_FRIEND = 24051; + public static final int ON_LEPRECHAUNS = 24053; + public static final int BLOODY_DIARY = 24055; + public static final int THE_EIGHT_CLANS = 24057; + public static final int GOLLWYNS_FINAL_STATEMENT = 24059; + public static final int NIFF__HARRY = 24061; + public static final int SOGGY_JOURNAL = 24063; + public static final int EBRILLS_JOURNAL = 24065; + public static final int STAINED_JOURNAL = 24067; + public static final int THE_TRUTH_BEHIND_THE_MYTH_EXCERPT = 24069; + public static final int THE_LIVING_STATUES = 24071; + public static final int THE_SPURNED_DEMON = 24073; + public static final int LEGENDS_OF_THE_MOUNTAIN = 24075; /* 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 b01aef27c1..07f0ec664f 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -1569,8 +1569,6 @@ public final class NullItemID public static final int NULL_4177 = 4177; public static final int NULL_4208 = 4208; public static final int NULL_4210 = 4210; - public static final int NULL_4213 = 4213; - public static final int NULL_4235 = 4235; public static final int NULL_4279 = 4279; public static final int NULL_4280 = 4280; public static final int NULL_4281 = 4281; @@ -7987,12 +7985,6 @@ public final class NullItemID public static final int NULL_16885 = 16885; public static final int NULL_16886 = 16886; public static final int NULL_16887 = 16887; - public static final int NULL_16888 = 16888; - public static final int NULL_16889 = 16889; - public static final int NULL_16890 = 16890; - public static final int NULL_16891 = 16891; - public static final int NULL_16892 = 16892; - public static final int NULL_16893 = 16893; public static final int NULL_16894 = 16894; public static final int NULL_16895 = 16895; public static final int NULL_16896 = 16896; @@ -12510,5 +12502,196 @@ public final class NullItemID public static final int NULL_23645 = 23645; public static final int NULL_23647 = 23647; public static final int NULL_23651 = 23651; + public static final int NULL_23656 = 23656; + public static final int NULL_23658 = 23658; + public static final int NULL_23660 = 23660; + public static final int NULL_23662 = 23662; + public static final int NULL_23663 = 23663; + public static final int NULL_23664 = 23664; + public static final int NULL_23665 = 23665; + public static final int NULL_23666 = 23666; + public static final int NULL_23668 = 23668; + public static final int NULL_23669 = 23669; + public static final int NULL_23671 = 23671; + public static final int NULL_23672 = 23672; + public static final int NULL_23674 = 23674; + public static final int NULL_23676 = 23676; + public static final int NULL_23678 = 23678; + public static final int NULL_23679 = 23679; + public static final int NULL_23681 = 23681; + public static final int NULL_23683 = 23683; + public static final int NULL_23684 = 23684; + public static final int NULL_23686 = 23686; + public static final int NULL_23687 = 23687; + public static final int NULL_23689 = 23689; + public static final int NULL_23690 = 23690; + public static final int NULL_23692 = 23692; + public static final int NULL_23693 = 23693; + public static final int NULL_23695 = 23695; + public static final int NULL_23696 = 23696; + public static final int NULL_23698 = 23698; + public static final int NULL_23699 = 23699; + public static final int NULL_23701 = 23701; + public static final int NULL_23702 = 23702; + public static final int NULL_23704 = 23704; + public static final int NULL_23705 = 23705; + public static final int NULL_23707 = 23707; + public static final int NULL_23708 = 23708; + public static final int NULL_23710 = 23710; + public static final int NULL_23711 = 23711; + public static final int NULL_23713 = 23713; + public static final int NULL_23714 = 23714; + public static final int NULL_23716 = 23716; + public static final int NULL_23717 = 23717; + public static final int NULL_23719 = 23719; + public static final int NULL_23720 = 23720; + public static final int NULL_23722 = 23722; + public static final int NULL_23723 = 23723; + public static final int NULL_23725 = 23725; + public static final int NULL_23726 = 23726; + public static final int NULL_23728 = 23728; + public static final int NULL_23729 = 23729; + public static final int NULL_23731 = 23731; + public static final int NULL_23732 = 23732; + public static final int NULL_23734 = 23734; + public static final int NULL_23735 = 23735; + public static final int NULL_23737 = 23737; + public static final int NULL_23738 = 23738; + public static final int NULL_23740 = 23740; + public static final int NULL_23741 = 23741; + public static final int NULL_23743 = 23743; + public static final int NULL_23744 = 23744; + public static final int NULL_23746 = 23746; + public static final int NULL_23747 = 23747; + public static final int NULL_23749 = 23749; + public static final int NULL_23750 = 23750; + public static final int NULL_23752 = 23752; + public static final int NULL_23753 = 23753; + public static final int NULL_23755 = 23755; + public static final int NULL_23756 = 23756; + public static final int NULL_23758 = 23758; + public static final int NULL_23761 = 23761; + public static final int NULL_23763 = 23763; + public static final int NULL_23765 = 23765; + public static final int NULL_23766 = 23766; + public static final int NULL_23767 = 23767; + public static final int NULL_23769 = 23769; + public static final int NULL_23772 = 23772; + public static final int NULL_23774 = 23774; + public static final int NULL_23786 = 23786; + public static final int NULL_23788 = 23788; + public static final int NULL_23790 = 23790; + public static final int NULL_23797 = 23797; + public static final int NULL_23799 = 23799; + public static final int NULL_23801 = 23801; + public static final int NULL_23803 = 23803; + public static final int NULL_23805 = 23805; + public static final int NULL_23807 = 23807; + public static final int NULL_23809 = 23809; + public static final int NULL_23811 = 23811; + public static final int NULL_23813 = 23813; + public static final int NULL_23819 = 23819; + public static final int NULL_23825 = 23825; + public static final int NULL_23826 = 23826; + public static final int NULL_23827 = 23827; + public static final int NULL_23828 = 23828; + public static final int NULL_23829 = 23829; + public static final int NULL_23860 = 23860; + public static final int NULL_23909 = 23909; + public static final int NULL_23910 = 23910; + public static final int NULL_23912 = 23912; + public static final int NULL_23914 = 23914; + public static final int NULL_23916 = 23916; + public static final int NULL_23918 = 23918; + public static final int NULL_23920 = 23920; + public static final int NULL_23922 = 23922; + public static final int NULL_23924 = 23924; + public static final int NULL_23926 = 23926; + public static final int NULL_23928 = 23928; + public static final int NULL_23930 = 23930; + public static final int NULL_23932 = 23932; + public static final int NULL_23934 = 23934; + public static final int NULL_23936 = 23936; + public static final int NULL_23938 = 23938; + public static final int NULL_23940 = 23940; + public static final int NULL_23942 = 23942; + public static final int NULL_23944 = 23944; + public static final int NULL_23945 = 23945; + public static final int NULL_23947 = 23947; + public static final int NULL_23949 = 23949; + public static final int NULL_23950 = 23950; + public static final int NULL_23952 = 23952; + public static final int NULL_23954 = 23954; + public static final int NULL_23955 = 23955; + public static final int NULL_23957 = 23957; + public static final int NULL_23958 = 23958; + public static final int NULL_23960 = 23960; + public static final int NULL_23961 = 23961; + public static final int NULL_23963 = 23963; + public static final int NULL_23965 = 23965; + public static final int NULL_23966 = 23966; + public static final int NULL_23967 = 23967; + public static final int NULL_23968 = 23968; + public static final int NULL_23969 = 23969; + public static final int NULL_23970 = 23970; + public static final int NULL_23972 = 23972; + public static final int NULL_23974 = 23974; + public static final int NULL_23976 = 23976; + public static final int NULL_23978 = 23978; + public static final int NULL_23980 = 23980; + public static final int NULL_23982 = 23982; + public static final int NULL_23984 = 23984; + public static final int NULL_23986 = 23986; + public static final int NULL_23988 = 23988; + public static final int NULL_23990 = 23990; + public static final int NULL_23992 = 23992; + public static final int NULL_23994 = 23994; + public static final int NULL_23996 = 23996; + public static final int NULL_23998 = 23998; + public static final int NULL_23999 = 23999; + public static final int NULL_24001 = 24001; + public static final int NULL_24002 = 24002; + public static final int NULL_24004 = 24004; + public static final int NULL_24005 = 24005; + public static final int NULL_24007 = 24007; + public static final int NULL_24008 = 24008; + public static final int NULL_24010 = 24010; + public static final int NULL_24011 = 24011; + public static final int NULL_24013 = 24013; + public static final int NULL_24014 = 24014; + public static final int NULL_24016 = 24016; + public static final int NULL_24017 = 24017; + public static final int NULL_24019 = 24019; + public static final int NULL_24020 = 24020; + public static final int NULL_24022 = 24022; + public static final int NULL_24023 = 24023; + public static final int NULL_24025 = 24025; + public static final int NULL_24026 = 24026; + public static final int NULL_24028 = 24028; + public static final int NULL_24029 = 24029; + public static final int NULL_24035 = 24035; + public static final int NULL_24036 = 24036; + public static final int NULL_24038 = 24038; + public static final int NULL_24039 = 24039; + public static final int NULL_24041 = 24041; + public static final int NULL_24042 = 24042; + public static final int NULL_24044 = 24044; + public static final int NULL_24045 = 24045; + public static final int NULL_24047 = 24047; + public static final int NULL_24048 = 24048; + public static final int NULL_24050 = 24050; + public static final int NULL_24052 = 24052; + public static final int NULL_24054 = 24054; + public static final int NULL_24056 = 24056; + public static final int NULL_24058 = 24058; + public static final int NULL_24060 = 24060; + public static final int NULL_24062 = 24062; + public static final int NULL_24064 = 24064; + public static final int NULL_24066 = 24066; + public static final int NULL_24068 = 24068; + public static final int NULL_24070 = 24070; + public static final int NULL_24072 = 24072; + public static final int NULL_24074 = 24074; + public static final int NULL_24076 = 24076; /* This file is automatically generated. Do not edit. */ } From 04a27556ae2f5db6a8ad512fb6a285559f98a22a Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 25 Jul 2019 09:33:31 +0000 Subject: [PATCH 25/30] Update Item variations to 2019-07-25-rev181 --- .../src/main/resources/item_variations.json | 298 ++++++++++++++++-- 1 file changed, 266 insertions(+), 32 deletions(-) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 140d8d911b..38efbf2e15 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -174,7 +174,13 @@ "vial": [ 229, 2389, - 2390 + 2390, + 23839, + 23879 + ], + "pestle and mortar": [ + 233, + 23865 ], "unicorn horn": [ 237, @@ -186,6 +192,8 @@ ], "key": [ 275, + 293, + 298, 423, 1543, 1544, @@ -230,10 +238,6 @@ 21057, 21058 ], - "a key": [ - 293, - 298 - ], "glarials urn": [ 296, 297 @@ -252,7 +256,8 @@ 357, 367, 369, - 20854 + 20854, + 23873 ], "shark": [ 385, @@ -656,7 +661,7 @@ 8987, 9665 ], - "bronze fire arrows": [ + "bronze fire arrow": [ 598, 942 ], @@ -1337,7 +1342,12 @@ 23179, 23180, 23181, - 23182 + 23182, + 23770, + 23814, + 23815, + 23816, + 23817 ], "radimus notes": [ 714, @@ -1605,6 +1615,10 @@ 11046, 20587 ], + "flier": [ + 956, + 23670 + ], "skull": [ 964, 965 @@ -2131,17 +2145,14 @@ 1481, 1482, 1483, - 1484 + 1484, + 23812 ], "paladins badge": [ 1488, 1489, 1490 ], - "a magic scroll": [ - 1505, - 6949 - ], "logs": [ 1511, 2511 @@ -2661,7 +2672,8 @@ 2380, 2381, 2382, - 2383 + 2383, + 23802 ], "silverlight key": [ 2399, @@ -2770,23 +2782,23 @@ 2529, 17152 ], - "iron fire arrows": [ + "iron fire arrow": [ 2532, 2533 ], - "steel fire arrows": [ + "steel fire arrow": [ 2534, 2535 ], - "mithril fire arrows": [ + "mithril fire arrow": [ 2536, 2537 ], - "adamant fire arrows": [ + "adamant fire arrow": [ 2538, 2539 ], - "rune fire arrows": [ + "rune fire arrow": [ 2540, 2541 ], @@ -3431,6 +3443,10 @@ 4041, 4042 ], + "explosive potion": [ + 4045, + 23818 + ], "decorative sword": [ 4068, 4503, @@ -3595,6 +3611,7 @@ ], "crystal bow": [ 4212, + 4213, 4214, 4215, 4216, @@ -3615,7 +3632,14 @@ 11755, 11756, 11757, - 11758 + 11758, + 16888, + 16889, + 23901, + 23902, + 23903, + 23983, + 23985 ], "crystal shield": [ 4224, @@ -3629,6 +3653,7 @@ 4232, 4233, 4234, + 4235, 11759, 11760, 11761, @@ -3639,7 +3664,11 @@ 11766, 11767, 11768, - 11769 + 11769, + 16890, + 16891, + 23991, + 23993 ], "nettle tea": [ 4239, @@ -4586,16 +4615,13 @@ 6065, 10621 ], - "mourner trousers": [ - 6066, - 6067 - ], "teleport crystal": [ 6099, 6100, 6101, 6102, - 13102 + 13102, + 23904 ], "ghostly boots": [ 6106, @@ -4843,13 +4869,40 @@ 6617, 10618 ], + "hand mirror": [ + 6639, + 23775 + ], + "red crystal": [ + 6640, + 23776 + ], + "yellow crystal": [ + 6641, + 23777 + ], + "green crystal": [ + 6642, + 23778, + 23783 + ], "cyan crystal": [ 6643, - 22366 + 22366, + 23779 + ], + "blue crystal": [ + 6644, + 23780 + ], + "magenta crystal": [ + 6645, + 23781 ], "fractured crystal": [ 6646, - 6647 + 6647, + 23784 ], "newly made crystal": [ 6651, @@ -7241,7 +7294,7 @@ 11229, 20389 ], - "dragon fire arrows": [ + "dragon fire arrow": [ 11217, 11222 ], @@ -7720,7 +7773,8 @@ ], "dragon pickaxe": [ 11920, - 12797 + 12797, + 23677 ], "malediction ward": [ 11924, @@ -8141,7 +8195,14 @@ 13098, 13099, 13100, - 13101 + 13101, + 16892, + 16893, + 23895, + 23896, + 23897, + 23987, + 23989 ], "vetion jr": [ 13179, @@ -8598,6 +8659,12 @@ 20781, 21059 ], + "corrupted helm": [ + 20838, + 23840, + 23841, + 23842 + ], "dragon thrownaxe": [ 20849, 21207 @@ -8780,7 +8847,7 @@ 21334, 21336 ], - "amethyst fire arrows": [ + "amethyst fire arrow": [ 21328, 21330 ], @@ -9235,5 +9302,172 @@ "giant egg sac": [ 23517, 23520 + ], + "crystal seedling": [ + 23655, + 23657 + ], + "crystal axe": [ + 23673, + 23675, + 23862 + ], + "crystal pickaxe": [ + 23680, + 23682, + 23863 + ], + "divine super combat potion": [ + 23685, + 23688, + 23691, + 23694 + ], + "divine super attack potion": [ + 23697, + 23700, + 23703, + 23706 + ], + "divine super strength potion": [ + 23709, + 23712, + 23715, + 23718 + ], + "divine super defence potion": [ + 23721, + 23724, + 23727, + 23730 + ], + "divine ranging potion": [ + 23733, + 23736, + 23739, + 23742 + ], + "divine magic potion": [ + 23745, + 23748, + 23751, + 23754 + ], + "crystal harpoon": [ + 23762, + 23764, + 23864 + ], + "crystal dust": [ + 23804, + 23867, + 23964 + ], + "crystal seed": [ + 23808, + 23810 + ], + "weapon frame": [ + 23834, + 23871 + ], + "grym leaf": [ + 23835, + 23875 + ], + "linum tirinum": [ + 23836, + 23876 + ], + "phren bark": [ + 23838, + 23878 + ], + "corrupted body": [ + 23843, + 23844, + 23845 + ], + "corrupted legs": [ + 23846, + 23847, + 23848 + ], + "corrupted halberd": [ + 23849, + 23850, + 23851 + ], + "corrupted staff": [ + 23852, + 23853, + 23854 + ], + "corrupted bow": [ + 23855, + 23856, + 23857 + ], + "egniol potion": [ + 23882, + 23883, + 23884, + 23885 + ], + "crystal helm": [ + 23886, + 23887, + 23888, + 23971, + 23973 + ], + "crystal body": [ + 23889, + 23890, + 23891, + 23975, + 23977 + ], + "crystal legs": [ + 23892, + 23893, + 23894, + 23979, + 23981 + ], + "crystal staff": [ + 23898, + 23899, + 23900 + ], + "crystal crown": [ + 23911, + 23913, + 23915, + 23917, + 23919, + 23921, + 23923, + 23925 + ], + "blade of saeldor": [ + 23995, + 23997 + ], + "elven top": [ + 24009, + 24015, + 24021, + 24027 + ], + "elven skirt": [ + 24012, + 24018 + ], + "memoriam crystal": [ + 24030, + 24031, + 24032, + 24033 ] } \ No newline at end of file From 072b3068a9f7c2f9c692687943f5bf7bc250492d Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 25 Jul 2019 09:33:32 +0000 Subject: [PATCH 26/30] Update Object IDs to 2019-07-25-rev181 --- .../java/net/runelite/api/NullObjectID.java | 1751 ++++++++++++++++- .../main/java/net/runelite/api/ObjectID.java | 806 +++++++- 2 files changed, 2498 insertions(+), 59 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 1cd637ed47..a85010a980 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -704,6 +704,8 @@ public final class NullObjectID public static final int NULL_1529 = 1529; public static final int NULL_1530 = 1530; public static final int NULL_1532 = 1532; + public static final int NULL_1537 = 1537; + public static final int NULL_1538 = 1538; public static final int NULL_1539 = 1539; public static final int NULL_1542 = 1542; public static final int NULL_1545 = 1545; @@ -1041,6 +1043,8 @@ public final class NullObjectID public static final int NULL_1984 = 1984; public static final int NULL_2001 = 2001; public static final int NULL_2003 = 2003; + public static final int NULL_2004 = 2004; + public static final int NULL_2005 = 2005; public static final int NULL_2007 = 2007; public static final int NULL_2008 = 2008; public static final int NULL_2009 = 2009; @@ -1051,6 +1055,7 @@ public final class NullObjectID public static final int NULL_2027 = 2027; public static final int NULL_2040 = 2040; public static final int NULL_2042 = 2042; + public static final int NULL_2043 = 2043; public static final int NULL_2045 = 2045; public static final int NULL_2046 = 2046; public static final int NULL_2047 = 2047; @@ -1059,6 +1064,7 @@ public final class NullObjectID public static final int NULL_2055 = 2055; public static final int NULL_2059 = 2059; public static final int NULL_2061 = 2061; + public static final int NULL_2067 = 2067; public static final int NULL_2070 = 2070; public static final int NULL_2080 = 2080; public static final int NULL_2093 = 2093; @@ -1179,6 +1185,9 @@ public final class NullObjectID public static final int NULL_2509 = 2509; public static final int NULL_2510 = 2510; public static final int NULL_2532 = 2532; + public static final int NULL_2534 = 2534; + public static final int NULL_2535 = 2535; + public static final int NULL_2536 = 2536; public static final int NULL_2554 = 2554; public static final int NULL_2555 = 2555; public static final int NULL_2556 = 2556; @@ -1499,6 +1508,7 @@ public final class NullObjectID public static final int NULL_3356 = 3356; public static final int NULL_3357 = 3357; public static final int NULL_3358 = 3358; + public static final int NULL_3361 = 3361; public static final int NULL_3363 = 3363; public static final int NULL_3368 = 3368; public static final int NULL_3369 = 3369; @@ -1767,12 +1777,12 @@ public final class NullObjectID public static final int NULL_3909 = 3909; public static final int NULL_3910 = 3910; public static final int NULL_3911 = 3911; - public static final int NULL_3920 = 3920; public static final int NULL_3926 = 3926; public static final int NULL_3934 = 3934; public static final int NULL_3935 = 3935; public static final int NULL_3936 = 3936; public static final int NULL_3940 = 3940; + public static final int NULL_3941 = 3941; public static final int NULL_3942 = 3942; public static final int NULL_3943 = 3943; public static final int NULL_3948 = 3948; @@ -3643,6 +3653,13 @@ public final class NullObjectID public static final int NULL_8782 = 8782; public static final int NULL_8784 = 8784; public static final int NULL_8794 = 8794; + public static final int NULL_8799 = 8799; + public static final int NULL_8801 = 8801; + public static final int NULL_8802 = 8802; + public static final int NULL_8803 = 8803; + public static final int NULL_8804 = 8804; + public static final int NULL_8805 = 8805; + public static final int NULL_8806 = 8806; public static final int NULL_8822 = 8822; public static final int NULL_8823 = 8823; public static final int NULL_8824 = 8824; @@ -3658,8 +3675,6 @@ public final class NullObjectID public static final int NULL_8838 = 8838; public static final int NULL_8839 = 8839; public static final int NULL_8841 = 8841; - public static final int NULL_8844 = 8844; - public static final int NULL_8845 = 8845; public static final int NULL_8846 = 8846; public static final int NULL_8847 = 8847; public static final int NULL_8848 = 8848; @@ -16239,5 +16254,1735 @@ public final class NullObjectID public static final int NULL_34902 = 34902; public static final int NULL_34903 = 34903; public static final int NULL_34904 = 34904; + public static final int NULL_34906 = 34906; + public static final int NULL_34919 = 34919; + public static final int NULL_34920 = 34920; + public static final int NULL_34921 = 34921; + public static final int NULL_34922 = 34922; + public static final int NULL_34945 = 34945; + public static final int NULL_34946 = 34946; + public static final int NULL_34952 = 34952; + public static final int NULL_34953 = 34953; + public static final int NULL_34970 = 34970; + public static final int NULL_34971 = 34971; + public static final int NULL_34972 = 34972; + public static final int NULL_34973 = 34973; + public static final int NULL_34974 = 34974; + public static final int NULL_34975 = 34975; + public static final int NULL_34976 = 34976; + public static final int NULL_34977 = 34977; + public static final int NULL_34978 = 34978; + public static final int NULL_34979 = 34979; + public static final int NULL_34980 = 34980; + public static final int NULL_34981 = 34981; + public static final int NULL_34982 = 34982; + public static final int NULL_34983 = 34983; + public static final int NULL_34984 = 34984; + public static final int NULL_34985 = 34985; + public static final int NULL_34986 = 34986; + public static final int NULL_34987 = 34987; + public static final int NULL_34988 = 34988; + public static final int NULL_34989 = 34989; + public static final int NULL_34990 = 34990; + public static final int NULL_34991 = 34991; + public static final int NULL_34992 = 34992; + public static final int NULL_34993 = 34993; + public static final int NULL_34994 = 34994; + public static final int NULL_34995 = 34995; + public static final int NULL_34996 = 34996; + public static final int NULL_34997 = 34997; + public static final int NULL_34998 = 34998; + public static final int NULL_34999 = 34999; + public static final int NULL_35000 = 35000; + public static final int NULL_35001 = 35001; + public static final int NULL_35002 = 35002; + public static final int NULL_35003 = 35003; + public static final int NULL_35004 = 35004; + public static final int NULL_35005 = 35005; + public static final int NULL_35006 = 35006; + public static final int NULL_35007 = 35007; + public static final int NULL_35008 = 35008; + public static final int NULL_35009 = 35009; + public static final int NULL_35010 = 35010; + public static final int NULL_35011 = 35011; + public static final int NULL_35012 = 35012; + public static final int NULL_35013 = 35013; + public static final int NULL_35014 = 35014; + public static final int NULL_35015 = 35015; + public static final int NULL_35016 = 35016; + public static final int NULL_35017 = 35017; + public static final int NULL_35018 = 35018; + public static final int NULL_35019 = 35019; + public static final int NULL_35020 = 35020; + public static final int NULL_35021 = 35021; + public static final int NULL_35022 = 35022; + public static final int NULL_35023 = 35023; + public static final int NULL_35024 = 35024; + public static final int NULL_35025 = 35025; + public static final int NULL_35026 = 35026; + public static final int NULL_35027 = 35027; + public static final int NULL_35028 = 35028; + public static final int NULL_35029 = 35029; + public static final int NULL_35030 = 35030; + public static final int NULL_35031 = 35031; + public static final int NULL_35032 = 35032; + public static final int NULL_35039 = 35039; + public static final int NULL_35040 = 35040; + public static final int NULL_35041 = 35041; + public static final int NULL_35042 = 35042; + public static final int NULL_35043 = 35043; + public static final int NULL_35044 = 35044; + public static final int NULL_35045 = 35045; + public static final int NULL_35046 = 35046; + public static final int NULL_35047 = 35047; + public static final int NULL_35048 = 35048; + public static final int NULL_35049 = 35049; + public static final int NULL_35050 = 35050; + public static final int NULL_35051 = 35051; + public static final int NULL_35052 = 35052; + public static final int NULL_35053 = 35053; + public static final int NULL_35054 = 35054; + public static final int NULL_35055 = 35055; + public static final int NULL_35056 = 35056; + public static final int NULL_35057 = 35057; + public static final int NULL_35058 = 35058; + public static final int NULL_35059 = 35059; + public static final int NULL_35060 = 35060; + public static final int NULL_35061 = 35061; + public static final int NULL_35062 = 35062; + public static final int NULL_35063 = 35063; + public static final int NULL_35064 = 35064; + public static final int NULL_35065 = 35065; + public static final int NULL_35066 = 35066; + public static final int NULL_35067 = 35067; + public static final int NULL_35068 = 35068; + public static final int NULL_35069 = 35069; + public static final int NULL_35070 = 35070; + public static final int NULL_35071 = 35071; + public static final int NULL_35072 = 35072; + public static final int NULL_35073 = 35073; + public static final int NULL_35074 = 35074; + public static final int NULL_35212 = 35212; + public static final int NULL_35213 = 35213; + public static final int NULL_35214 = 35214; + public static final int NULL_35215 = 35215; + public static final int NULL_35216 = 35216; + public static final int NULL_35217 = 35217; + public static final int NULL_35218 = 35218; + public static final int NULL_35219 = 35219; + public static final int NULL_35220 = 35220; + public static final int NULL_35253 = 35253; + public static final int NULL_35254 = 35254; + public static final int NULL_35255 = 35255; + public static final int NULL_35256 = 35256; + public static final int NULL_35259 = 35259; + public static final int NULL_35260 = 35260; + public static final int NULL_35262 = 35262; + public static final int NULL_35263 = 35263; + public static final int NULL_35264 = 35264; + public static final int NULL_35265 = 35265; + public static final int NULL_35268 = 35268; + public static final int NULL_35269 = 35269; + public static final int NULL_35270 = 35270; + public static final int NULL_35271 = 35271; + public static final int NULL_35279 = 35279; + public static final int NULL_35280 = 35280; + public static final int NULL_35281 = 35281; + public static final int NULL_35282 = 35282; + public static final int NULL_35294 = 35294; + public static final int NULL_35295 = 35295; + public static final int NULL_35296 = 35296; + public static final int NULL_35297 = 35297; + public static final int NULL_35298 = 35298; + public static final int NULL_35299 = 35299; + public static final int NULL_35303 = 35303; + public static final int NULL_35304 = 35304; + public static final int NULL_35307 = 35307; + public static final int NULL_35308 = 35308; + public static final int NULL_35309 = 35309; + public static final int NULL_35310 = 35310; + public static final int NULL_35315 = 35315; + public static final int NULL_35316 = 35316; + public static final int NULL_35318 = 35318; + public static final int NULL_35319 = 35319; + public static final int NULL_35320 = 35320; + public static final int NULL_35321 = 35321; + public static final int NULL_35324 = 35324; + public static final int NULL_35325 = 35325; + public static final int NULL_35326 = 35326; + public static final int NULL_35327 = 35327; + public static final int NULL_35328 = 35328; + public static final int NULL_35329 = 35329; + public static final int NULL_35332 = 35332; + public static final int NULL_35333 = 35333; + public static final int NULL_35334 = 35334; + public static final int NULL_35335 = 35335; + public static final int NULL_35336 = 35336; + public static final int NULL_35337 = 35337; + public static final int NULL_35338 = 35338; + public static final int NULL_35339 = 35339; + public static final int NULL_35340 = 35340; + public static final int NULL_35341 = 35341; + public static final int NULL_35342 = 35342; + public static final int NULL_35343 = 35343; + public static final int NULL_35344 = 35344; + public static final int NULL_35345 = 35345; + public static final int NULL_35346 = 35346; + public static final int NULL_35347 = 35347; + public static final int NULL_35348 = 35348; + public static final int NULL_35349 = 35349; + public static final int NULL_35350 = 35350; + public static final int NULL_35351 = 35351; + public static final int NULL_35352 = 35352; + public static final int NULL_35353 = 35353; + public static final int NULL_35354 = 35354; + public static final int NULL_35355 = 35355; + public static final int NULL_35356 = 35356; + public static final int NULL_35357 = 35357; + public static final int NULL_35358 = 35358; + public static final int NULL_35359 = 35359; + public static final int NULL_35360 = 35360; + public static final int NULL_35361 = 35361; + public static final int NULL_35362 = 35362; + public static final int NULL_35363 = 35363; + public static final int NULL_35364 = 35364; + public static final int NULL_35365 = 35365; + public static final int NULL_35366 = 35366; + public static final int NULL_35367 = 35367; + public static final int NULL_35368 = 35368; + public static final int NULL_35369 = 35369; + public static final int NULL_35370 = 35370; + public static final int NULL_35371 = 35371; + public static final int NULL_35372 = 35372; + public static final int NULL_35373 = 35373; + public static final int NULL_35374 = 35374; + public static final int NULL_35375 = 35375; + public static final int NULL_35376 = 35376; + public static final int NULL_35377 = 35377; + public static final int NULL_35378 = 35378; + public static final int NULL_35379 = 35379; + public static final int NULL_35380 = 35380; + public static final int NULL_35381 = 35381; + public static final int NULL_35382 = 35382; + public static final int NULL_35383 = 35383; + public static final int NULL_35384 = 35384; + public static final int NULL_35385 = 35385; + public static final int NULL_35386 = 35386; + public static final int NULL_35390 = 35390; + public static final int NULL_35391 = 35391; + public static final int NULL_35392 = 35392; + public static final int NULL_35393 = 35393; + public static final int NULL_35394 = 35394; + public static final int NULL_35395 = 35395; + public static final int NULL_35396 = 35396; + public static final int NULL_35397 = 35397; + public static final int NULL_35398 = 35398; + public static final int NULL_35399 = 35399; + public static final int NULL_35400 = 35400; + public static final int NULL_35401 = 35401; + public static final int NULL_35402 = 35402; + public static final int NULL_35403 = 35403; + public static final int NULL_35404 = 35404; + public static final int NULL_35405 = 35405; + public static final int NULL_35406 = 35406; + public static final int NULL_35407 = 35407; + public static final int NULL_35408 = 35408; + public static final int NULL_35409 = 35409; + public static final int NULL_35410 = 35410; + public static final int NULL_35411 = 35411; + public static final int NULL_35412 = 35412; + public static final int NULL_35413 = 35413; + public static final int NULL_35414 = 35414; + public static final int NULL_35415 = 35415; + public static final int NULL_35416 = 35416; + public static final int NULL_35417 = 35417; + public static final int NULL_35418 = 35418; + public static final int NULL_35419 = 35419; + public static final int NULL_35420 = 35420; + public static final int NULL_35421 = 35421; + public static final int NULL_35422 = 35422; + public static final int NULL_35423 = 35423; + public static final int NULL_35424 = 35424; + public static final int NULL_35425 = 35425; + public static final int NULL_35426 = 35426; + public static final int NULL_35427 = 35427; + public static final int NULL_35428 = 35428; + public static final int NULL_35429 = 35429; + public static final int NULL_35430 = 35430; + public static final int NULL_35431 = 35431; + public static final int NULL_35432 = 35432; + public static final int NULL_35433 = 35433; + public static final int NULL_35449 = 35449; + public static final int NULL_35450 = 35450; + public static final int NULL_35468 = 35468; + public static final int NULL_35469 = 35469; + public static final int NULL_35470 = 35470; + public static final int NULL_35471 = 35471; + public static final int NULL_35472 = 35472; + public static final int NULL_35473 = 35473; + public static final int NULL_35474 = 35474; + public static final int NULL_35475 = 35475; + public static final int NULL_35476 = 35476; + public static final int NULL_35477 = 35477; + public static final int NULL_35478 = 35478; + public static final int NULL_35479 = 35479; + public static final int NULL_35480 = 35480; + public static final int NULL_35481 = 35481; + public static final int NULL_35482 = 35482; + public static final int NULL_35483 = 35483; + public static final int NULL_35484 = 35484; + public static final int NULL_35485 = 35485; + public static final int NULL_35486 = 35486; + public static final int NULL_35487 = 35487; + public static final int NULL_35488 = 35488; + public static final int NULL_35489 = 35489; + public static final int NULL_35490 = 35490; + public static final int NULL_35491 = 35491; + public static final int NULL_35492 = 35492; + public static final int NULL_35493 = 35493; + public static final int NULL_35494 = 35494; + public static final int NULL_35495 = 35495; + public static final int NULL_35496 = 35496; + public static final int NULL_35497 = 35497; + public static final int NULL_35498 = 35498; + public static final int NULL_35499 = 35499; + public static final int NULL_35500 = 35500; + public static final int NULL_35501 = 35501; + public static final int NULL_35502 = 35502; + public static final int NULL_35503 = 35503; + public static final int NULL_35504 = 35504; + public static final int NULL_35505 = 35505; + public static final int NULL_35506 = 35506; + public static final int NULL_35507 = 35507; + public static final int NULL_35508 = 35508; + public static final int NULL_35509 = 35509; + public static final int NULL_35510 = 35510; + public static final int NULL_35511 = 35511; + public static final int NULL_35512 = 35512; + public static final int NULL_35513 = 35513; + public static final int NULL_35514 = 35514; + public static final int NULL_35515 = 35515; + public static final int NULL_35516 = 35516; + public static final int NULL_35517 = 35517; + public static final int NULL_35518 = 35518; + public static final int NULL_35519 = 35519; + public static final int NULL_35520 = 35520; + public static final int NULL_35521 = 35521; + public static final int NULL_35522 = 35522; + public static final int NULL_35523 = 35523; + public static final int NULL_35524 = 35524; + public static final int NULL_35525 = 35525; + public static final int NULL_35526 = 35526; + public static final int NULL_35527 = 35527; + public static final int NULL_35528 = 35528; + public static final int NULL_35529 = 35529; + public static final int NULL_35530 = 35530; + public static final int NULL_35531 = 35531; + public static final int NULL_35532 = 35532; + public static final int NULL_35533 = 35533; + public static final int NULL_35534 = 35534; + public static final int NULL_35535 = 35535; + public static final int NULL_35536 = 35536; + public static final int NULL_35537 = 35537; + public static final int NULL_35538 = 35538; + public static final int NULL_35539 = 35539; + public static final int NULL_35540 = 35540; + public static final int NULL_35541 = 35541; + public static final int NULL_35542 = 35542; + public static final int NULL_35543 = 35543; + public static final int NULL_35544 = 35544; + public static final int NULL_35545 = 35545; + public static final int NULL_35546 = 35546; + public static final int NULL_35547 = 35547; + public static final int NULL_35548 = 35548; + public static final int NULL_35549 = 35549; + public static final int NULL_35550 = 35550; + public static final int NULL_35551 = 35551; + public static final int NULL_35552 = 35552; + public static final int NULL_35553 = 35553; + public static final int NULL_35554 = 35554; + public static final int NULL_35555 = 35555; + public static final int NULL_35556 = 35556; + public static final int NULL_35557 = 35557; + public static final int NULL_35558 = 35558; + public static final int NULL_35559 = 35559; + public static final int NULL_35560 = 35560; + public static final int NULL_35561 = 35561; + public static final int NULL_35562 = 35562; + public static final int NULL_35563 = 35563; + public static final int NULL_35564 = 35564; + public static final int NULL_35565 = 35565; + public static final int NULL_35566 = 35566; + public static final int NULL_35567 = 35567; + public static final int NULL_35568 = 35568; + public static final int NULL_35569 = 35569; + public static final int NULL_35570 = 35570; + public static final int NULL_35571 = 35571; + public static final int NULL_35572 = 35572; + public static final int NULL_35573 = 35573; + public static final int NULL_35574 = 35574; + public static final int NULL_35575 = 35575; + public static final int NULL_35576 = 35576; + public static final int NULL_35577 = 35577; + public static final int NULL_35578 = 35578; + public static final int NULL_35579 = 35579; + public static final int NULL_35580 = 35580; + public static final int NULL_35581 = 35581; + public static final int NULL_35582 = 35582; + public static final int NULL_35583 = 35583; + public static final int NULL_35584 = 35584; + public static final int NULL_35585 = 35585; + public static final int NULL_35586 = 35586; + public static final int NULL_35587 = 35587; + public static final int NULL_35588 = 35588; + public static final int NULL_35589 = 35589; + public static final int NULL_35590 = 35590; + public static final int NULL_35591 = 35591; + public static final int NULL_35592 = 35592; + public static final int NULL_35593 = 35593; + public static final int NULL_35594 = 35594; + public static final int NULL_35595 = 35595; + public static final int NULL_35596 = 35596; + public static final int NULL_35597 = 35597; + public static final int NULL_35598 = 35598; + public static final int NULL_35599 = 35599; + public static final int NULL_35600 = 35600; + public static final int NULL_35601 = 35601; + public static final int NULL_35602 = 35602; + public static final int NULL_35603 = 35603; + public static final int NULL_35604 = 35604; + public static final int NULL_35605 = 35605; + public static final int NULL_35606 = 35606; + public static final int NULL_35607 = 35607; + public static final int NULL_35608 = 35608; + public static final int NULL_35609 = 35609; + public static final int NULL_35610 = 35610; + public static final int NULL_35611 = 35611; + public static final int NULL_35612 = 35612; + public static final int NULL_35613 = 35613; + public static final int NULL_35614 = 35614; + public static final int NULL_35615 = 35615; + public static final int NULL_35616 = 35616; + public static final int NULL_35617 = 35617; + public static final int NULL_35618 = 35618; + public static final int NULL_35619 = 35619; + public static final int NULL_35620 = 35620; + public static final int NULL_35621 = 35621; + public static final int NULL_35622 = 35622; + public static final int NULL_35623 = 35623; + public static final int NULL_35624 = 35624; + public static final int NULL_35625 = 35625; + public static final int NULL_35626 = 35626; + public static final int NULL_35627 = 35627; + public static final int NULL_35628 = 35628; + public static final int NULL_35629 = 35629; + public static final int NULL_35630 = 35630; + public static final int NULL_35631 = 35631; + public static final int NULL_35632 = 35632; + public static final int NULL_35633 = 35633; + public static final int NULL_35634 = 35634; + public static final int NULL_35635 = 35635; + public static final int NULL_35636 = 35636; + public static final int NULL_35637 = 35637; + public static final int NULL_35638 = 35638; + public static final int NULL_35639 = 35639; + public static final int NULL_35640 = 35640; + public static final int NULL_35641 = 35641; + public static final int NULL_35642 = 35642; + public static final int NULL_35643 = 35643; + public static final int NULL_35644 = 35644; + public static final int NULL_35645 = 35645; + public static final int NULL_35646 = 35646; + public static final int NULL_35647 = 35647; + public static final int NULL_35648 = 35648; + public static final int NULL_35649 = 35649; + public static final int NULL_35650 = 35650; + public static final int NULL_35651 = 35651; + public static final int NULL_35652 = 35652; + public static final int NULL_35653 = 35653; + public static final int NULL_35654 = 35654; + public static final int NULL_35655 = 35655; + public static final int NULL_35656 = 35656; + public static final int NULL_35657 = 35657; + public static final int NULL_35658 = 35658; + public static final int NULL_35659 = 35659; + public static final int NULL_35660 = 35660; + public static final int NULL_35661 = 35661; + public static final int NULL_35662 = 35662; + public static final int NULL_35663 = 35663; + public static final int NULL_35664 = 35664; + public static final int NULL_35665 = 35665; + public static final int NULL_35666 = 35666; + public static final int NULL_35667 = 35667; + public static final int NULL_35668 = 35668; + public static final int NULL_35669 = 35669; + public static final int NULL_35670 = 35670; + public static final int NULL_35671 = 35671; + public static final int NULL_35672 = 35672; + public static final int NULL_35673 = 35673; + public static final int NULL_35674 = 35674; + public static final int NULL_35675 = 35675; + public static final int NULL_35676 = 35676; + public static final int NULL_35677 = 35677; + public static final int NULL_35678 = 35678; + public static final int NULL_35679 = 35679; + public static final int NULL_35680 = 35680; + public static final int NULL_35681 = 35681; + public static final int NULL_35682 = 35682; + public static final int NULL_35683 = 35683; + public static final int NULL_35684 = 35684; + public static final int NULL_35685 = 35685; + public static final int NULL_35686 = 35686; + public static final int NULL_35687 = 35687; + public static final int NULL_35688 = 35688; + public static final int NULL_35689 = 35689; + public static final int NULL_35690 = 35690; + public static final int NULL_35691 = 35691; + public static final int NULL_35692 = 35692; + public static final int NULL_35693 = 35693; + public static final int NULL_35694 = 35694; + public static final int NULL_35695 = 35695; + public static final int NULL_35696 = 35696; + public static final int NULL_35697 = 35697; + public static final int NULL_35698 = 35698; + public static final int NULL_35699 = 35699; + public static final int NULL_35700 = 35700; + public static final int NULL_35701 = 35701; + public static final int NULL_35702 = 35702; + public static final int NULL_35703 = 35703; + public static final int NULL_35704 = 35704; + public static final int NULL_35705 = 35705; + public static final int NULL_35706 = 35706; + public static final int NULL_35707 = 35707; + public static final int NULL_35708 = 35708; + public static final int NULL_35709 = 35709; + public static final int NULL_35710 = 35710; + public static final int NULL_35711 = 35711; + public static final int NULL_35712 = 35712; + public static final int NULL_35713 = 35713; + public static final int NULL_35714 = 35714; + public static final int NULL_35715 = 35715; + public static final int NULL_35716 = 35716; + public static final int NULL_35717 = 35717; + public static final int NULL_35718 = 35718; + public static final int NULL_35719 = 35719; + public static final int NULL_35720 = 35720; + public static final int NULL_35721 = 35721; + public static final int NULL_35722 = 35722; + public static final int NULL_35723 = 35723; + public static final int NULL_35724 = 35724; + public static final int NULL_35725 = 35725; + public static final int NULL_35726 = 35726; + public static final int NULL_35727 = 35727; + public static final int NULL_35728 = 35728; + public static final int NULL_35729 = 35729; + public static final int NULL_35730 = 35730; + public static final int NULL_35731 = 35731; + public static final int NULL_35732 = 35732; + public static final int NULL_35733 = 35733; + public static final int NULL_35734 = 35734; + public static final int NULL_35735 = 35735; + public static final int NULL_35736 = 35736; + public static final int NULL_35737 = 35737; + public static final int NULL_35738 = 35738; + public static final int NULL_35739 = 35739; + public static final int NULL_35740 = 35740; + public static final int NULL_35741 = 35741; + public static final int NULL_35742 = 35742; + public static final int NULL_35743 = 35743; + public static final int NULL_35744 = 35744; + public static final int NULL_35745 = 35745; + public static final int NULL_35746 = 35746; + public static final int NULL_35747 = 35747; + public static final int NULL_35748 = 35748; + public static final int NULL_35749 = 35749; + public static final int NULL_35750 = 35750; + public static final int NULL_35751 = 35751; + public static final int NULL_35752 = 35752; + public static final int NULL_35753 = 35753; + public static final int NULL_35754 = 35754; + public static final int NULL_35755 = 35755; + public static final int NULL_35756 = 35756; + public static final int NULL_35757 = 35757; + public static final int NULL_35758 = 35758; + public static final int NULL_35759 = 35759; + public static final int NULL_35760 = 35760; + public static final int NULL_35761 = 35761; + public static final int NULL_35762 = 35762; + public static final int NULL_35763 = 35763; + public static final int NULL_35764 = 35764; + public static final int NULL_35765 = 35765; + public static final int NULL_35766 = 35766; + public static final int NULL_35767 = 35767; + public static final int NULL_35768 = 35768; + public static final int NULL_35769 = 35769; + public static final int NULL_35770 = 35770; + public static final int NULL_35771 = 35771; + public static final int NULL_35772 = 35772; + public static final int NULL_35773 = 35773; + public static final int NULL_35774 = 35774; + public static final int NULL_35775 = 35775; + public static final int NULL_35776 = 35776; + public static final int NULL_35777 = 35777; + public static final int NULL_35778 = 35778; + public static final int NULL_35779 = 35779; + public static final int NULL_35780 = 35780; + public static final int NULL_35781 = 35781; + public static final int NULL_35782 = 35782; + public static final int NULL_35783 = 35783; + public static final int NULL_35784 = 35784; + public static final int NULL_35785 = 35785; + public static final int NULL_35786 = 35786; + public static final int NULL_35787 = 35787; + public static final int NULL_35788 = 35788; + public static final int NULL_35789 = 35789; + public static final int NULL_35790 = 35790; + public static final int NULL_35813 = 35813; + public static final int NULL_35814 = 35814; + public static final int NULL_35850 = 35850; + public static final int NULL_35851 = 35851; + public static final int NULL_35852 = 35852; + public static final int NULL_35880 = 35880; + public static final int NULL_35895 = 35895; + public static final int NULL_35902 = 35902; + public static final int NULL_35903 = 35903; + public static final int NULL_35904 = 35904; + public static final int NULL_35905 = 35905; + public static final int NULL_35906 = 35906; + public static final int NULL_35907 = 35907; + public static final int NULL_35908 = 35908; + public static final int NULL_35909 = 35909; + public static final int NULL_35910 = 35910; + public static final int NULL_35911 = 35911; + public static final int NULL_35943 = 35943; + public static final int NULL_35951 = 35951; + public static final int NULL_35952 = 35952; + public static final int NULL_35953 = 35953; + public static final int NULL_35987 = 35987; + public static final int NULL_35990 = 35990; + public static final int NULL_35991 = 35991; + public static final int NULL_35993 = 35993; + public static final int NULL_35995 = 35995; + public static final int NULL_35996 = 35996; + public static final int NULL_35997 = 35997; + public static final int NULL_36000 = 36000; + public static final int NULL_36001 = 36001; + public static final int NULL_36002 = 36002; + public static final int NULL_36003 = 36003; + public static final int NULL_36004 = 36004; + public static final int NULL_36005 = 36005; + public static final int NULL_36006 = 36006; + public static final int NULL_36007 = 36007; + public static final int NULL_36008 = 36008; + public static final int NULL_36009 = 36009; + public static final int NULL_36010 = 36010; + public static final int NULL_36011 = 36011; + public static final int NULL_36012 = 36012; + public static final int NULL_36013 = 36013; + public static final int NULL_36014 = 36014; + public static final int NULL_36015 = 36015; + public static final int NULL_36016 = 36016; + public static final int NULL_36017 = 36017; + public static final int NULL_36018 = 36018; + public static final int NULL_36019 = 36019; + public static final int NULL_36020 = 36020; + public static final int NULL_36021 = 36021; + public static final int NULL_36022 = 36022; + public static final int NULL_36023 = 36023; + public static final int NULL_36024 = 36024; + public static final int NULL_36025 = 36025; + public static final int NULL_36026 = 36026; + public static final int NULL_36027 = 36027; + public static final int NULL_36028 = 36028; + public static final int NULL_36029 = 36029; + public static final int NULL_36030 = 36030; + public static final int NULL_36031 = 36031; + public static final int NULL_36032 = 36032; + public static final int NULL_36033 = 36033; + public static final int NULL_36034 = 36034; + public static final int NULL_36035 = 36035; + public static final int NULL_36036 = 36036; + public static final int NULL_36037 = 36037; + public static final int NULL_36038 = 36038; + public static final int NULL_36039 = 36039; + public static final int NULL_36040 = 36040; + public static final int NULL_36041 = 36041; + public static final int NULL_36042 = 36042; + public static final int NULL_36043 = 36043; + public static final int NULL_36044 = 36044; + public static final int NULL_36045 = 36045; + public static final int NULL_36046 = 36046; + public static final int NULL_36047 = 36047; + public static final int NULL_36048 = 36048; + public static final int NULL_36049 = 36049; + public static final int NULL_36050 = 36050; + public static final int NULL_36051 = 36051; + public static final int NULL_36052 = 36052; + public static final int NULL_36053 = 36053; + public static final int NULL_36054 = 36054; + public static final int NULL_36055 = 36055; + public static final int NULL_36056 = 36056; + public static final int NULL_36057 = 36057; + public static final int NULL_36058 = 36058; + public static final int NULL_36059 = 36059; + public static final int NULL_36085 = 36085; + public static final int NULL_36089 = 36089; + public static final int NULL_36090 = 36090; + public static final int NULL_36091 = 36091; + public static final int NULL_36092 = 36092; + public static final int NULL_36093 = 36093; + public static final int NULL_36094 = 36094; + public static final int NULL_36096 = 36096; + public static final int NULL_36098 = 36098; + public static final int NULL_36099 = 36099; + public static final int NULL_36100 = 36100; + public static final int NULL_36103 = 36103; + public static final int NULL_36104 = 36104; + public static final int NULL_36105 = 36105; + public static final int NULL_36106 = 36106; + public static final int NULL_36107 = 36107; + public static final int NULL_36108 = 36108; + public static final int NULL_36109 = 36109; + public static final int NULL_36110 = 36110; + public static final int NULL_36111 = 36111; + public static final int NULL_36112 = 36112; + public static final int NULL_36113 = 36113; + public static final int NULL_36114 = 36114; + public static final int NULL_36115 = 36115; + public static final int NULL_36116 = 36116; + public static final int NULL_36117 = 36117; + public static final int NULL_36118 = 36118; + public static final int NULL_36119 = 36119; + public static final int NULL_36120 = 36120; + public static final int NULL_36121 = 36121; + public static final int NULL_36122 = 36122; + public static final int NULL_36123 = 36123; + public static final int NULL_36124 = 36124; + public static final int NULL_36125 = 36125; + public static final int NULL_36126 = 36126; + public static final int NULL_36127 = 36127; + public static final int NULL_36128 = 36128; + public static final int NULL_36129 = 36129; + public static final int NULL_36130 = 36130; + public static final int NULL_36131 = 36131; + public static final int NULL_36132 = 36132; + public static final int NULL_36133 = 36133; + public static final int NULL_36134 = 36134; + public static final int NULL_36135 = 36135; + public static final int NULL_36136 = 36136; + public static final int NULL_36137 = 36137; + public static final int NULL_36138 = 36138; + public static final int NULL_36139 = 36139; + public static final int NULL_36140 = 36140; + public static final int NULL_36141 = 36141; + public static final int NULL_36142 = 36142; + public static final int NULL_36143 = 36143; + public static final int NULL_36144 = 36144; + public static final int NULL_36145 = 36145; + public static final int NULL_36146 = 36146; + public static final int NULL_36147 = 36147; + public static final int NULL_36148 = 36148; + public static final int NULL_36149 = 36149; + public static final int NULL_36150 = 36150; + public static final int NULL_36151 = 36151; + public static final int NULL_36152 = 36152; + public static final int NULL_36153 = 36153; + public static final int NULL_36154 = 36154; + public static final int NULL_36155 = 36155; + public static final int NULL_36156 = 36156; + public static final int NULL_36157 = 36157; + public static final int NULL_36158 = 36158; + public static final int NULL_36159 = 36159; + public static final int NULL_36160 = 36160; + public static final int NULL_36161 = 36161; + public static final int NULL_36162 = 36162; + public static final int NULL_36163 = 36163; + public static final int NULL_36164 = 36164; + public static final int NULL_36165 = 36165; + public static final int NULL_36166 = 36166; + public static final int NULL_36167 = 36167; + public static final int NULL_36168 = 36168; + public static final int NULL_36169 = 36169; + public static final int NULL_36170 = 36170; + public static final int NULL_36171 = 36171; + public static final int NULL_36172 = 36172; + public static final int NULL_36173 = 36173; + public static final int NULL_36174 = 36174; + public static final int NULL_36175 = 36175; + public static final int NULL_36176 = 36176; + public static final int NULL_36177 = 36177; + public static final int NULL_36178 = 36178; + public static final int NULL_36179 = 36179; + public static final int NULL_36180 = 36180; + public static final int NULL_36181 = 36181; + public static final int NULL_36182 = 36182; + public static final int NULL_36183 = 36183; + public static final int NULL_36184 = 36184; + public static final int NULL_36185 = 36185; + public static final int NULL_36186 = 36186; + public static final int NULL_36187 = 36187; + public static final int NULL_36188 = 36188; + public static final int NULL_36189 = 36189; + public static final int NULL_36190 = 36190; + public static final int NULL_36191 = 36191; + public static final int NULL_36211 = 36211; + public static final int NULL_36212 = 36212; + public static final int NULL_36213 = 36213; + public static final int NULL_36214 = 36214; + public static final int NULL_36216 = 36216; + public static final int NULL_36220 = 36220; + public static final int NULL_36222 = 36222; + public static final int NULL_36223 = 36223; + public static final int NULL_36224 = 36224; + public static final int NULL_36226 = 36226; + public static final int NULL_36230 = 36230; + public static final int NULL_36239 = 36239; + public static final int NULL_36241 = 36241; + public static final int NULL_36242 = 36242; + public static final int NULL_36243 = 36243; + public static final int NULL_36244 = 36244; + public static final int NULL_36245 = 36245; + public static final int NULL_36246 = 36246; + public static final int NULL_36247 = 36247; + public static final int NULL_36248 = 36248; + public static final int NULL_36249 = 36249; + public static final int NULL_36250 = 36250; + public static final int NULL_36251 = 36251; + public static final int NULL_36252 = 36252; + public static final int NULL_36255 = 36255; + public static final int NULL_36256 = 36256; + public static final int NULL_36257 = 36257; + public static final int NULL_36258 = 36258; + public static final int NULL_36259 = 36259; + public static final int NULL_36260 = 36260; + public static final int NULL_36261 = 36261; + public static final int NULL_36262 = 36262; + public static final int NULL_36263 = 36263; + public static final int NULL_36264 = 36264; + public static final int NULL_36265 = 36265; + public static final int NULL_36266 = 36266; + public static final int NULL_36267 = 36267; + public static final int NULL_36268 = 36268; + public static final int NULL_36269 = 36269; + public static final int NULL_36270 = 36270; + public static final int NULL_36271 = 36271; + public static final int NULL_36272 = 36272; + public static final int NULL_36273 = 36273; + public static final int NULL_36274 = 36274; + public static final int NULL_36275 = 36275; + public static final int NULL_36276 = 36276; + public static final int NULL_36277 = 36277; + public static final int NULL_36278 = 36278; + public static final int NULL_36279 = 36279; + public static final int NULL_36280 = 36280; + public static final int NULL_36281 = 36281; + public static final int NULL_36282 = 36282; + public static final int NULL_36283 = 36283; + public static final int NULL_36284 = 36284; + public static final int NULL_36285 = 36285; + public static final int NULL_36286 = 36286; + public static final int NULL_36287 = 36287; + public static final int NULL_36288 = 36288; + public static final int NULL_36289 = 36289; + public static final int NULL_36290 = 36290; + public static final int NULL_36291 = 36291; + public static final int NULL_36292 = 36292; + public static final int NULL_36293 = 36293; + public static final int NULL_36294 = 36294; + public static final int NULL_36295 = 36295; + public static final int NULL_36296 = 36296; + public static final int NULL_36297 = 36297; + public static final int NULL_36298 = 36298; + public static final int NULL_36299 = 36299; + public static final int NULL_36300 = 36300; + public static final int NULL_36301 = 36301; + public static final int NULL_36302 = 36302; + public static final int NULL_36303 = 36303; + public static final int NULL_36304 = 36304; + public static final int NULL_36305 = 36305; + public static final int NULL_36306 = 36306; + public static final int NULL_36307 = 36307; + public static final int NULL_36308 = 36308; + public static final int NULL_36309 = 36309; + public static final int NULL_36310 = 36310; + public static final int NULL_36311 = 36311; + public static final int NULL_36312 = 36312; + public static final int NULL_36313 = 36313; + public static final int NULL_36314 = 36314; + public static final int NULL_36315 = 36315; + public static final int NULL_36316 = 36316; + public static final int NULL_36317 = 36317; + public static final int NULL_36318 = 36318; + public static final int NULL_36319 = 36319; + public static final int NULL_36320 = 36320; + public static final int NULL_36321 = 36321; + public static final int NULL_36322 = 36322; + public static final int NULL_36323 = 36323; + public static final int NULL_36324 = 36324; + public static final int NULL_36325 = 36325; + public static final int NULL_36326 = 36326; + public static final int NULL_36327 = 36327; + public static final int NULL_36328 = 36328; + public static final int NULL_36329 = 36329; + public static final int NULL_36330 = 36330; + public static final int NULL_36331 = 36331; + public static final int NULL_36332 = 36332; + public static final int NULL_36333 = 36333; + public static final int NULL_36334 = 36334; + public static final int NULL_36335 = 36335; + public static final int NULL_36336 = 36336; + public static final int NULL_36337 = 36337; + public static final int NULL_36338 = 36338; + public static final int NULL_36339 = 36339; + public static final int NULL_36340 = 36340; + public static final int NULL_36341 = 36341; + public static final int NULL_36342 = 36342; + public static final int NULL_36343 = 36343; + public static final int NULL_36344 = 36344; + public static final int NULL_36345 = 36345; + public static final int NULL_36346 = 36346; + public static final int NULL_36347 = 36347; + public static final int NULL_36348 = 36348; + public static final int NULL_36349 = 36349; + public static final int NULL_36350 = 36350; + public static final int NULL_36351 = 36351; + public static final int NULL_36352 = 36352; + public static final int NULL_36353 = 36353; + public static final int NULL_36354 = 36354; + public static final int NULL_36355 = 36355; + public static final int NULL_36356 = 36356; + public static final int NULL_36357 = 36357; + public static final int NULL_36358 = 36358; + public static final int NULL_36359 = 36359; + public static final int NULL_36360 = 36360; + public static final int NULL_36361 = 36361; + public static final int NULL_36362 = 36362; + public static final int NULL_36363 = 36363; + public static final int NULL_36364 = 36364; + public static final int NULL_36365 = 36365; + public static final int NULL_36366 = 36366; + public static final int NULL_36367 = 36367; + public static final int NULL_36368 = 36368; + public static final int NULL_36369 = 36369; + public static final int NULL_36370 = 36370; + public static final int NULL_36371 = 36371; + public static final int NULL_36372 = 36372; + public static final int NULL_36373 = 36373; + public static final int NULL_36374 = 36374; + public static final int NULL_36375 = 36375; + public static final int NULL_36376 = 36376; + public static final int NULL_36377 = 36377; + public static final int NULL_36378 = 36378; + public static final int NULL_36379 = 36379; + public static final int NULL_36380 = 36380; + public static final int NULL_36381 = 36381; + public static final int NULL_36382 = 36382; + public static final int NULL_36383 = 36383; + public static final int NULL_36384 = 36384; + public static final int NULL_36385 = 36385; + public static final int NULL_36386 = 36386; + public static final int NULL_36388 = 36388; + public static final int NULL_36389 = 36389; + public static final int NULL_36391 = 36391; + public static final int NULL_36392 = 36392; + public static final int NULL_36393 = 36393; + public static final int NULL_36394 = 36394; + public static final int NULL_36395 = 36395; + public static final int NULL_36396 = 36396; + public static final int NULL_36397 = 36397; + public static final int NULL_36398 = 36398; + public static final int NULL_36399 = 36399; + public static final int NULL_36400 = 36400; + public static final int NULL_36401 = 36401; + public static final int NULL_36402 = 36402; + public static final int NULL_36403 = 36403; + public static final int NULL_36404 = 36404; + public static final int NULL_36405 = 36405; + public static final int NULL_36406 = 36406; + public static final int NULL_36407 = 36407; + public static final int NULL_36408 = 36408; + public static final int NULL_36409 = 36409; + public static final int NULL_36410 = 36410; + public static final int NULL_36411 = 36411; + public static final int NULL_36412 = 36412; + public static final int NULL_36413 = 36413; + public static final int NULL_36414 = 36414; + public static final int NULL_36415 = 36415; + public static final int NULL_36416 = 36416; + public static final int NULL_36417 = 36417; + public static final int NULL_36418 = 36418; + public static final int NULL_36419 = 36419; + public static final int NULL_36420 = 36420; + public static final int NULL_36421 = 36421; + public static final int NULL_36422 = 36422; + public static final int NULL_36423 = 36423; + public static final int NULL_36424 = 36424; + public static final int NULL_36425 = 36425; + public static final int NULL_36426 = 36426; + public static final int NULL_36427 = 36427; + public static final int NULL_36428 = 36428; + public static final int NULL_36429 = 36429; + public static final int NULL_36430 = 36430; + public static final int NULL_36431 = 36431; + public static final int NULL_36432 = 36432; + public static final int NULL_36433 = 36433; + public static final int NULL_36434 = 36434; + public static final int NULL_36435 = 36435; + public static final int NULL_36436 = 36436; + public static final int NULL_36437 = 36437; + public static final int NULL_36438 = 36438; + public static final int NULL_36439 = 36439; + public static final int NULL_36440 = 36440; + public static final int NULL_36441 = 36441; + public static final int NULL_36442 = 36442; + public static final int NULL_36443 = 36443; + public static final int NULL_36444 = 36444; + public static final int NULL_36445 = 36445; + public static final int NULL_36446 = 36446; + public static final int NULL_36447 = 36447; + public static final int NULL_36448 = 36448; + public static final int NULL_36449 = 36449; + public static final int NULL_36450 = 36450; + public static final int NULL_36451 = 36451; + public static final int NULL_36452 = 36452; + public static final int NULL_36453 = 36453; + public static final int NULL_36454 = 36454; + public static final int NULL_36455 = 36455; + public static final int NULL_36456 = 36456; + public static final int NULL_36457 = 36457; + public static final int NULL_36458 = 36458; + public static final int NULL_36459 = 36459; + public static final int NULL_36460 = 36460; + public static final int NULL_36461 = 36461; + public static final int NULL_36462 = 36462; + public static final int NULL_36463 = 36463; + public static final int NULL_36464 = 36464; + public static final int NULL_36465 = 36465; + public static final int NULL_36466 = 36466; + public static final int NULL_36467 = 36467; + public static final int NULL_36468 = 36468; + public static final int NULL_36469 = 36469; + public static final int NULL_36470 = 36470; + public static final int NULL_36471 = 36471; + public static final int NULL_36472 = 36472; + public static final int NULL_36473 = 36473; + public static final int NULL_36474 = 36474; + public static final int NULL_36475 = 36475; + public static final int NULL_36476 = 36476; + public static final int NULL_36477 = 36477; + public static final int NULL_36478 = 36478; + public static final int NULL_36479 = 36479; + public static final int NULL_36480 = 36480; + public static final int NULL_36481 = 36481; + public static final int NULL_36482 = 36482; + public static final int NULL_36483 = 36483; + public static final int NULL_36484 = 36484; + public static final int NULL_36485 = 36485; + public static final int NULL_36486 = 36486; + public static final int NULL_36487 = 36487; + public static final int NULL_36488 = 36488; + public static final int NULL_36489 = 36489; + public static final int NULL_36507 = 36507; + public static final int NULL_36508 = 36508; + public static final int NULL_36509 = 36509; + public static final int NULL_36510 = 36510; + public static final int NULL_36511 = 36511; + public static final int NULL_36512 = 36512; + public static final int NULL_36513 = 36513; + public static final int NULL_36514 = 36514; + public static final int NULL_36515 = 36515; + public static final int NULL_36516 = 36516; + public static final int NULL_36517 = 36517; + public static final int NULL_36524 = 36524; + public static final int NULL_36525 = 36525; + public static final int NULL_36526 = 36526; + public static final int NULL_36527 = 36527; + public static final int NULL_36528 = 36528; + public static final int NULL_36529 = 36529; + public static final int NULL_36530 = 36530; + public static final int NULL_36531 = 36531; + public static final int NULL_36532 = 36532; + public static final int NULL_36533 = 36533; + public static final int NULL_36534 = 36534; + public static final int NULL_36535 = 36535; + public static final int NULL_36536 = 36536; + public static final int NULL_36537 = 36537; + public static final int NULL_36538 = 36538; + public static final int NULL_36539 = 36539; + public static final int NULL_36540 = 36540; + public static final int NULL_36541 = 36541; + public static final int NULL_36542 = 36542; + public static final int NULL_36543 = 36543; + public static final int NULL_36544 = 36544; + public static final int NULL_36545 = 36545; + public static final int NULL_36546 = 36546; + public static final int NULL_36547 = 36547; + public static final int NULL_36548 = 36548; + public static final int NULL_36549 = 36549; + public static final int NULL_36550 = 36550; + public static final int NULL_36551 = 36551; + public static final int NULL_36562 = 36562; + public static final int NULL_36565 = 36565; + public static final int NULL_36584 = 36584; + public static final int NULL_36585 = 36585; + public static final int NULL_36599 = 36599; + public static final int NULL_36601 = 36601; + public static final int NULL_36602 = 36602; + public static final int NULL_36603 = 36603; + public static final int NULL_36619 = 36619; + public static final int NULL_36620 = 36620; + public static final int NULL_36621 = 36621; + public static final int NULL_36622 = 36622; + public static final int NULL_36655 = 36655; + public static final int NULL_36656 = 36656; + public static final int NULL_36657 = 36657; + public static final int NULL_36658 = 36658; + public static final int NULL_36659 = 36659; + public static final int NULL_36696 = 36696; + public static final int NULL_36697 = 36697; + public static final int NULL_36700 = 36700; + public static final int NULL_36701 = 36701; + public static final int NULL_36702 = 36702; + public static final int NULL_36703 = 36703; + public static final int NULL_36704 = 36704; + public static final int NULL_36705 = 36705; + public static final int NULL_36706 = 36706; + public static final int NULL_36707 = 36707; + public static final int NULL_36708 = 36708; + public static final int NULL_36709 = 36709; + public static final int NULL_36710 = 36710; + public static final int NULL_36711 = 36711; + public static final int NULL_36712 = 36712; + public static final int NULL_36713 = 36713; + public static final int NULL_36714 = 36714; + public static final int NULL_36715 = 36715; + public static final int NULL_36716 = 36716; + public static final int NULL_36717 = 36717; + public static final int NULL_36718 = 36718; + public static final int NULL_36719 = 36719; + public static final int NULL_36720 = 36720; + public static final int NULL_36721 = 36721; + public static final int NULL_36722 = 36722; + public static final int NULL_36723 = 36723; + public static final int NULL_36724 = 36724; + public static final int NULL_36725 = 36725; + public static final int NULL_36726 = 36726; + public static final int NULL_36727 = 36727; + public static final int NULL_36728 = 36728; + public static final int NULL_36729 = 36729; + public static final int NULL_36730 = 36730; + public static final int NULL_36731 = 36731; + public static final int NULL_36732 = 36732; + public static final int NULL_36733 = 36733; + public static final int NULL_36734 = 36734; + public static final int NULL_36735 = 36735; + public static final int NULL_36736 = 36736; + public static final int NULL_36737 = 36737; + public static final int NULL_36738 = 36738; + public static final int NULL_36739 = 36739; + public static final int NULL_36740 = 36740; + public static final int NULL_36741 = 36741; + public static final int NULL_36742 = 36742; + public static final int NULL_36743 = 36743; + public static final int NULL_36744 = 36744; + public static final int NULL_36745 = 36745; + public static final int NULL_36746 = 36746; + public static final int NULL_36747 = 36747; + public static final int NULL_36748 = 36748; + public static final int NULL_36749 = 36749; + public static final int NULL_36750 = 36750; + public static final int NULL_36751 = 36751; + public static final int NULL_36752 = 36752; + public static final int NULL_36753 = 36753; + public static final int NULL_36754 = 36754; + public static final int NULL_36755 = 36755; + public static final int NULL_36756 = 36756; + public static final int NULL_36757 = 36757; + public static final int NULL_36758 = 36758; + public static final int NULL_36759 = 36759; + public static final int NULL_36760 = 36760; + public static final int NULL_36761 = 36761; + public static final int NULL_36762 = 36762; + public static final int NULL_36763 = 36763; + public static final int NULL_36764 = 36764; + public static final int NULL_36765 = 36765; + public static final int NULL_36766 = 36766; + public static final int NULL_36767 = 36767; + public static final int NULL_36768 = 36768; + public static final int NULL_36769 = 36769; + public static final int NULL_36770 = 36770; + public static final int NULL_36771 = 36771; + public static final int NULL_36772 = 36772; + public static final int NULL_36773 = 36773; + public static final int NULL_36774 = 36774; + public static final int NULL_36775 = 36775; + public static final int NULL_36776 = 36776; + public static final int NULL_36777 = 36777; + public static final int NULL_36778 = 36778; + public static final int NULL_36779 = 36779; + public static final int NULL_36780 = 36780; + public static final int NULL_36781 = 36781; + public static final int NULL_36782 = 36782; + public static final int NULL_36783 = 36783; + public static final int NULL_36784 = 36784; + public static final int NULL_36785 = 36785; + public static final int NULL_36786 = 36786; + public static final int NULL_36787 = 36787; + public static final int NULL_36788 = 36788; + public static final int NULL_36789 = 36789; + public static final int NULL_36790 = 36790; + public static final int NULL_36791 = 36791; + public static final int NULL_36792 = 36792; + public static final int NULL_36793 = 36793; + public static final int NULL_36794 = 36794; + public static final int NULL_36795 = 36795; + public static final int NULL_36796 = 36796; + public static final int NULL_36797 = 36797; + public static final int NULL_36798 = 36798; + public static final int NULL_36799 = 36799; + public static final int NULL_36800 = 36800; + public static final int NULL_36801 = 36801; + public static final int NULL_36802 = 36802; + public static final int NULL_36803 = 36803; + public static final int NULL_36804 = 36804; + public static final int NULL_36805 = 36805; + public static final int NULL_36806 = 36806; + public static final int NULL_36807 = 36807; + public static final int NULL_36808 = 36808; + public static final int NULL_36809 = 36809; + public static final int NULL_36810 = 36810; + public static final int NULL_36811 = 36811; + public static final int NULL_36812 = 36812; + public static final int NULL_36813 = 36813; + public static final int NULL_36814 = 36814; + public static final int NULL_36815 = 36815; + public static final int NULL_36816 = 36816; + public static final int NULL_36817 = 36817; + public static final int NULL_36818 = 36818; + public static final int NULL_36819 = 36819; + public static final int NULL_36820 = 36820; + public static final int NULL_36821 = 36821; + public static final int NULL_36822 = 36822; + public static final int NULL_36823 = 36823; + public static final int NULL_36824 = 36824; + public static final int NULL_36825 = 36825; + public static final int NULL_36826 = 36826; + public static final int NULL_36827 = 36827; + public static final int NULL_36828 = 36828; + public static final int NULL_36829 = 36829; + public static final int NULL_36830 = 36830; + public static final int NULL_36831 = 36831; + public static final int NULL_36832 = 36832; + public static final int NULL_36833 = 36833; + public static final int NULL_36834 = 36834; + public static final int NULL_36835 = 36835; + public static final int NULL_36836 = 36836; + public static final int NULL_36837 = 36837; + public static final int NULL_36838 = 36838; + public static final int NULL_36839 = 36839; + public static final int NULL_36840 = 36840; + public static final int NULL_36841 = 36841; + public static final int NULL_36842 = 36842; + public static final int NULL_36843 = 36843; + public static final int NULL_36844 = 36844; + public static final int NULL_36845 = 36845; + public static final int NULL_36846 = 36846; + public static final int NULL_36847 = 36847; + public static final int NULL_36848 = 36848; + public static final int NULL_36849 = 36849; + public static final int NULL_36850 = 36850; + public static final int NULL_36851 = 36851; + public static final int NULL_36852 = 36852; + public static final int NULL_36853 = 36853; + public static final int NULL_36854 = 36854; + public static final int NULL_36855 = 36855; + public static final int NULL_36856 = 36856; + public static final int NULL_36857 = 36857; + public static final int NULL_36858 = 36858; + public static final int NULL_36859 = 36859; + public static final int NULL_36860 = 36860; + public static final int NULL_36861 = 36861; + public static final int NULL_36862 = 36862; + public static final int NULL_36863 = 36863; + public static final int NULL_36864 = 36864; + public static final int NULL_36865 = 36865; + public static final int NULL_36866 = 36866; + public static final int NULL_36867 = 36867; + public static final int NULL_36868 = 36868; + public static final int NULL_36869 = 36869; + public static final int NULL_36870 = 36870; + public static final int NULL_36871 = 36871; + public static final int NULL_36872 = 36872; + public static final int NULL_36873 = 36873; + public static final int NULL_36874 = 36874; + public static final int NULL_36875 = 36875; + public static final int NULL_36876 = 36876; + public static final int NULL_36877 = 36877; + public static final int NULL_36878 = 36878; + public static final int NULL_36879 = 36879; + public static final int NULL_36880 = 36880; + public static final int NULL_36881 = 36881; + public static final int NULL_36882 = 36882; + public static final int NULL_36883 = 36883; + public static final int NULL_36884 = 36884; + public static final int NULL_36885 = 36885; + public static final int NULL_36886 = 36886; + public static final int NULL_36887 = 36887; + public static final int NULL_36888 = 36888; + public static final int NULL_36889 = 36889; + public static final int NULL_36890 = 36890; + public static final int NULL_36891 = 36891; + public static final int NULL_36892 = 36892; + public static final int NULL_36893 = 36893; + public static final int NULL_36894 = 36894; + public static final int NULL_36895 = 36895; + public static final int NULL_36896 = 36896; + public static final int NULL_36897 = 36897; + public static final int NULL_36898 = 36898; + public static final int NULL_36899 = 36899; + public static final int NULL_36900 = 36900; + public static final int NULL_36901 = 36901; + public static final int NULL_36902 = 36902; + public static final int NULL_36903 = 36903; + public static final int NULL_36904 = 36904; + public static final int NULL_36905 = 36905; + public static final int NULL_36906 = 36906; + public static final int NULL_36907 = 36907; + public static final int NULL_36908 = 36908; + public static final int NULL_36909 = 36909; + public static final int NULL_36910 = 36910; + public static final int NULL_36911 = 36911; + public static final int NULL_36912 = 36912; + public static final int NULL_36913 = 36913; + public static final int NULL_36914 = 36914; + public static final int NULL_36915 = 36915; + public static final int NULL_36916 = 36916; + public static final int NULL_36917 = 36917; + public static final int NULL_36918 = 36918; + public static final int NULL_36919 = 36919; + public static final int NULL_36920 = 36920; + public static final int NULL_36921 = 36921; + public static final int NULL_36922 = 36922; + public static final int NULL_36923 = 36923; + public static final int NULL_36924 = 36924; + public static final int NULL_36925 = 36925; + public static final int NULL_36926 = 36926; + public static final int NULL_36927 = 36927; + public static final int NULL_36928 = 36928; + public static final int NULL_36929 = 36929; + public static final int NULL_36930 = 36930; + public static final int NULL_36931 = 36931; + public static final int NULL_36932 = 36932; + public static final int NULL_36933 = 36933; + public static final int NULL_36934 = 36934; + public static final int NULL_36935 = 36935; + public static final int NULL_36936 = 36936; + public static final int NULL_36937 = 36937; + public static final int NULL_36938 = 36938; + public static final int NULL_36939 = 36939; + public static final int NULL_36940 = 36940; + public static final int NULL_36941 = 36941; + public static final int NULL_36942 = 36942; + public static final int NULL_36943 = 36943; + public static final int NULL_36944 = 36944; + public static final int NULL_36945 = 36945; + public static final int NULL_36946 = 36946; + public static final int NULL_36947 = 36947; + public static final int NULL_36948 = 36948; + public static final int NULL_36949 = 36949; + public static final int NULL_36950 = 36950; + public static final int NULL_36951 = 36951; + public static final int NULL_36952 = 36952; + public static final int NULL_36953 = 36953; + public static final int NULL_36954 = 36954; + public static final int NULL_36955 = 36955; + public static final int NULL_36956 = 36956; + public static final int NULL_36957 = 36957; + public static final int NULL_36958 = 36958; + public static final int NULL_36959 = 36959; + public static final int NULL_36960 = 36960; + public static final int NULL_36961 = 36961; + public static final int NULL_36962 = 36962; + public static final int NULL_36963 = 36963; + public static final int NULL_36964 = 36964; + public static final int NULL_36965 = 36965; + public static final int NULL_36966 = 36966; + public static final int NULL_36967 = 36967; + public static final int NULL_36968 = 36968; + public static final int NULL_36969 = 36969; + public static final int NULL_36970 = 36970; + public static final int NULL_36971 = 36971; + public static final int NULL_36972 = 36972; + public static final int NULL_36973 = 36973; + public static final int NULL_36974 = 36974; + public static final int NULL_36975 = 36975; + public static final int NULL_36976 = 36976; + public static final int NULL_36977 = 36977; + public static final int NULL_36978 = 36978; + public static final int NULL_36979 = 36979; + public static final int NULL_36980 = 36980; + public static final int NULL_36981 = 36981; + public static final int NULL_36982 = 36982; + public static final int NULL_36983 = 36983; + public static final int NULL_36984 = 36984; + public static final int NULL_36985 = 36985; + public static final int NULL_36986 = 36986; + public static final int NULL_36987 = 36987; + public static final int NULL_36988 = 36988; + public static final int NULL_36989 = 36989; + public static final int NULL_36990 = 36990; + public static final int NULL_36991 = 36991; + public static final int NULL_36992 = 36992; + public static final int NULL_36993 = 36993; + public static final int NULL_36994 = 36994; + public static final int NULL_36995 = 36995; + public static final int NULL_36996 = 36996; + public static final int NULL_36997 = 36997; + public static final int NULL_36998 = 36998; + public static final int NULL_36999 = 36999; + public static final int NULL_37000 = 37000; + public static final int NULL_37001 = 37001; + public static final int NULL_37002 = 37002; + public static final int NULL_37003 = 37003; + public static final int NULL_37004 = 37004; + public static final int NULL_37005 = 37005; + public static final int NULL_37006 = 37006; + public static final int NULL_37007 = 37007; + public static final int NULL_37008 = 37008; + public static final int NULL_37009 = 37009; + public static final int NULL_37010 = 37010; + public static final int NULL_37011 = 37011; + public static final int NULL_37012 = 37012; + public static final int NULL_37013 = 37013; + public static final int NULL_37014 = 37014; + public static final int NULL_37015 = 37015; + public static final int NULL_37016 = 37016; + public static final int NULL_37017 = 37017; + public static final int NULL_37018 = 37018; + public static final int NULL_37019 = 37019; + public static final int NULL_37020 = 37020; + public static final int NULL_37021 = 37021; + public static final int NULL_37022 = 37022; + public static final int NULL_37023 = 37023; + public static final int NULL_37024 = 37024; + public static final int NULL_37025 = 37025; + public static final int NULL_37026 = 37026; + public static final int NULL_37027 = 37027; + public static final int NULL_37028 = 37028; + public static final int NULL_37029 = 37029; + public static final int NULL_37030 = 37030; + public static final int NULL_37031 = 37031; + public static final int NULL_37032 = 37032; + public static final int NULL_37033 = 37033; + public static final int NULL_37034 = 37034; + public static final int NULL_37035 = 37035; + public static final int NULL_37036 = 37036; + public static final int NULL_37037 = 37037; + public static final int NULL_37038 = 37038; + public static final int NULL_37039 = 37039; + public static final int NULL_37040 = 37040; + public static final int NULL_37041 = 37041; + public static final int NULL_37042 = 37042; + public static final int NULL_37043 = 37043; + public static final int NULL_37044 = 37044; + public static final int NULL_37045 = 37045; + public static final int NULL_37046 = 37046; + public static final int NULL_37047 = 37047; + public static final int NULL_37048 = 37048; + public static final int NULL_37049 = 37049; + public static final int NULL_37050 = 37050; + public static final int NULL_37051 = 37051; + public static final int NULL_37052 = 37052; + public static final int NULL_37053 = 37053; + public static final int NULL_37054 = 37054; + public static final int NULL_37055 = 37055; + public static final int NULL_37056 = 37056; + public static final int NULL_37057 = 37057; + public static final int NULL_37058 = 37058; + public static final int NULL_37059 = 37059; + public static final int NULL_37060 = 37060; + public static final int NULL_37061 = 37061; + public static final int NULL_37062 = 37062; + public static final int NULL_37063 = 37063; + public static final int NULL_37064 = 37064; + public static final int NULL_37065 = 37065; + public static final int NULL_37066 = 37066; + public static final int NULL_37067 = 37067; + public static final int NULL_37068 = 37068; + public static final int NULL_37069 = 37069; + public static final int NULL_37070 = 37070; + public static final int NULL_37071 = 37071; + public static final int NULL_37072 = 37072; + public static final int NULL_37073 = 37073; + public static final int NULL_37074 = 37074; + public static final int NULL_37075 = 37075; + public static final int NULL_37076 = 37076; + public static final int NULL_37077 = 37077; + public static final int NULL_37078 = 37078; + public static final int NULL_37079 = 37079; + public static final int NULL_37080 = 37080; + public static final int NULL_37081 = 37081; + public static final int NULL_37082 = 37082; + public static final int NULL_37083 = 37083; + public static final int NULL_37084 = 37084; + public static final int NULL_37085 = 37085; + public static final int NULL_37086 = 37086; + public static final int NULL_37087 = 37087; + public static final int NULL_37088 = 37088; + public static final int NULL_37089 = 37089; + public static final int NULL_37090 = 37090; + public static final int NULL_37091 = 37091; + public static final int NULL_37092 = 37092; + public static final int NULL_37093 = 37093; + public static final int NULL_37094 = 37094; + public static final int NULL_37095 = 37095; + public static final int NULL_37096 = 37096; + public static final int NULL_37097 = 37097; + public static final int NULL_37098 = 37098; + public static final int NULL_37099 = 37099; + public static final int NULL_37100 = 37100; + public static final int NULL_37101 = 37101; + public static final int NULL_37102 = 37102; + public static final int NULL_37103 = 37103; + public static final int NULL_37104 = 37104; + public static final int NULL_37105 = 37105; + public static final int NULL_37106 = 37106; + public static final int NULL_37107 = 37107; + public static final int NULL_37108 = 37108; + public static final int NULL_37109 = 37109; + public static final int NULL_37110 = 37110; + public static final int NULL_37111 = 37111; + public static final int NULL_37112 = 37112; + public static final int NULL_37113 = 37113; + public static final int NULL_37114 = 37114; + public static final int NULL_37115 = 37115; + public static final int NULL_37116 = 37116; + public static final int NULL_37117 = 37117; + public static final int NULL_37118 = 37118; + public static final int NULL_37119 = 37119; + public static final int NULL_37120 = 37120; + public static final int NULL_37121 = 37121; + public static final int NULL_37122 = 37122; + public static final int NULL_37123 = 37123; + public static final int NULL_37124 = 37124; + public static final int NULL_37125 = 37125; + public static final int NULL_37126 = 37126; + public static final int NULL_37127 = 37127; + public static final int NULL_37128 = 37128; + public static final int NULL_37129 = 37129; + public static final int NULL_37130 = 37130; + public static final int NULL_37131 = 37131; + public static final int NULL_37132 = 37132; + public static final int NULL_37133 = 37133; + public static final int NULL_37134 = 37134; + public static final int NULL_37135 = 37135; + public static final int NULL_37136 = 37136; + public static final int NULL_37137 = 37137; + public static final int NULL_37138 = 37138; + public static final int NULL_37139 = 37139; + public static final int NULL_37140 = 37140; + public static final int NULL_37141 = 37141; + public static final int NULL_37142 = 37142; + public static final int NULL_37143 = 37143; + public static final int NULL_37144 = 37144; + public static final int NULL_37145 = 37145; + public static final int NULL_37146 = 37146; + public static final int NULL_37147 = 37147; + public static final int NULL_37148 = 37148; + public static final int NULL_37149 = 37149; + public static final int NULL_37150 = 37150; + public static final int NULL_37151 = 37151; + public static final int NULL_37152 = 37152; + public static final int NULL_37153 = 37153; + public static final int NULL_37154 = 37154; + public static final int NULL_37155 = 37155; + public static final int NULL_37156 = 37156; + public static final int NULL_37157 = 37157; + public static final int NULL_37158 = 37158; + public static final int NULL_37159 = 37159; + public static final int NULL_37160 = 37160; + public static final int NULL_37161 = 37161; + public static final int NULL_37162 = 37162; + public static final int NULL_37163 = 37163; + public static final int NULL_37164 = 37164; + public static final int NULL_37165 = 37165; + public static final int NULL_37166 = 37166; + public static final int NULL_37167 = 37167; + public static final int NULL_37168 = 37168; + public static final int NULL_37169 = 37169; + public static final int NULL_37170 = 37170; + public static final int NULL_37171 = 37171; + public static final int NULL_37172 = 37172; + public static final int NULL_37173 = 37173; + public static final int NULL_37174 = 37174; + public static final int NULL_37175 = 37175; + public static final int NULL_37176 = 37176; + public static final int NULL_37177 = 37177; + public static final int NULL_37178 = 37178; + public static final int NULL_37179 = 37179; + public static final int NULL_37180 = 37180; + public static final int NULL_37181 = 37181; + public static final int NULL_37182 = 37182; + public static final int NULL_37183 = 37183; + public static final int NULL_37184 = 37184; + public static final int NULL_37185 = 37185; + public static final int NULL_37186 = 37186; + public static final int NULL_37187 = 37187; + public static final int NULL_37188 = 37188; + public static final int NULL_37189 = 37189; + public static final int NULL_37190 = 37190; + public static final int NULL_37191 = 37191; + public static final int NULL_37192 = 37192; + public static final int NULL_37193 = 37193; + public static final int NULL_37194 = 37194; + public static final int NULL_37195 = 37195; + public static final int NULL_37196 = 37196; + public static final int NULL_37197 = 37197; + public static final int NULL_37198 = 37198; + public static final int NULL_37199 = 37199; + public static final int NULL_37200 = 37200; + public static final int NULL_37201 = 37201; + public static final int NULL_37202 = 37202; + public static final int NULL_37203 = 37203; + public static final int NULL_37204 = 37204; + public static final int NULL_37205 = 37205; + public static final int NULL_37206 = 37206; + public static final int NULL_37207 = 37207; + public static final int NULL_37208 = 37208; + public static final int NULL_37209 = 37209; + public static final int NULL_37210 = 37210; + public static final int NULL_37211 = 37211; + public static final int NULL_37212 = 37212; + public static final int NULL_37213 = 37213; + public static final int NULL_37214 = 37214; + public static final int NULL_37215 = 37215; + public static final int NULL_37216 = 37216; + public static final int NULL_37217 = 37217; + public static final int NULL_37218 = 37218; + public static final int NULL_37219 = 37219; + public static final int NULL_37220 = 37220; + public static final int NULL_37221 = 37221; + public static final int NULL_37222 = 37222; + public static final int NULL_37223 = 37223; + public static final int NULL_37224 = 37224; + public static final int NULL_37225 = 37225; + public static final int NULL_37226 = 37226; + public static final int NULL_37227 = 37227; + public static final int NULL_37228 = 37228; + public static final int NULL_37229 = 37229; + public static final int NULL_37230 = 37230; + public static final int NULL_37231 = 37231; + public static final int NULL_37232 = 37232; + public static final int NULL_37233 = 37233; + public static final int NULL_37234 = 37234; + public static final int NULL_37235 = 37235; + public static final int NULL_37236 = 37236; + public static final int NULL_37237 = 37237; + public static final int NULL_37238 = 37238; + public static final int NULL_37239 = 37239; + public static final int NULL_37240 = 37240; + public static final int NULL_37241 = 37241; + public static final int NULL_37242 = 37242; + public static final int NULL_37243 = 37243; + public static final int NULL_37244 = 37244; + public static final int NULL_37245 = 37245; + public static final int NULL_37246 = 37246; + public static final int NULL_37247 = 37247; + public static final int NULL_37248 = 37248; + public static final int NULL_37249 = 37249; + public static final int NULL_37250 = 37250; + public static final int NULL_37251 = 37251; + public static final int NULL_37252 = 37252; + public static final int NULL_37253 = 37253; + public static final int NULL_37254 = 37254; + public static final int NULL_37255 = 37255; + public static final int NULL_37256 = 37256; + public static final int NULL_37257 = 37257; + public static final int NULL_37258 = 37258; + public static final int NULL_37259 = 37259; + public static final int NULL_37260 = 37260; + public static final int NULL_37261 = 37261; + public static final int NULL_37262 = 37262; + public static final int NULL_37263 = 37263; + public static final int NULL_37264 = 37264; + public static final int NULL_37265 = 37265; + public static final int NULL_37266 = 37266; + public static final int NULL_37267 = 37267; + public static final int NULL_37268 = 37268; + public static final int NULL_37269 = 37269; + public static final int NULL_37270 = 37270; + public static final int NULL_37271 = 37271; + public static final int NULL_37272 = 37272; + public static final int NULL_37273 = 37273; + public static final int NULL_37274 = 37274; + public static final int NULL_37275 = 37275; + public static final int NULL_37276 = 37276; + public static final int NULL_37277 = 37277; + public static final int NULL_37278 = 37278; + public static final int NULL_37279 = 37279; + public static final int NULL_37280 = 37280; + public static final int NULL_37281 = 37281; + public static final int NULL_37282 = 37282; + public static final int NULL_37283 = 37283; + public static final int NULL_37284 = 37284; + public static final int NULL_37285 = 37285; + public static final int NULL_37286 = 37286; + public static final int NULL_37287 = 37287; + public static final int NULL_37288 = 37288; + public static final int NULL_37289 = 37289; + public static final int NULL_37290 = 37290; + public static final int NULL_37291 = 37291; + public static final int NULL_37292 = 37292; + public static final int NULL_37293 = 37293; + public static final int NULL_37294 = 37294; + public static final int NULL_37295 = 37295; + public static final int NULL_37296 = 37296; + public static final int NULL_37297 = 37297; + public static final int NULL_37298 = 37298; + public static final int NULL_37299 = 37299; + public static final int NULL_37300 = 37300; + public static final int NULL_37301 = 37301; + public static final int NULL_37302 = 37302; + public static final int NULL_37303 = 37303; + public static final int NULL_37304 = 37304; + public static final int NULL_37305 = 37305; + public static final int NULL_37306 = 37306; + public static final int NULL_37307 = 37307; + public static final int NULL_37308 = 37308; + public static final int NULL_37309 = 37309; + public static final int NULL_37310 = 37310; + public static final int NULL_37311 = 37311; + public static final int NULL_37312 = 37312; + public static final int NULL_37313 = 37313; + public static final int NULL_37314 = 37314; + public static final int NULL_37315 = 37315; + public static final int NULL_37316 = 37316; + public static final int NULL_37317 = 37317; + public static final int NULL_37318 = 37318; + public static final int NULL_37319 = 37319; + public static final int NULL_37320 = 37320; + public static final int NULL_37321 = 37321; + public static final int NULL_37322 = 37322; + public static final int NULL_37323 = 37323; + public static final int NULL_37324 = 37324; + public static final int NULL_37325 = 37325; + public static final int NULL_37326 = 37326; + public static final int NULL_37327 = 37327; + public static final int NULL_37328 = 37328; + public static final int NULL_37329 = 37329; + public static final int NULL_37330 = 37330; + public static final int NULL_37331 = 37331; + public static final int NULL_37332 = 37332; + public static final int NULL_37333 = 37333; + public static final int NULL_37334 = 37334; + public static final int NULL_37335 = 37335; + public static final int NULL_37336 = 37336; + public static final int NULL_37337 = 37337; + public static final int NULL_37338 = 37338; + public static final int NULL_37339 = 37339; + public static final int NULL_37340 = 37340; + public static final int NULL_37341 = 37341; + public static final int NULL_37342 = 37342; + public static final int NULL_37343 = 37343; /* 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 67335fa5dd..397dd627c7 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -839,8 +839,6 @@ public final class ObjectID public static final int CURTAIN_1534 = 1534; public static final int DOOR_1535 = 1535; public static final int DOOR_1536 = 1536; - public static final int DOOR_1537 = 1537; - public static final int DOOR_1538 = 1538; public static final int DOOR_1540 = 1540; public static final int DOOR_1541 = 1541; public static final int DOOR_1543 = 1543; @@ -961,23 +959,21 @@ public final class ObjectID public static final int DOOR_1991 = 1991; public static final int GLARIALS_TOMBSTONE = 1992; public static final int GLARIALS_TOMB = 1993; - public static final int CLOSED_CHEST_1994 = 1994; - public static final int OPEN_CHEST_1995 = 1995; + public static final int CHEST_1994 = 1994; + public static final int CHEST_1995 = 1995; public static final int ROCK = 1996; public static final int ROCK_1997 = 1997; public static final int ROPE = 1998; public static final int CRATE_1999 = 1999; public static final int DOOR_2000 = 2000; public static final int DOOR_2002 = 2002; - public static final int PILLAR = 2004; - public static final int STATUE_OF_BAXTORIAN = 2005; public static final int STATUE_OF_GLARIAL = 2006; - public static final int LEDGE = 2010; - public static final int LEDGE_2011 = 2011; + public static final int DOOR_2010 = 2010; + public static final int LEDGE = 2011; public static final int LEDGE_2012 = 2012; public static final int VINE_2013 = 2013; - public static final int CHALICE_OF_ETERNITY = 2014; - public static final int CHALICE_OF_ETERNITY_2015 = 2015; + public static final int CHALICE = 2014; + public static final int CHALICE_2015 = 2015; public static final int WHIRLPOOL = 2019; public static final int DEAD_TREE_2020 = 2020; public static final int BARREL_2022 = 2022; @@ -998,7 +994,6 @@ public final class ObjectID public static final int DUMMY_2038 = 2038; public static final int GATE_2039 = 2039; public static final int GATE_2041 = 2041; - public static final int CAULDRON_2043 = 2043; public static final int TROUGH = 2044; public static final int DOOR_2048 = 2048; public static final int DOOR_2049 = 2049; @@ -1014,7 +1009,6 @@ public final class ObjectID public static final int CRATE_2064 = 2064; public static final int ROPE_LADDER = 2065; public static final int WALL_2066 = 2066; - public static final int WATCHTOWER = 2067; public static final int FENCE = 2068; public static final int DOOR_2069 = 2069; public static final int CRATE_2071 = 2071; @@ -1291,7 +1285,7 @@ public final class ObjectID public static final int CLOSED_CHEST_2436 = 2436; public static final int GATE_2438 = 2438; public static final int GATE_2439 = 2439; - public static final int PILLAR_2440 = 2440; + public static final int PILLAR = 2440; public static final int PILLAR_2441 = 2441; public static final int PILLAR_2442 = 2442; public static final int PILLAR_2443 = 2443; @@ -1361,9 +1355,6 @@ public final class ObjectID public static final int BARREL_2530 = 2530; public static final int MUD_PATCH_2531 = 2531; public static final int MUD_PILE_2533 = 2533; - public static final int DOOR_2534 = 2534; - public static final int DOOR_2535 = 2535; - public static final int DOOR_2536 = 2536; public static final int DOOR_2537 = 2537; public static final int DOOR_2538 = 2538; public static final int STAIRS_2539 = 2539; @@ -1780,15 +1771,15 @@ public final class ObjectID public static final int BARREL_3210 = 3210; public static final int POSTER_3212 = 3212; public static final int CAVE_ENTRANCE_3213 = 3213; - public static final int UNDERGROUND_PASS_EXIT = 3214; - public static final int MUD = 3216; + public static final int CAVE_EXIT_3214 = 3214; + public static final int LOOSE_MUD = 3216; public static final int CAVE_3217 = 3217; public static final int TUNNEL_3218 = 3218; public static final int TUNNEL_3219 = 3219; public static final int DOOR_3220 = 3220; public static final int DOOR_3221 = 3221; - public static final int CAVE_STAIRS = 3222; - public static final int CAVE_STAIRS_3223 = 3223; + public static final int CAVE_3222 = 3222; + public static final int CAVE_3223 = 3223; public static final int CAVE_3224 = 3224; public static final int TRAP = 3227; public static final int TRAP_3228 = 3228; @@ -1798,9 +1789,9 @@ public final class ObjectID public static final int STALAGMITES = 3232; public static final int TRAP_3233 = 3233; public static final int ODD_MARKINGS = 3234; - public static final int OBSTACLE_PIPE = 3235; - public static final int OBSTACLE_PIPE_3236 = 3236; - public static final int OBSTACLE_PIPE_3237 = 3237; + public static final int PIPE_3235 = 3235; + public static final int PIPE_3236 = 3236; + public static final int PIPE_3237 = 3237; public static final int LEDGE_3238 = 3238; public static final int BRIDGE = 3239; public static final int BRIDGE_3240 = 3240; @@ -1823,9 +1814,9 @@ public final class ObjectID public static final int SWAMP = 3263; public static final int WELL_3264 = 3264; public static final int PILE_OF_ROCKS = 3265; - public static final int CAGE = 3266; - public static final int CAGE_3267 = 3267; - public static final int CAGE_3268 = 3268; + public static final int GATE_3266 = 3266; + public static final int CAGE = 3267; + public static final int GATE_3268 = 3268; public static final int DOOR_3270 = 3270; public static final int DOOR_3271 = 3271; public static final int CHEST_3272 = 3272; @@ -1860,7 +1851,7 @@ public final class ObjectID public static final int GUIDE_ROPE = 3340; public static final int GUIDE_ROPE_3341 = 3341; public static final int ROCK_PILE_3343 = 3343; - public static final int BARREL_3344 = 3344; + public static final int BREW_BARREL = 3344; public static final int IBANS_THRONE = 3348; public static final int CAGE_3351 = 3351; public static final int CAGE_3352 = 3352; @@ -1868,7 +1859,6 @@ public final class ObjectID public static final int TOMB_3354 = 3354; public static final int WELL_3359 = 3359; public static final int CRATE_3360 = 3360; - public static final int ORB_OF_LIGHT = 3361; public static final int WINDOW_3362 = 3362; public static final int ROCK_3364 = 3364; public static final int PROTRUDING_ROCKS = 3365; @@ -2159,7 +2149,8 @@ public final class ObjectID public static final int MUSHROOM_3917 = 3917; public static final int ELVEN_LAMP = 3918; public static final int TWIGS = 3919; - public static final int TRIPWIRE = 3921; + public static final int TRIPWIRE = 3920; + public static final int TRIPWIRE_3921 = 3921; public static final int STICKS = 3922; public static final int LEAVES = 3923; public static final int LEAVES_3924 = 3924; @@ -2174,7 +2165,6 @@ public final class ObjectID public static final int DENSE_FOREST = 3937; public static final int DENSE_FOREST_3938 = 3938; public static final int DENSE_FOREST_3939 = 3939; - public static final int TRACKS_3941 = 3941; public static final int HUGE_GATE = 3944; public static final int HUGE_GATE_3945 = 3945; public static final int HUGE_GATE_3946 = 3946; @@ -2190,7 +2180,7 @@ public final class ObjectID public static final int CORPSE_3972 = 3972; public static final int CORPSE_3973 = 3973; public static final int CORPSE_3974 = 3974; - public static final int TAR = 3975; + public static final int COAL_TAR = 3975; public static final int CATAPULT_3976 = 3976; public static final int CATAPULTWINCH = 3977; public static final int CATAPULTLEVER = 3978; @@ -2218,7 +2208,7 @@ public final class ObjectID public static final int ALTAR_4008 = 4008; public static final int BARREL_4024 = 4024; public static final int BARREL_4025 = 4025; - public static final int FRACTIONALIZING_STILL = 4026; + public static final int FRACTIONALISING_STILL = 4026; public static final int STUMP = 4027; public static final int TREE_4028 = 4028; public static final int TREE_4029 = 4029; @@ -3136,7 +3126,7 @@ public final class ObjectID public static final int TABLE_5879 = 5879; public static final int STOOL_5880 = 5880; public static final int STANDING_TORCH_5881 = 5881; - public static final int MUD_5883 = 5883; + public static final int MUD = 5883; public static final int SWAMP_5884 = 5884; public static final int ROOTS_5885 = 5885; public static final int ROOTS_5886 = 5886; @@ -5118,7 +5108,7 @@ public final class ObjectID public static final int YOUNG_TREE_8732 = 8732; public static final int YOUNG_TREE_8733 = 8733; public static final int NET_TRAP_8734 = 8734; - public static final int BARREL_TAP = 8737; + public static final int TAP_8737 = 8737; public static final int ARDOUGNE_WALL_DOOR = 8738; public static final int ARDOUGNE_WALL_DOOR_8739 = 8739; public static final int ARDOUGNE_WALL_DOOR_8740 = 8740; @@ -5158,19 +5148,12 @@ public final class ObjectID public static final int DOOR_8792 = 8792; public static final int DOOR_8793 = 8793; public static final int GNOME_ON_A_RACK = 8795; - public static final int AN_EMPTY_RACK = 8796; + public static final int EMPTY_RACK = 8796; public static final int CLOSED_CHEST_8797 = 8797; public static final int OPEN_CHEST_8798 = 8798; - public static final int DESK_8799 = 8799; public static final int CLOSED_CHEST_8800 = 8800; - public static final int GRAIN_SACKS = 8801; - public static final int GRAIN_SACKS_8802 = 8802; - public static final int GRAIN_SACKS_8803 = 8803; - public static final int GRAIN_SACKS_8804 = 8804; - public static final int GRAIN_SACKS_8805 = 8805; - public static final int GRAIN_SACKS_8806 = 8806; - public static final int APPLE_BARREL = 8807; - public static final int APPLE_BARREL_8808 = 8808; + public static final int APPLE_PRESS = 8807; + public static final int APPLE_PRESS_8808 = 8808; public static final int ROTTEN_APPLE_PILE = 8809; public static final int GATE_8810 = 8810; public static final int GATE_8811 = 8811; @@ -5191,6 +5174,8 @@ public final class ObjectID public static final int STOCKS_8840 = 8840; public static final int APPLE_TREE_8842 = 8842; public static final int APPLE_TREE_8843 = 8843; + public static final int CITY_GATE_8844 = 8844; + public static final int CITY_GATE_8845 = 8845; public static final int KELDA_HOPS_PATCH = 8861; public static final int KELDA_HOPS_PATCH_8862 = 8862; public static final int KELDA_HOPS_PATCH_8863 = 8863; @@ -5722,8 +5707,8 @@ public final class ObjectID public static final int LADDER_9742 = 9742; public static final int SHIPS_LADDER_9744 = 9744; public static final int SHIPS_LADDER_9745 = 9745; - public static final int CRYSTAL_COLLECTOR = 9748; - public static final int CRYSTAL_COLLECTOR_9749 = 9749; + public static final int CRYSTAL_DISPENSER = 9748; + public static final int CRYSTAL_DISPENSER_9749 = 9749; public static final int CRYSTAL = 9751; public static final int CRYSTAL_9752 = 9752; public static final int OPEN_CHEST_9753 = 9753; @@ -5790,7 +5775,7 @@ public final class ObjectID public static final int PILLAR_OF_LIGHT_9936 = 9936; public static final int PILLAR_OF_LIGHT_9937 = 9937; public static final int PILLAR_OF_LIGHT_9973 = 9973; - public static final int CAVE_STAIRS_9975 = 9975; + public static final int CAVE_9975 = 9975; public static final int CAVE_WALL_9976 = 9976; public static final int TUNNEL_9977 = 9977; public static final int LADDER_9978 = 9978; @@ -6118,7 +6103,7 @@ public final class ObjectID public static final int WHEELBARROW_10516 = 10516; public static final int BANK_BOOTH_10517 = 10517; public static final int CLOSED_BANK_BOOTH_10518 = 10518; - public static final int CHALICE = 10521; + public static final int CHALICE_10521 = 10521; public static final int TAPESTRY = 10522; public static final int STAIRCASE_10525 = 10525; public static final int STAIRCASE_10526 = 10526; @@ -8387,7 +8372,7 @@ public final class ObjectID public static final int CRATE_14739 = 14739; public static final int BARREL_14740 = 14740; public static final int CRATES_14741 = 14741; - public static final int PILE_OF_CRATES = 14742; + public static final int CRATES_14742 = 14742; public static final int SACK_14743 = 14743; public static final int LADDER_14745 = 14745; public static final int LADDER_14746 = 14746; @@ -9367,7 +9352,7 @@ public final class ObjectID public static final int GATE_16493 = 16493; public static final int FLAGPOLE_16494 = 16494; public static final int OBSTACLE_NET = 16499; - public static final int OBSTACLE_PIPE_16500 = 16500; + public static final int OBSTACLE_PIPE = 16500; public static final int EXERCISE_MAT_16508 = 16508; public static final int OBSTACLE_PIPE_16509 = 16509; public static final int STRANGE_FLOOR = 16510; @@ -11458,9 +11443,9 @@ public final class ObjectID public static final int DEAD_EXPLORER = 20788; public static final int LEVER_20789 = 20789; public static final int ENTRANCE_20790 = 20790; - public static final int APPLE_BARREL_20791 = 20791; - public static final int APPLE_BARREL_20792 = 20792; - public static final int BARREL_TAP_20794 = 20794; + public static final int APPLE_PRESS_20791 = 20791; + public static final int APPLE_PRESS_20792 = 20792; + public static final int TAP_20794 = 20794; public static final int EXERCISE_MAT_20801 = 20801; public static final int TARGET_20802 = 20802; public static final int TREE_20803 = 20803; @@ -14288,9 +14273,9 @@ public final class ObjectID public static final int BARREL_27221 = 27221; public static final int BARREL_27222 = 27222; public static final int CRATE_27223 = 27223; - public static final int CRATE_27224 = 27224; - public static final int CRATE_27225 = 27225; - public static final int CRATE_27226 = 27226; + public static final int CRATES_27224 = 27224; + public static final int CRATES_27225 = 27225; + public static final int CRATES_27226 = 27226; public static final int BARREL_27227 = 27227; public static final int BARREL_27228 = 27228; public static final int BARREL_27229 = 27229; @@ -18655,5 +18640,714 @@ public final class ObjectID public static final int WEB_34898 = 34898; public static final int SLASHED_WEB_34899 = 34899; public static final int FOG_MARKER = 34905; + public static final int CRYSTAL_TREE_PATCH = 34907; + public static final int CRYSTAL_TREE_PATCH_34908 = 34908; + public static final int CRYSTAL_TREE_PATCH_34909 = 34909; + public static final int CRYSTAL_TREE_PATCH_34910 = 34910; + public static final int CRYSTAL_TREE = 34911; + public static final int CRYSTAL_TREE_34912 = 34912; + public static final int CRYSTAL_TREE_34913 = 34913; + public static final int CRYSTAL_TREE_34914 = 34914; + public static final int CRYSTAL_TREE_34915 = 34915; + public static final int CRYSTAL_TREE_34916 = 34916; + public static final int CRYSTAL_TREE_34917 = 34917; + public static final int CRYSTAL_TREE_34918 = 34918; + public static final int STAIRCASE_34923 = 34923; + public static final int STAIRCASE_34924 = 34924; + public static final int LADDER_34925 = 34925; + public static final int DOOR_34926 = 34926; + public static final int DOOR_34927 = 34927; + public static final int DOOR_34928 = 34928; + public static final int DOOR_34929 = 34929; + public static final int DOOR_34930 = 34930; + public static final int DOOR_34931 = 34931; + public static final int DOOR_34932 = 34932; + public static final int DEAD_TREE_34933 = 34933; + public static final int DEAD_TREE_34934 = 34934; + public static final int DEAD_TREE_34935 = 34935; + public static final int TABLE_34936 = 34936; + public static final int BUCKET_34937 = 34937; + public static final int SPEAR_WALL_34938 = 34938; + public static final int DRAWERS_34939 = 34939; + public static final int SACKS_34940 = 34940; + public static final int CHEST_34941 = 34941; + public static final int CHEST_34942 = 34942; + public static final int SINK_34943 = 34943; + public static final int TABLE_34944 = 34944; + public static final int PORTAL_34947 = 34947; + public static final int GANGPLANK_34948 = 34948; + public static final int GANGPLANK_34949 = 34949; + public static final int INCONSPICUOUS_CRATE_MASTER_34950 = 34950; + public static final int STASH_MASTER_34951 = 34951; + public static final int ROPE_34955 = 34955; + public static final int ROCKS_34956 = 34956; + public static final int ROCKS_34957 = 34957; + public static final int ELVEN_LAMP_34958 = 34958; + public static final int LOOM_34959 = 34959; + public static final int TRACKS_34960 = 34960; + public static final int TRACKS_34961 = 34961; + public static final int TALL_REEDS_34962 = 34962; + public static final int GUARD_34963 = 34963; + public static final int CAVE_34964 = 34964; + public static final int PILLAR_34965 = 34965; + public static final int PILLAR_34966 = 34966; + public static final int STATUE_OF_BAXTORIAN = 34967; + public static final int STATUE_PLINTH_34968 = 34968; + public static final int STATUE_OF_BAXTORIAN_34969 = 34969; + public static final int BUST_35033 = 35033; + public static final int BUST_35034 = 35034; + public static final int BUST_35035 = 35035; + public static final int BUST_35036 = 35036; + public static final int BUST_35037 = 35037; + public static final int BUST_35038 = 35038; + public static final int PORTAL_35075 = 35075; + public static final int CRYSTAL_DISPENSER_35076 = 35076; + public static final int PACK = 35077; + public static final int FLOATING_BOOK = 35078; + public static final int FLOATING_BOOK_35079 = 35079; + public static final int FLOATING_BOOK_35080 = 35080; + public static final int FLOATING_BOOK_35081 = 35081; + public static final int PILLAR_OF_LIGHT_35082 = 35082; + public static final int PILLAR_OF_LIGHT_35083 = 35083; + public static final int PILLAR_OF_LIGHT_35084 = 35084; + public static final int PILLAR_OF_LIGHT_35085 = 35085; + public static final int PILLAR_OF_LIGHT_35086 = 35086; + public static final int PILLAR_OF_LIGHT_35087 = 35087; + public static final int PILLAR_OF_LIGHT_35088 = 35088; + public static final int PILLAR_OF_LIGHT_35089 = 35089; + public static final int PILLAR_OF_LIGHT_35090 = 35090; + public static final int PILLAR_OF_LIGHT_35091 = 35091; + public static final int PILLAR_OF_LIGHT_35092 = 35092; + public static final int PILLAR_OF_LIGHT_35093 = 35093; + public static final int PILLAR_OF_LIGHT_35094 = 35094; + public static final int PILLAR_OF_LIGHT_35095 = 35095; + public static final int PILLAR_OF_LIGHT_35096 = 35096; + public static final int PILLAR_OF_LIGHT_35097 = 35097; + public static final int PILLAR_OF_LIGHT_35098 = 35098; + public static final int PILLAR_OF_LIGHT_35099 = 35099; + public static final int PILLAR_OF_LIGHT_35100 = 35100; + public static final int PILLAR_OF_LIGHT_35101 = 35101; + public static final int PILLAR_OF_LIGHT_35102 = 35102; + public static final int PILLAR_OF_LIGHT_35103 = 35103; + public static final int PILLAR_OF_LIGHT_35104 = 35104; + public static final int PILLAR_OF_LIGHT_35105 = 35105; + public static final int PILLAR_OF_LIGHT_35106 = 35106; + public static final int PILLAR_OF_LIGHT_35107 = 35107; + public static final int PILLAR_OF_LIGHT_35108 = 35108; + public static final int PILLAR_OF_LIGHT_35109 = 35109; + public static final int PILLAR_OF_LIGHT_35110 = 35110; + public static final int PILLAR_OF_LIGHT_35111 = 35111; + public static final int PILLAR_OF_LIGHT_35112 = 35112; + public static final int PILLAR_OF_LIGHT_35113 = 35113; + public static final int PILLAR_OF_LIGHT_35114 = 35114; + public static final int PILLAR_OF_LIGHT_35115 = 35115; + public static final int PILLAR_OF_LIGHT_35116 = 35116; + public static final int PILLAR_OF_LIGHT_35117 = 35117; + public static final int PILLAR_OF_LIGHT_35118 = 35118; + public static final int PILLAR_OF_LIGHT_35119 = 35119; + public static final int PILLAR_OF_LIGHT_35120 = 35120; + public static final int PILLAR_OF_LIGHT_35121 = 35121; + public static final int PILLAR_OF_LIGHT_35122 = 35122; + public static final int PILLAR_OF_LIGHT_35123 = 35123; + public static final int PILLAR_OF_LIGHT_35124 = 35124; + public static final int PILLAR_OF_LIGHT_35125 = 35125; + public static final int PILLAR_OF_LIGHT_35126 = 35126; + public static final int PILLAR_OF_LIGHT_35127 = 35127; + public static final int PILLAR_OF_LIGHT_35128 = 35128; + public static final int PILLAR_OF_LIGHT_35129 = 35129; + public static final int PILLAR_OF_LIGHT_35130 = 35130; + public static final int PILLAR_OF_LIGHT_35131 = 35131; + public static final int PILLAR_OF_LIGHT_35132 = 35132; + public static final int PILLAR_OF_LIGHT_35133 = 35133; + public static final int PILLAR_OF_LIGHT_35134 = 35134; + public static final int PILLAR_OF_LIGHT_35135 = 35135; + public static final int PILLAR_OF_LIGHT_35136 = 35136; + public static final int PILLAR_OF_LIGHT_35137 = 35137; + public static final int PILLAR_OF_LIGHT_35138 = 35138; + public static final int PILLAR_OF_LIGHT_35139 = 35139; + public static final int PILLAR_OF_LIGHT_35140 = 35140; + public static final int PILLAR_OF_LIGHT_35141 = 35141; + public static final int PILLAR_OF_LIGHT_35142 = 35142; + public static final int PILLAR_OF_LIGHT_35143 = 35143; + public static final int PILLAR_OF_LIGHT_35144 = 35144; + public static final int PILLAR_OF_LIGHT_35145 = 35145; + public static final int PILLAR_OF_LIGHT_35146 = 35146; + public static final int PILLAR_OF_LIGHT_35147 = 35147; + public static final int PILLAR_OF_LIGHT_35148 = 35148; + public static final int PILLAR_OF_LIGHT_35149 = 35149; + public static final int PILLAR_OF_LIGHT_35150 = 35150; + public static final int PILLAR_OF_LIGHT_35151 = 35151; + public static final int PILLAR_OF_LIGHT_35152 = 35152; + public static final int PILLAR_OF_LIGHT_35153 = 35153; + public static final int PILLAR_OF_LIGHT_35154 = 35154; + public static final int PILLAR_OF_LIGHT_35155 = 35155; + public static final int PILLAR_OF_LIGHT_35156 = 35156; + public static final int PILLAR_OF_LIGHT_35157 = 35157; + public static final int PILLAR_OF_LIGHT_35158 = 35158; + public static final int PILLAR_OF_LIGHT_35159 = 35159; + public static final int PILLAR_OF_LIGHT_35160 = 35160; + public static final int PILLAR_OF_LIGHT_35161 = 35161; + public static final int PILLAR_OF_LIGHT_35162 = 35162; + public static final int PILLAR_OF_LIGHT_35163 = 35163; + public static final int PILLAR_OF_LIGHT_35164 = 35164; + public static final int PILLAR_OF_LIGHT_35165 = 35165; + public static final int PILLAR_OF_LIGHT_35166 = 35166; + public static final int PILLAR_OF_LIGHT_35167 = 35167; + public static final int PILLAR_OF_LIGHT_35168 = 35168; + public static final int PILLAR_OF_LIGHT_35169 = 35169; + public static final int PILLAR_OF_LIGHT_35170 = 35170; + public static final int PILLAR_OF_LIGHT_35171 = 35171; + public static final int PILLAR_OF_LIGHT_35172 = 35172; + public static final int PILLAR_OF_LIGHT_35173 = 35173; + public static final int PILLAR_OF_LIGHT_35174 = 35174; + public static final int PILLAR_OF_LIGHT_35175 = 35175; + public static final int PILLAR_OF_LIGHT_35176 = 35176; + public static final int PILLAR_OF_LIGHT_35177 = 35177; + public static final int PILLAR_OF_LIGHT_35178 = 35178; + public static final int PILLAR_OF_LIGHT_35179 = 35179; + public static final int PILLAR_OF_LIGHT_35180 = 35180; + public static final int PILLAR_OF_LIGHT_35181 = 35181; + public static final int PILLAR_OF_LIGHT_35182 = 35182; + public static final int PILLAR_OF_LIGHT_35183 = 35183; + public static final int PILLAR_OF_LIGHT_35184 = 35184; + public static final int PILLAR_OF_LIGHT_35185 = 35185; + public static final int PILLAR_OF_LIGHT_35186 = 35186; + public static final int PILLAR_OF_LIGHT_35187 = 35187; + public static final int PILLAR_OF_LIGHT_35188 = 35188; + public static final int PILLAR_OF_LIGHT_35189 = 35189; + public static final int PILLAR_OF_LIGHT_35190 = 35190; + public static final int PILLAR_OF_LIGHT_35191 = 35191; + public static final int PILLAR_OF_LIGHT_35192 = 35192; + public static final int PILLAR_OF_LIGHT_35193 = 35193; + public static final int PILLAR_OF_LIGHT_35194 = 35194; + public static final int PILLAR_OF_LIGHT_35195 = 35195; + public static final int PILLAR_OF_LIGHT_35196 = 35196; + public static final int PILLAR_OF_LIGHT_35197 = 35197; + public static final int PILLAR_OF_LIGHT_35198 = 35198; + public static final int PILLAR_OF_LIGHT_35199 = 35199; + public static final int PILLAR_OF_LIGHT_35200 = 35200; + public static final int PILLAR_OF_LIGHT_35201 = 35201; + public static final int PILLAR_OF_LIGHT_35202 = 35202; + public static final int PILLAR_OF_LIGHT_35203 = 35203; + public static final int PILLAR_OF_LIGHT_35204 = 35204; + public static final int PILLAR_OF_LIGHT_35205 = 35205; + public static final int PILLAR_OF_LIGHT_35206 = 35206; + public static final int PILLAR_OF_LIGHT_35207 = 35207; + public static final int PILLAR_OF_LIGHT_35208 = 35208; + public static final int PILLAR_OF_LIGHT_35209 = 35209; + public static final int PILLAR_OF_LIGHT_35210 = 35210; + public static final int PILLAR_OF_LIGHT_35211 = 35211; + public static final int PILLAR_OF_LIGHT_35221 = 35221; + public static final int PILLAR_OF_LIGHT_35222 = 35222; + public static final int PILLAR_OF_LIGHT_35223 = 35223; + public static final int PILLAR_OF_LIGHT_35224 = 35224; + public static final int PILLAR_OF_LIGHT_35225 = 35225; + public static final int PILLAR_OF_LIGHT_35226 = 35226; + public static final int PILLAR_OF_LIGHT_35227 = 35227; + public static final int PILLAR_OF_LIGHT_35228 = 35228; + public static final int PILLAR_OF_LIGHT_35229 = 35229; + public static final int PILLAR_OF_LIGHT_35230 = 35230; + public static final int PILLAR_OF_LIGHT_35231 = 35231; + public static final int PILLAR_OF_LIGHT_35232 = 35232; + public static final int PILLAR_OF_LIGHT_35233 = 35233; + public static final int PILLAR_OF_LIGHT_35234 = 35234; + public static final int PILLAR_OF_LIGHT_35235 = 35235; + public static final int PILLAR_OF_LIGHT_35236 = 35236; + public static final int PILLAR_OF_LIGHT_35237 = 35237; + public static final int PILLAR_OF_LIGHT_35238 = 35238; + public static final int PILLAR_OF_LIGHT_35239 = 35239; + public static final int PILLAR_OF_LIGHT_35240 = 35240; + public static final int PILLAR_OF_LIGHT_35241 = 35241; + public static final int PILLAR_OF_LIGHT_35242 = 35242; + public static final int PILLAR_OF_LIGHT_35243 = 35243; + public static final int PILLAR_OF_LIGHT_35244 = 35244; + public static final int PILLAR_OF_LIGHT_35245 = 35245; + public static final int PILLAR_OF_LIGHT_35246 = 35246; + public static final int PILLAR_OF_LIGHT_35247 = 35247; + public static final int PILLAR_OF_LIGHT_35248 = 35248; + public static final int PILLAR_OF_LIGHT_35249 = 35249; + public static final int PILLAR_OF_LIGHT_35250 = 35250; + public static final int PILLAR_OF_LIGHT_35251 = 35251; + public static final int PILLAR_OF_LIGHT_35252 = 35252; + public static final int PILLAR_OF_LIGHT_35257 = 35257; + public static final int PILLAR_OF_LIGHT_35258 = 35258; + public static final int PILLAR_OF_LIGHT_35261 = 35261; + public static final int PILLAR_OF_LIGHT_35266 = 35266; + public static final int PILLAR_OF_LIGHT_35267 = 35267; + public static final int PILLAR_OF_LIGHT_35272 = 35272; + public static final int PILLAR_OF_LIGHT_35273 = 35273; + public static final int PILLAR_OF_LIGHT_35274 = 35274; + public static final int PILLAR_OF_LIGHT_35275 = 35275; + public static final int PILLAR_OF_LIGHT_35276 = 35276; + public static final int PILLAR_OF_LIGHT_35277 = 35277; + public static final int PILLAR_OF_LIGHT_35278 = 35278; + public static final int PILLAR_OF_LIGHT_35283 = 35283; + public static final int PILLAR_OF_LIGHT_35284 = 35284; + public static final int PILLAR_OF_LIGHT_35285 = 35285; + public static final int PILLAR_OF_LIGHT_35286 = 35286; + public static final int PILLAR_OF_LIGHT_35287 = 35287; + public static final int PILLAR_OF_LIGHT_35288 = 35288; + public static final int PILLAR_OF_LIGHT_35289 = 35289; + public static final int PILLAR_OF_LIGHT_35290 = 35290; + public static final int PILLAR_OF_LIGHT_35291 = 35291; + public static final int PILLAR_OF_LIGHT_35292 = 35292; + public static final int PILLAR_OF_LIGHT_35293 = 35293; + public static final int PILLAR_OF_LIGHT_35300 = 35300; + public static final int PILLAR_OF_LIGHT_35301 = 35301; + public static final int PILLAR_OF_LIGHT_35302 = 35302; + public static final int PILLAR_OF_LIGHT_35305 = 35305; + public static final int PILLAR_OF_LIGHT_35306 = 35306; + public static final int PILLAR_OF_LIGHT_35311 = 35311; + public static final int PILLAR_OF_LIGHT_35312 = 35312; + public static final int PILLAR_OF_LIGHT_35313 = 35313; + public static final int PILLAR_OF_LIGHT_35314 = 35314; + public static final int PILLAR_OF_LIGHT_35317 = 35317; + public static final int PILLAR_OF_LIGHT_35322 = 35322; + public static final int PILLAR_OF_LIGHT_35323 = 35323; + public static final int PILLAR_OF_LIGHT_35330 = 35330; + public static final int PILLAR_OF_LIGHT_35331 = 35331; + public static final int TELEPORT_PLATFORM = 35387; + public static final int TELEPORT_PLATFORM_35388 = 35388; + public static final int TELEPORT_PLATFORM_35389 = 35389; + public static final int BOOKS_35434 = 35434; + public static final int BOOKS_35435 = 35435; + public static final int BOOKS_35436 = 35436; + public static final int STEPS_35437 = 35437; + public static final int STEPS_35438 = 35438; + public static final int BOOK_CART = 35439; + public static final int BOOK_CART_35440 = 35440; + public static final int BUST_35441 = 35441; + public static final int BUST_35442 = 35442; + public static final int BUST_35443 = 35443; + public static final int BUST_35444 = 35444; + public static final int BUST_35445 = 35445; + public static final int BUST_35446 = 35446; + public static final int BOOKS_35447 = 35447; + public static final int BOOKS_35448 = 35448; + public static final int SEAL_OF_CADARN = 35451; + public static final int SEAL_OF_CADARN_35452 = 35452; + public static final int SEAL_OF_CRWYS = 35453; + public static final int SEAL_OF_CRWYS_35454 = 35454; + public static final int SEAL_OF_AMLODD = 35455; + public static final int SEAL_OF_AMLODD_35456 = 35456; + public static final int SEAL_OF_HEFIN = 35457; + public static final int SEAL_OF_HEFIN_35458 = 35458; + public static final int SEAL_OF_IORWERTH = 35459; + public static final int SEAL_OF_IORWERTH_35460 = 35460; + public static final int SEAL_OF_ITHELL = 35461; + public static final int SEAL_OF_ITHELL_35462 = 35462; + public static final int SEAL_OF_MEILYR = 35463; + public static final int SEAL_OF_MEILYR_35464 = 35464; + public static final int SEAL_OF_TRAHAEARN = 35465; + public static final int SEAL_OF_TRAHAEARN_35466 = 35466; + public static final int SEAL_OF_THE_FORGOTTEN = 35467; + public static final int STAIRCASE_35791 = 35791; + public static final int STAIRCASE_35792 = 35792; + public static final int GRATE_35793 = 35793; + public static final int BROKEN_GRATE = 35794; + public static final int CELL_DOOR_35795 = 35795; + public static final int CABINET_35796 = 35796; + public static final int BED_35797 = 35797; + public static final int BED_35798 = 35798; + public static final int LADDER_35799 = 35799; + public static final int BARREL_35800 = 35800; + public static final int BARREL_35801 = 35801; + public static final int FISHING_NET_35802 = 35802; + public static final int FISHING_NET_35803 = 35803; + public static final int BARRICADE_35804 = 35804; + public static final int BARRICADE_35805 = 35805; + public static final int BARRICADE_35806 = 35806; + public static final int MOURNER = 35807; + public static final int MOURNER_35808 = 35808; + public static final int MOURNER_35809 = 35809; + public static final int FIRE_35810 = 35810; + public static final int FIRE_35811 = 35811; + public static final int FIRE_35812 = 35812; + public static final int TRAPDOOR_35815 = 35815; + public static final int LADDER_35816 = 35816; + public static final int KNIGHT_OF_ARDOUGNE = 35817; + public static final int MAN = 35818; + public static final int MAN_35819 = 35819; + public static final int MAN_35820 = 35820; + public static final int MAN_35821 = 35821; + public static final int MAN_35822 = 35822; + public static final int MAN_35823 = 35823; + public static final int WOMAN = 35824; + public static final int WOMAN_35825 = 35825; + public static final int WOMAN_35826 = 35826; + public static final int WOMAN_35827 = 35827; + public static final int WOMAN_35828 = 35828; + public static final int WOMAN_35829 = 35829; + public static final int FARMING_PATCH = 35830; + public static final int HERB = 35831; + public static final int HERB_35832 = 35832; + public static final int HERB_35833 = 35833; + public static final int HERB_35834 = 35834; + public static final int CLOSED_CHEST_35835 = 35835; + public static final int OPEN_CHEST_35836 = 35836; + public static final int WALL_35837 = 35837; + public static final int BLOCKED_CREVICE = 35838; + public static final int BLOCKED_CREVICE_35839 = 35839; + public static final int CREVICE_35840 = 35840; + public static final int CREVICE_35841 = 35841; + public static final int FLOWERS_35842 = 35842; + public static final int STONE_35843 = 35843; + public static final int STEPPING_STONE_35844 = 35844; + public static final int CAVE_35845 = 35845; + public static final int CAVE_35846 = 35846; + public static final int CAVE_35847 = 35847; + public static final int CHEST_35848 = 35848; + public static final int CHEST_35849 = 35849; + public static final int ROCKS_35853 = 35853; + public static final int ROCKS_35854 = 35854; + public static final int ROCK_35855 = 35855; + public static final int ROCK_35856 = 35856; + public static final int ROCK_35857 = 35857; + public static final int ROCK_35858 = 35858; + public static final int ROCKS_35859 = 35859; + public static final int ROCKS_35860 = 35860; + public static final int MUSHROOMS_35861 = 35861; + public static final int MUSHROOMS_35862 = 35862; + public static final int MUSHROOM_35863 = 35863; + public static final int MUSHROOM_35864 = 35864; + public static final int MUSHROOM_35865 = 35865; + public static final int MUSHROOM_35866 = 35866; + public static final int ELVEN_LAMP_35867 = 35867; + public static final int ELVEN_LAMP_35868 = 35868; + public static final int BROKEN_CART_35869 = 35869; + public static final int BROKEN_CART_35870 = 35870; + public static final int BARRICADE_35871 = 35871; + public static final int SACK_35872 = 35872; + public static final int TABLE_35873 = 35873; + public static final int BENCH_35874 = 35874; + public static final int COOKING_POTS_35875 = 35875; + public static final int COOKING_POTS_35876 = 35876; + public static final int COOKING_RANGE_35877 = 35877; + public static final int SYMBOL_35878 = 35878; + public static final int SYMBOL_35879 = 35879; + public static final int WELL_35881 = 35881; + public static final int BROKEN_WELL = 35882; + public static final int STATUE_SPACE_35883 = 35883; + public static final int STATUE_35884 = 35884; + public static final int DWARF_MULTICANNON_35885 = 35885; + public static final int DWARF_MULTICANNON_35886 = 35886; + public static final int HOLE_35887 = 35887; + public static final int HOLE_35888 = 35888; + public static final int HOLE_35889 = 35889; + public static final int CATAPULT_35890 = 35890; + public static final int CATAPULT_35891 = 35891; + public static final int PILLAR_OF_LIGHT_35892 = 35892; + public static final int PILLAR_OF_LIGHT_35893 = 35893; + public static final int PILLAR_OF_LIGHT_35894 = 35894; + public static final int TUNNEL_35896 = 35896; + public static final int BLOCKED_TUNNEL_35897 = 35897; + public static final int TUNNEL_35898 = 35898; + public static final int TUNNEL_35899 = 35899; + public static final int FRAGMENT_OF_SEREN = 35900; + public static final int FRAGMENT_OF_SEREN_35901 = 35901; + public static final int FIRE_35912 = 35912; + public static final int FIRE_35913 = 35913; + public static final int GRAVESTONE_35914 = 35914; + public static final int DAISIES_35915 = 35915; + public static final int DEAD_ELF = 35916; + public static final int DEAD_ELF_35917 = 35917; + public static final int DEAD_ELF_35918 = 35918; + public static final int DEAD_ELF_35919 = 35919; + public static final int DEAD_ELF_35920 = 35920; + public static final int DEAD_ELF_35921 = 35921; + public static final int DEAD_ELF_35922 = 35922; + public static final int DEAD_ELF_35923 = 35923; + public static final int DEAD_ELF_35924 = 35924; + public static final int DEAD_ELF_35925 = 35925; + public static final int DEAD_ELF_35926 = 35926; + public static final int DEAD_ELF_35927 = 35927; + public static final int DEAD_ELF_35928 = 35928; + public static final int DEAD_ELF_35929 = 35929; + public static final int DEAD_ELF_35930 = 35930; + public static final int DOOR_35931 = 35931; + public static final int DOOR_35932 = 35932; + public static final int DOOR_35933 = 35933; + public static final int DOOR_35934 = 35934; + public static final int DOOR_35935 = 35935; + public static final int DOOR_35936 = 35936; + public static final int DAIRY_CHURN_35937 = 35937; + public static final int ABANDONED_EQUIPMENT = 35938; + public static final int CRATE_35939 = 35939; + public static final int CAVE_35940 = 35940; + public static final int PIPE_35941 = 35941; + public static final int PIPE_35942 = 35942; + public static final int ORB_OF_LIGHT = 35944; + public static final int CAULDRON_35945 = 35945; + public static final int CAULDRON_35946 = 35946; + public static final int WATCHTOWER = 35947; + public static final int WATCHTOWER_35948 = 35948; + public static final int SPIRIT_TREE_35949 = 35949; + public static final int SPIRIT_TREE_35950 = 35950; + public static final int GRAIN_SACKS = 35954; + public static final int GRAIN_SACKS_35955 = 35955; + public static final int GRAIN_SACKS_35956 = 35956; + public static final int GRAIN_SACKS_35957 = 35957; + public static final int EMPTY_RACK_35958 = 35958; + public static final int DESK_35959 = 35959; + public static final int DESK_35960 = 35960; + public static final int CLOSED_CHEST_35961 = 35961; + public static final int OPEN_CHEST_35962 = 35962; + public static final int DESK_35963 = 35963; + public static final int CORRUPTED_SCEPTRE = 35964; + public static final int TELEPORT_PLATFORM_35965 = 35965; + public static final int SINGING_BOWL_35966 = 35966; + public static final int CORRUPT_DEPOSIT = 35967; + public static final int CORRUPT_DEPOSIT_DEPLETED = 35968; + public static final int PHREN_ROOTS = 35969; + public static final int PHREN_ROOTS_DEPLETED = 35970; + public static final int FISHING_SPOT_35971 = 35971; + public static final int FISHING_SPOT_DEPLETED = 35972; + public static final int GRYM_ROOT = 35973; + public static final int GRYM_ROOT_DEPLETED = 35974; + public static final int LINUM_TIRINUM = 35975; + public static final int LINUM_TIRINUM_DEPLETED = 35976; + public static final int TOOL_STORAGE = 35977; + public static final int CRYSTAL_SINGING_RECIPES = 35978; + public static final int EGNIOL_POTIONS = 35979; + public static final int RANGE_35980 = 35980; + public static final int WATER_PUMP_35981 = 35981; + public static final int BARRIER_35982 = 35982; + public static final int BARRIER_35983 = 35983; + public static final int TELEPORT_PLATFORM_35984 = 35984; + public static final int TELEPORT_PLATFORM_35985 = 35985; + public static final int THE_GAUNTLET = 35986; + public static final int REWARD_CHEST_35988 = 35988; + public static final int REWARD_CHEST_35989 = 35989; + public static final int ILLUMINATED_SYMBOL = 35992; + public static final int INACTIVE_SYMBOL = 35994; + public static final int NODE_35998 = 35998; + public static final int NODE_35999 = 35999; + public static final int SCOREBOARD_36060 = 36060; + public static final int CRYSTAL_SCEPTRE = 36061; + public static final int TELEPORT_PLATFORM_36062 = 36062; + public static final int SINGING_BOWL_36063 = 36063; + public static final int CRYSTAL_DEPOSIT = 36064; + public static final int CRYSTAL_DEPOSIT_DEPLETED = 36065; + public static final int PHREN_ROOTS_36066 = 36066; + public static final int PHREN_ROOTS_DEPLETED_36067 = 36067; + public static final int FISHING_SPOT_36068 = 36068; + public static final int FISHING_SPOT_DEPLETED_36069 = 36069; + public static final int GRYM_ROOT_36070 = 36070; + public static final int GRYM_ROOT_DEPLETED_36071 = 36071; + public static final int LINUM_TIRINUM_36072 = 36072; + public static final int LINUM_TIRINUM_DEPLETED_36073 = 36073; + public static final int TOOL_STORAGE_36074 = 36074; + public static final int CRYSTAL_SINGING_RECIPES_36075 = 36075; + public static final int EGNIOL_POTIONS_36076 = 36076; + public static final int RANGE_36077 = 36077; + public static final int WATER_PUMP_36078 = 36078; + public static final int BARRIER_36079 = 36079; + public static final int BARRIER_36080 = 36080; + public static final int GAUNTLET_PORTAL = 36081; + public static final int TELEPORT_PLATFORM_36082 = 36082; + public static final int THE_GAUNTLET_36083 = 36083; + public static final int THE_GAUNTLET_36084 = 36084; + public static final int BANK_DEPOSIT_BOX_36086 = 36086; + public static final int REWARD_CHEST_36087 = 36087; + public static final int REWARD_CHEST_36088 = 36088; + public static final int ILLUMINATED_SYMBOL_36095 = 36095; + public static final int INACTIVE_SYMBOL_36097 = 36097; + public static final int NODE_36101 = 36101; + public static final int NODE_36102 = 36102; + public static final int ROCK_FORMATION_GLOWING = 36192; + public static final int ROCK_FORMATION = 36193; + public static final int ROCK_FORMATION_DEPLETED = 36194; + public static final int FURNACE_36195 = 36195; + public static final int ALTAR_36196 = 36196; + public static final int TELEPORT_PLATFORM_36197 = 36197; + public static final int TELEPORT_PLATFORM_36198 = 36198; + public static final int DEMONIC_SYMBOL = 36199; + public static final int DEMONIC_SYMBOL_36200 = 36200; + public static final int BARRIER_36201 = 36201; + public static final int ROCKS_36202 = 36202; + public static final int ROCKS_36203 = 36203; + public static final int ROCKS_36204 = 36204; + public static final int ROCKS_36205 = 36205; + public static final int ROCKS_36206 = 36206; + public static final int ROCKS_36207 = 36207; + public static final int ROCKS_36208 = 36208; + public static final int ROCKS_36209 = 36209; + public static final int ROCKS_36210 = 36210; + public static final int STEPS_36215 = 36215; + public static final int CRYSTAL_OUTCROP_36217 = 36217; + public static final int CRYSTAL_OUTCROP_36218 = 36218; + public static final int MINE_CART_36219 = 36219; + public static final int LADDER_36221 = 36221; + public static final int TIGHTROPE_36225 = 36225; + public static final int CHIMNEY_36227 = 36227; + public static final int ROOF_EDGE = 36228; + public static final int DARK_HOLE_36229 = 36229; + public static final int LADDER_36231 = 36231; + public static final int LADDER_36232 = 36232; + public static final int ROPE_BRIDGE_36233 = 36233; + public static final int TIGHTROPE_36234 = 36234; + public static final int ROPE_BRIDGE_36235 = 36235; + public static final int TIGHTROPE_36236 = 36236; + public static final int TIGHTROPE_36237 = 36237; + public static final int DARK_HOLE_36238 = 36238; + public static final int PORTAL_36240 = 36240; + public static final int DOOR_36253 = 36253; + public static final int DOOR_36254 = 36254; + public static final int CRYSTAL_STAIRCASE = 36387; + public static final int CRYSTAL_STAIRCASE_36390 = 36390; + public static final int TELEPORT_PLATFORM_36490 = 36490; + public static final int MEMORIAM_DEVICE = 36491; + public static final int ELVEN_LAMP_36492 = 36492; + public static final int CRYSTAL_SPIRE = 36493; + public static final int BENCH_36494 = 36494; + public static final int STAFF_BARREL = 36495; + public static final int WAND_RACK = 36496; + public static final int DISPLAY_CASE_36497 = 36497; + public static final int SHOP_COUNTER_36498 = 36498; + public static final int SCROLL = 36499; + public static final int SCROLL_36500 = 36500; + public static final int SIGN_36501 = 36501; + public static final int SHELVES_36502 = 36502; + public static final int SHELVES_36503 = 36503; + public static final int SHELVES_36504 = 36504; + public static final int SHELVES_36505 = 36505; + public static final int RUNE_POUCHES = 36506; + public static final int CITY_GATE_36518 = 36518; + public static final int CITY_GATE_36519 = 36519; + public static final int CITY_GATE_36520 = 36520; + public static final int CITY_GATE_36521 = 36521; + public static final int CITY_GATE_36522 = 36522; + public static final int CITY_GATE_36523 = 36523; + public static final int SINGING_BOWL_36552 = 36552; + public static final int BELL_36553 = 36553; + public static final int BELL_MECHANISM_36554 = 36554; + public static final int FURNACE_36555 = 36555; + public static final int CAVE_ENTRANCE_36556 = 36556; + public static final int CLOSED_CHEST_36557 = 36557; + public static final int CHEST_36558 = 36558; + public static final int BANK_BOOTH_36559 = 36559; + public static final int CLOSED_BANK_BOOTH_36560 = 36560; + public static final int ARMOUR_STAND_36561 = 36561; + public static final int SAND_PIT_36563 = 36563; + public static final int TABLE_36564 = 36564; + public static final int DUMMY_36566 = 36566; + public static final int TABLE_SAW = 36567; + public static final int MARKET_STALL_36568 = 36568; + public static final int SILK_STALL_36569 = 36569; + public static final int SILVER_STALL_36570 = 36570; + public static final int GEM_STALL_36571 = 36571; + public static final int SPICE_STALL_36572 = 36572; + public static final int AMLODD_BANNER = 36573; + public static final int CADARN_BANNER = 36574; + public static final int CRWYS_BANNER = 36575; + public static final int HEFIN_BANNER = 36576; + public static final int IORWERTH_BANNER = 36577; + public static final int ITHELL_BANNER = 36578; + public static final int MEILYR_BANNER = 36579; + public static final int TRAHAEARN_BANNER = 36580; + public static final int ELVEN_CRYSTAL_CHEST = 36581; + public static final int ELVEN_CRYSTAL_CHEST_36582 = 36582; + public static final int SAILS_36583 = 36583; + public static final int MILL_36586 = 36586; + public static final int MILL_36587 = 36587; + public static final int MILL_36588 = 36588; + public static final int MILL_36589 = 36589; + public static final int FLOUR_BIN_36590 = 36590; + public static final int HOPPER_36591 = 36591; + public static final int HOPPER_CONTROLS_36592 = 36592; + public static final int CENOTAPH = 36593; + public static final int CORPSES = 36594; + public static final int STATUE_36595 = 36595; + public static final int STATUE_36596 = 36596; + public static final int STEPS_36597 = 36597; + public static final int CAVE_36598 = 36598; + public static final int SIGN_36600 = 36600; + public static final int CRYSTAL_OUTCROP_36604 = 36604; + public static final int BUSH_36605 = 36605; + public static final int COOKING_POTS_36606 = 36606; + public static final int ROCK_36607 = 36607; + public static final int BOOKCASE_36608 = 36608; + public static final int FLAGPOLE_36609 = 36609; + public static final int CHAIR_36610 = 36610; + public static final int DESK_36611 = 36611; + public static final int STOOL_36612 = 36612; + public static final int STOOL_36613 = 36613; + public static final int TELEPORT_PLATFORM_36614 = 36614; + public static final int TELEPORT_PLATFORM_36615 = 36615; + public static final int BOOKCASE_36616 = 36616; + public static final int BOOKCASE_36617 = 36617; + public static final int BOOKCASE_36618 = 36618; + public static final int BOOKCASE_36623 = 36623; + public static final int BOOKCASE_36624 = 36624; + public static final int BOOKCASE_36625 = 36625; + public static final int BOOKCASE_36626 = 36626; + public static final int BOOKCASE_36627 = 36627; + public static final int BOOKCASE_36628 = 36628; + public static final int BOOKCASE_36629 = 36629; + public static final int BOOKCASE_36630 = 36630; + public static final int BOOKCASE_36631 = 36631; + public static final int BOOKCASE_36632 = 36632; + public static final int BOOKCASE_36633 = 36633; + public static final int BOOKCASE_36634 = 36634; + public static final int BOOKCASE_36635 = 36635; + public static final int BOOKCASE_36636 = 36636; + public static final int BOOKCASE_36637 = 36637; + public static final int BOOKCASE_36638 = 36638; + public static final int BOOKCASE_36639 = 36639; + public static final int BOOKCASE_36640 = 36640; + public static final int BOOKCASE_36641 = 36641; + public static final int BOOKCASE_36642 = 36642; + public static final int BOOKCASE_36643 = 36643; + public static final int BOOKCASE_36644 = 36644; + public static final int BOOKCASE_36645 = 36645; + public static final int BOOKCASE_36646 = 36646; + public static final int BOOKCASE_36647 = 36647; + public static final int BOOKCASE_36648 = 36648; + public static final int BOOKCASE_36649 = 36649; + public static final int BOOKCASE_36650 = 36650; + public static final int BOOKCASE_36651 = 36651; + public static final int BOOKCASE_36652 = 36652; + public static final int BOOKCASE_36653 = 36653; + public static final int BOOKCASE_36654 = 36654; + public static final int BOOKS_36660 = 36660; + public static final int BOOKS_36661 = 36661; + public static final int BOOKS_36662 = 36662; + public static final int BOOK_CART_36663 = 36663; + public static final int BOOK_CART_36664 = 36664; + public static final int BOOK_CART_36665 = 36665; + public static final int BUST_36666 = 36666; + public static final int BUST_36667 = 36667; + public static final int BUST_36668 = 36668; + public static final int BUST_36669 = 36669; + public static final int BUST_36670 = 36670; + public static final int BUST_36671 = 36671; + public static final int TREE_36672 = 36672; + public static final int TREE_STUMP_36673 = 36673; + public static final int TREE_36674 = 36674; + public static final int TREE_STUMP_36675 = 36675; + public static final int TREE_36676 = 36676; + public static final int TREE_36677 = 36677; + public static final int TREE_STUMP_36678 = 36678; + public static final int TREE_36679 = 36679; + public static final int TREE_STUMP_36680 = 36680; + public static final int MAPLE_TREE_36681 = 36681; + public static final int MAPLE_TREE_36682 = 36682; + public static final int YEW_36683 = 36683; + public static final int TREE_STUMP_36684 = 36684; + public static final int MAGIC_TREE_36685 = 36685; + public static final int TEAK_36686 = 36686; + public static final int TREE_STUMP_36687 = 36687; + public static final int MAHOGANY_36688 = 36688; + public static final int TREE_STUMP_36689 = 36689; + public static final int CAVE_36690 = 36690; + public static final int STEPS_36691 = 36691; + public static final int TIGHT_GAP = 36692; + public static final int TIGHT_GAP_36693 = 36693; + public static final int TIGHT_GAP_36694 = 36694; + public static final int TIGHT_GAP_36695 = 36695; + public static final int EYE = 36698; + public static final int RANGE_36699 = 36699; + public static final int CRYSTAL_SINGING_RECIPES_37344 = 37344; + public static final int ARCHERY_TARGET_37345 = 37345; /* This file is automatically generated. Do not edit. */ } From 9941851a6ab694b1e90f9cd0816fcacb167dcca4 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 25 Jul 2019 09:33:33 +0000 Subject: [PATCH 27/30] Update NPC IDs to 2019-07-25-rev181 --- .../src/main/java/net/runelite/api/NpcID.java | 573 +++++++++++++++--- 1 file changed, 481 insertions(+), 92 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 72ae50b468..2366ee69ad 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -98,7 +98,6 @@ public final class NpcID public static final int GHOST_95 = 95; public static final int GHOST_96 = 96; public static final int GHOST_97 = 97; - public static final int SOULLESS = 98; public static final int DEATH_WING = 99; public static final int ROCK_CRAB = 100; public static final int ROCKS = 101; @@ -622,7 +621,6 @@ public final class NpcID public static final int FISHING_SPOT = 635; public static final int KARAMTHULHU = 636; public static final int FUNGI_637 = 637; - public static final int ELF_TRACKER = 638; public static final int TYRAS_GUARD = 639; public static final int UG = 640; public static final int AGA = 641; @@ -860,8 +858,7 @@ public final class NpcID public static final int SCARG = 886; public static final int GRUH = 887; public static final int IRWIN_FEASELBAUM = 888; - public static final int ELUNED = 889; - public static final int MOSS_GIANT = 891; + public static final int MOSS_GUARDIAN = 891; public static final int GOLRIE = 892; public static final int FATHER_REEN = 893; public static final int FATHER_REEN_894 = 894; @@ -1069,15 +1066,11 @@ public final class NpcID public static final int CHANCY_1106 = 1106; public static final int HOPS = 1107; public static final int HOPS_1108 = 1108; - public static final int GUIDORS_WIFE = 1109; + public static final int JULIE = 1109; public static final int GUIDOR = 1110; public static final int GUARD_1111 = 1111; public static final int GUARD_1112 = 1112; public static final int GUARD_1113 = 1113; - public static final int MOURNER = 1114; - public static final int MOURNER_1115 = 1115; - public static final int KILRON = 1116; - public static final int OMART = 1117; public static final int MAN_1118 = 1118; public static final int WOMAN = 1119; public static final int DOMINIC_ONION = 1120; @@ -1091,22 +1084,16 @@ public final class NpcID public static final int CHILD_1133 = 1133; public static final int DAMIS_HARD = 1134; public static final int DAMIS_HARD_1135 = 1135; - public static final int MOURNER_1136 = 1136; public static final int PRIEST = 1137; public static final int MAN_1138 = 1138; public static final int WOMAN_1139 = 1139; public static final int WOMAN_1140 = 1140; public static final int WOMAN_1141 = 1141; public static final int WOMAN_1142 = 1142; - public static final int KING_LATHAS = 1143; public static final int PALADIN = 1144; public static final int JERICO = 1145; public static final int CHEMIST = 1146; public static final int GUARD_1147 = 1147; - public static final int MOURNER_1148 = 1148; - public static final int MOURNER_1149 = 1149; - public static final int MOURNER_1150 = 1150; - public static final int MOURNER_1151 = 1151; public static final int NURSE_SARAH = 1152; public static final int OGRE_1153 = 1153; public static final int SHARK = 1154; @@ -1941,7 +1928,7 @@ public final class NpcID public static final int ICE_GIANT_2087 = 2087; public static final int ICE_GIANT_2088 = 2088; public static final int ICE_GIANT_2089 = 2089; - public static final int MOSS_GIANT_2090 = 2090; + public static final int MOSS_GIANT = 2090; public static final int MOSS_GIANT_2091 = 2091; public static final int MOSS_GIANT_2092 = 2092; public static final int MOSS_GIANT_2093 = 2093; @@ -2732,7 +2719,7 @@ public final class NpcID public static final int SHOP_KEEPER_2884 = 2884; public static final int SHOP_ASSISTANT_2885 = 2885; public static final int AUBURY = 2886; - public static final int FANCY_DRESS_SHOP_OWNER = 2887; + public static final int ASYFF = 2887; public static final int SHOP_KEEPER_2888 = 2888; public static final int GRUM_2889 = 2889; public static final int WYDIN_2890 = 2890; @@ -3022,7 +3009,6 @@ public final class NpcID public static final int IRKSOL = 3203; public static final int FAIRY_3204 = 3204; public static final int ZAMBO = 3205; - public static final int SILVER_MERCHANT = 3206; public static final int GEM_MERCHANT = 3207; public static final int BAKER = 3208; public static final int SPICE_SELLER = 3209; @@ -3221,15 +3207,11 @@ public final class NpcID public static final int GRIZZLY_BEAR_CUB = 3424; public static final int GRIZZLY_BEAR_CUB_3425 = 3425; public static final int DIRE_WOLF = 3426; - public static final int LORD_IORWERTH = 3427; - public static final int ELF_WARRIOR = 3428; - public static final int ELF_WARRIOR_3429 = 3429; - public static final int ELVEN_CITY_GUARD = 3430; - public static final int ELF_WARRIOR_3431 = 3431; + public static final int IORWERTH_ARCHER = 3428; + public static final int IORWERTH_WARRIOR = 3429; public static final int ARIANWYN = 3432; public static final int TYRAS_GUARD_3433 = 3433; public static final int TYRAS_GUARD_3434 = 3434; - public static final int TYRAS_GUARD_3435 = 3435; public static final int TYRAS_GUARD_3436 = 3436; public static final int GENERAL_HINING = 3437; public static final int QUARTERMASTER = 3438; @@ -3767,13 +3749,12 @@ public final class NpcID public static final int ZOMBIE_3980 = 3980; public static final int ZOMBIE_3981 = 3981; public static final int LESSER_DEMON_3982 = 3982; - public static final int COUNCILLOR_HALGRIVE = 3983; public static final int DOCTOR_ORBON = 3984; public static final int FARMER_BRUMTY = 3985; - public static final int SICKLOOKING_SHEEP_1 = 3986; - public static final int SICKLOOKING_SHEEP_2 = 3987; - public static final int SICKLOOKING_SHEEP_3 = 3988; - public static final int SICKLOOKING_SHEEP_4 = 3989; + public static final int RED_SHEEP = 3986; + public static final int GREEN_SHEEP = 3987; + public static final int BLUE_SHEEP = 3988; + public static final int YELLOW_SHEEP = 3989; public static final int BOY = 3994; public static final int NORA_T_HAGG = 3995; public static final int WITCHS_EXPERIMENT = 3996; @@ -3785,10 +3766,6 @@ public final class NpcID public static final int CHOMPY_CHICK_4002 = 4002; public static final int SHADOW_4004 = 4004; public static final int DARK_BEAST = 4005; - public static final int MOURNER_4006 = 4006; - public static final int SLAVE = 4007; - public static final int SLAVE_4008 = 4008; - public static final int SLAVE_4009 = 4009; public static final int THORGEL = 4010; public static final int BILL_TEACH = 4011; public static final int BILL_TEACH_4012 = 4012; @@ -3977,7 +3954,7 @@ public final class NpcID public static final int SCABARAS = 4197; public static final int CRONDIS = 4198; public static final int ICTHLARIN = 4199; - public static final int SLAVE_4200 = 4200; + public static final int SLAVE = 4200; public static final int SLAVE_4201 = 4201; public static final int EMBALMER = 4202; public static final int CARPENTER = 4203; @@ -4030,26 +4007,18 @@ public final class NpcID public static final int ALRENA_4251 = 4251; public static final int BRAVEK = 4252; public static final int BRAVEK_4253 = 4253; - public static final int CARLA = 4254; public static final int CLERK = 4255; public static final int EDMOND_4256 = 4256; public static final int ELENA_4257 = 4257; - public static final int HEAD_MOURNER = 4258; - public static final int MOURNER_4259 = 4259; - public static final int MOURNER_4260 = 4260; - public static final int MOURNER_4261 = 4261; - public static final int RECRUITER = 4262; public static final int TED_REHNISON = 4263; public static final int MARTHA_REHNISON = 4264; public static final int BILLY_REHNISON = 4265; public static final int MILLI_REHNISON = 4266; - public static final int JETHICK = 4267; public static final int MAN_4268 = 4268; public static final int MAN_4269 = 4269; public static final int MAN_4270 = 4270; public static final int MAN_4271 = 4271; public static final int MAN_4272 = 4272; - public static final int MOURNER_4273 = 4273; public static final int LEELA = 4274; public static final int JOE_4275 = 4275; public static final int JAIL_GUARD = 4276; @@ -4292,38 +4261,13 @@ public final class NpcID public static final int GUARD_4525 = 4525; public static final int GUARD_4526 = 4526; public static final int CHADWELL = 4527; - public static final int KOFTIK_4528 = 4528; - public static final int KOFTIK_4529 = 4529; - public static final int KOFTIK_4530 = 4530; - public static final int KOFTIK_4531 = 4531; - public static final int KOFTIK_4532 = 4532; public static final int BLESSED_SPIDER = 4533; public static final int BLESSED_GIANT_RAT = 4534; public static final int BLESSED_GIANT_RAT_4535 = 4535; - public static final int SLAVE_4536 = 4536; - public static final int SLAVE_4537 = 4537; - public static final int SLAVE_4538 = 4538; - public static final int SLAVE_4539 = 4539; - public static final int SLAVE_4540 = 4540; - public static final int SLAVE_4541 = 4541; - public static final int SLAVE_4542 = 4542; public static final int BOULDER_4543 = 4543; - public static final int UNICORN_4544 = 4544; - public static final int SIR_JERRO = 4545; - public static final int SIR_CARL = 4546; - public static final int SIR_HARRY = 4547; - public static final int HALFSOULLESS = 4548; - public static final int KARDIA = 4549; - public static final int WITCHS_CAT = 4550; public static final int NILOOF = 4551; public static final int KLANK = 4552; public static final int KAMEN = 4553; - public static final int KALRAG = 4554; - public static final int OTHAINIAN = 4555; - public static final int DOOMION = 4556; - public static final int HOLTHION = 4557; - public static final int DISCIPLE_OF_IBAN = 4559; - public static final int LORD_IBAN = 4560; public static final int SPIDER_4561 = 4561; public static final int GIANT_BAT_4562 = 4562; public static final int MONK_4563 = 4563; @@ -4341,11 +4285,11 @@ public final class NpcID public static final int POX_4575 = 4575; public static final int BONES_4576 = 4576; public static final int CERIL_CARNILLEAN_4577 = 4577; - public static final int COUNCILLOR_HALGRIVE_4578 = 4578; + public static final int COUNCILLOR_HALGRIVE = 4578; public static final int SPICE_SELLER_4579 = 4579; public static final int FUR_TRADER_4580 = 4580; public static final int GEM_MERCHANT_4581 = 4581; - public static final int SILVER_MERCHANT_4582 = 4582; + public static final int SILVER_MERCHANT = 4582; public static final int SILK_MERCHANT_4583 = 4583; public static final int ZENESHA = 4584; public static final int ALI_MORRISANE_4585 = 4585; @@ -5009,34 +4953,25 @@ public final class NpcID public static final int MONKEY_ZOMBIE_5282 = 5282; public static final int MONKEY_ZOMBIE_5283 = 5283; public static final int BONZARA = 5284; - public static final int MOURNER_5285 = 5285; - public static final int MOURNER_5286 = 5286; - public static final int MOURNER_5287 = 5287; public static final int EMBALMER_5288 = 5288; public static final int CARPENTER_5289 = 5289; public static final int LINEN_WORKER = 5290; public static final int PRIEST_5291 = 5291; - public static final int ARIANWYN_5292 = 5292; - public static final int ELF_WARRIOR_5293 = 5293; + public static final int ELF_WARRIOR = 5293; public static final int ELF_WARRIOR_5294 = 5294; - public static final int ELF_WARRIOR_5295 = 5295; - public static final int ELF_WARRIOR_5296 = 5296; + public static final int ELF_ARCHER = 5295; + public static final int ELF_ARCHER_5296 = 5296; public static final int GOREU = 5297; - public static final int YSGAWYN = 5298; public static final int ARVEL = 5299; public static final int MAWRTH = 5300; - public static final int KELYN = 5301; public static final int EOIN = 5302; public static final int IONA = 5303; - public static final int ELUNED_5304 = 5304; - public static final int SICKLOOKING_SHEEP_1_5305 = 5305; - public static final int SICKLOOKING_SHEEP_2_5306 = 5306; - public static final int SICKLOOKING_SHEEP_3_5307 = 5307; - public static final int SICKLOOKING_SHEEP_4_5308 = 5308; + public static final int ELUNED = 5304; + public static final int RED_SHEEP_5305 = 5305; + public static final int GREEN_SHEEP_5306 = 5306; + public static final int BLUE_SHEEP_5307 = 5307; + public static final int YELLOW_SHEEP_5308 = 5308; public static final int GNOME_5309 = 5309; - public static final int HEAD_MOURNER_5310 = 5310; - public static final int MOURNER_5311 = 5311; - public static final int MOURNER_5312 = 5312; public static final int GPDT_EMPLOYEE = 5313; public static final int HORACIO = 5315; public static final int KANGAI_MAU = 5316; @@ -5826,7 +5761,7 @@ public final class NpcID public static final int THE_KENDAL_HARD = 6322; public static final int GIANT_ROC_HARD = 6323; public static final int SLAGILITH_HARD = 6324; - public static final int MOSS_GIANT_HARD = 6325; + public static final int MOSS_GUARDIAN_HARD = 6325; public static final int SKELETON_HELLHOUND_HARD = 6326; public static final int AGRITH_NAAR_HARD = 6327; public static final int KING_ROALD_HARD = 6328; @@ -5887,7 +5822,7 @@ public final class NpcID public static final int THE_KENDAL_6383 = 6383; public static final int GIANT_ROC_6384 = 6384; public static final int SLAGILITH_6385 = 6385; - public static final int MOSS_GIANT_6386 = 6386; + public static final int MOSS_GUARDIAN_6386 = 6386; public static final int SKELETON_HELLHOUND_6387 = 6387; public static final int AGRITH_NAAR_6388 = 6388; public static final int KING_ROALD_6389 = 6389; @@ -6756,7 +6691,6 @@ public final class NpcID public static final int WINTER_SOLDIER = 7379; public static final int CAT_7380 = 7380; public static final int WINTERTOAD = 7381; - public static final int ED = 7382; public static final int SNOW = 7383; public static final int STUMPY = 7384; public static final int PUMPY = 7385; @@ -7067,7 +7001,7 @@ public final class NpcID public static final int FISHING_SPOT_7731 = 7731; public static final int FISHING_SPOT_7732 = 7732; public static final int FISHING_SPOT_7733 = 7733; - public static final int RECRUITER_7734 = 7734; + public static final int RECRUITER = 7734; public static final int ROCK_GOLEM_7736 = 7736; public static final int ROCK_GOLEM_7737 = 7737; public static final int ROCK_GOLEM_7738 = 7738; @@ -7318,7 +7252,7 @@ public final class NpcID public static final int AEONISIG_RAISPHER_8043 = 8043; public static final int SIR_AMIK_VARZE_8044 = 8044; public static final int SIR_TIFFY_CASHIEN_8045 = 8045; - public static final int KING_LATHAS_8046 = 8046; + public static final int KING_LATHAS = 8046; public static final int KING_ARTHUR_8047 = 8047; public static final int BRUNDT_THE_CHIEFTAIN_8048 = 8048; public static final int ONEIROMANCER_8049 = 8049; @@ -7845,7 +7779,6 @@ public final class NpcID public static final int PUFFER_FISH_8667 = 8667; public static final int ISLWYN_8675 = 8675; public static final int ILFEEN = 8676; - public static final int ILFEEN_8677 = 8677; public static final int FERAL_VAMPYRE_8678 = 8678; public static final int ABIDOR_CRANK_8679 = 8679; public static final int DAVON = 8680; @@ -7883,5 +7816,461 @@ public final class NpcID public static final int SPAWN_OF_SARACHNIS = 8714; public static final int SPAWN_OF_SARACHNIS_8715 = 8715; public static final int JUSTINE = 8721; + public static final int SILVER_MERCHANT_8722 = 8722; + public static final int GEM_MERCHANT_8723 = 8723; + public static final int BAKER_8724 = 8724; + public static final int BAKER_8725 = 8725; + public static final int SPICE_SELLER_8726 = 8726; + public static final int FUR_TRADER_8727 = 8727; + public static final int SILK_MERCHANT_8728 = 8728; + public static final int YOUNGLLEF = 8729; + public static final int CORRUPTED_YOUNGLLEF = 8730; + public static final int SMOLCANO = 8731; + public static final int MUGGER_8732 = 8732; + public static final int CRAB_8733 = 8733; + public static final int SOULLESS = 8734; + public static final int MOSS_GIANT_8736 = 8736; + public static final int YOUNGLLEF_8737 = 8737; + public static final int CORRUPTED_YOUNGLLEF_8738 = 8738; + public static final int SMOLCANO_8739 = 8739; + public static final int CRYSTAL_IMPLING = 8741; + public static final int CRYSTAL_IMPLING_8742 = 8742; + public static final int CRYSTAL_IMPLING_8743 = 8743; + public static final int CRYSTAL_IMPLING_8744 = 8744; + public static final int CRYSTAL_IMPLING_8745 = 8745; + public static final int CRYSTAL_IMPLING_8746 = 8746; + public static final int CRYSTAL_IMPLING_8747 = 8747; + public static final int CRYSTAL_IMPLING_8748 = 8748; + public static final int CRYSTAL_IMPLING_8749 = 8749; + public static final int CRYSTAL_IMPLING_8750 = 8750; + public static final int CRYSTAL_IMPLING_8751 = 8751; + public static final int CRYSTAL_IMPLING_8752 = 8752; + public static final int CRYSTAL_IMPLING_8753 = 8753; + public static final int CRYSTAL_IMPLING_8754 = 8754; + public static final int CRYSTAL_IMPLING_8755 = 8755; + public static final int CRYSTAL_IMPLING_8756 = 8756; + public static final int CRYSTAL_IMPLING_8757 = 8757; + public static final int LORD_IORWERTH = 8758; + public static final int IORWERTH_WARRIOR_8759 = 8759; + public static final int IORWERTH_ARCHER_8760 = 8760; + public static final int ELF_TRACKER = 8761; + public static final int TYRAS_GUARD_8762 = 8762; + public static final int CAPTAIN_BARNABY_8763 = 8763; + public static final int CAPTAIN_BARNABY_8764 = 8764; + public static final int COUNCILLOR_HALGRIVE_8765 = 8765; + public static final int ELUNED_8766 = 8766; + public static final int ELUNED_8767 = 8767; + public static final int ELVEN_SCOUT = 8768; + public static final int ILFEEN_8769 = 8769; + public static final int ELVEN_SCOUT_8770 = 8770; + public static final int MOURNER = 8771; + public static final int SLAVE_8772 = 8772; + public static final int SLAVE_8773 = 8773; + public static final int SLAVE_8774 = 8774; + public static final int SEREN = 8775; + public static final int MEMORY_OF_SEREN = 8776; + public static final int MEMORY_OF_SEREN_8777 = 8777; + public static final int MEMORY_OF_SEREN_8778 = 8778; + public static final int MEMORY_OF_SEREN_8779 = 8779; + public static final int MEMORY_OF_SEREN_8780 = 8780; + public static final int MEMORY_OF_SEREN_8781 = 8781; + public static final int MEMORY_OF_SEREN_8782 = 8782; + public static final int MEMORY_OF_SEREN_8783 = 8783; + public static final int MEMORY_OF_SEREN_8784 = 8784; + public static final int ELENA_8791 = 8791; + public static final int ELENA_8792 = 8792; + public static final int ELENA_8793 = 8793; + public static final int ELENA_8794 = 8794; + public static final int ELENA_8795 = 8795; + public static final int ELENA_8797 = 8797; + public static final int ELENA_8798 = 8798; + public static final int KNIGHT_OF_ARDOUGNE_8799 = 8799; + public static final int KNIGHT_OF_ARDOUGNE_8800 = 8800; + public static final int KNIGHT_OF_ARDOUGNE_8801 = 8801; + public static final int COUNCILLOR_HALGRIVE_8802 = 8802; + public static final int COUNCILLOR_HALGRIVE_8803 = 8803; + public static final int OMART = 8804; + public static final int KILRON = 8805; + public static final int JETHICK = 8806; + public static final int CARLA = 8807; + public static final int BAXTORIAN = 8808; + public static final int BAXTORIAN_8809 = 8809; + public static final int BAXTORIAN_8810 = 8810; + public static final int BAXTORIAN_8811 = 8811; + public static final int BAXTORIAN_8812 = 8812; + public static final int BAXTORIAN_8813 = 8813; + public static final int YSGAWYN = 8814; + public static final int YSGAWYN_8815 = 8815; + public static final int YSGAWYN_8816 = 8816; + public static final int ISLWYN_8818 = 8818; + public static final int ISLWYN_8819 = 8819; + public static final int ISLWYN_8821 = 8821; + public static final int ISLWYN_8822 = 8822; + public static final int ISLWYN_8823 = 8823; + public static final int ILFEEN_8825 = 8825; + public static final int ILFEEN_8827 = 8827; + public static final int ELUNED_8829 = 8829; + public static final int ELUNED_8830 = 8830; + public static final int RESISTANCE_FIGHTER = 8831; + public static final int RESISTANCE_FIGHTER_8832 = 8832; + public static final int RESISTANCE_FIGHTER_8833 = 8833; + public static final int RESISTANCE_FIGHTER_8834 = 8834; + public static final int RESISTANCE_FIGHTER_8835 = 8835; + public static final int OMART_8836 = 8836; + public static final int KILRON_8837 = 8837; + public static final int ELENA_8838 = 8838; + public static final int JETHICK_8839 = 8839; + public static final int OMART_8840 = 8840; + public static final int KILRON_8841 = 8841; + public static final int KING_LATHAS_8842 = 8842; + public static final int LATHAS = 8843; + public static final int MOURNER_8844 = 8844; + public static final int MOURNER_8845 = 8845; + public static final int MOURNER_8846 = 8846; + public static final int ESSYLLT_8847 = 8847; + public static final int GNOME_8848 = 8848; + public static final int PALADIN_8849 = 8849; + public static final int PALADIN_8850 = 8850; + public static final int KNIGHT_OF_ARDOUGNE_8851 = 8851; + public static final int KNIGHT_OF_ARDOUGNE_8852 = 8852; + public static final int PALADIN_8853 = 8853; + public static final int KNIGHT_OF_ARDOUGNE_8854 = 8854; + public static final int KNIGHT_OF_ARDOUGNE_8855 = 8855; + public static final int EXECUTIONER = 8856; + public static final int HOODED_FIGURE = 8857; + public static final int MAN_8858 = 8858; + public static final int MAN_8859 = 8859; + public static final int MAN_8860 = 8860; + public static final int MAN_8861 = 8861; + public static final int MAN_8862 = 8862; + public static final int WOMAN_8863 = 8863; + public static final int WOMAN_8864 = 8864; + public static final int ARIANWYN_8865 = 8865; + public static final int ARIANWYN_8866 = 8866; + public static final int ARIANWYN_8867 = 8867; + public static final int ARIANWYN_8868 = 8868; + public static final int MORVRAN_8869 = 8869; + public static final int MORVRAN_8870 = 8870; + public static final int ESSYLLT_8871 = 8871; + public static final int ESSYLLT_8872 = 8872; + public static final int LORD_IORWERTH_8873 = 8873; + public static final int LORD_IORWERTH_8874 = 8874; + public static final int LORD_IORWERTH_8875 = 8875; + public static final int LORD_IORWERTH_8876 = 8876; + public static final int IORWERTH_WARRIOR_8877 = 8877; + public static final int IORWERTH_ARCHER_8878 = 8878; + public static final int IORWERTH_WARRIOR_8879 = 8879; + public static final int IORWERTH_ARCHER_8880 = 8880; + public static final int IORWERTH_WARRIOR_8881 = 8881; + public static final int IORWERTH_WARRIOR_8882 = 8882; + public static final int IORWERTH_WARRIOR_8883 = 8883; + public static final int IORWERTH_WARRIOR_8884 = 8884; + public static final int IORWERTH_ARCHER_8885 = 8885; + public static final int IORWERTH_ARCHER_8886 = 8886; + public static final int REBEL_ARCHER = 8887; + public static final int REBEL_ARCHER_8888 = 8888; + public static final int REBEL_ARCHER_8889 = 8889; + public static final int REBEL_WARRIOR = 8890; + public static final int REBEL_WARRIOR_8891 = 8891; + public static final int LADY_TANGWEN_TRAHAEARN = 8892; + public static final int ELDERLY_ELF = 8893; + public static final int ELDERLY_ELF_8894 = 8894; + public static final int LADY_TANGWEN_TRAHAEARN_8895 = 8895; + public static final int MYSTERIOUS_FIGURE = 8897; + public static final int LORD_IEUAN_AMLODD = 8898; + public static final int LORD_IEUAN_AMLODD_8899 = 8899; + public static final int TREE_8901 = 8901; + public static final int TREE_8902 = 8902; + public static final int LORD_PIQUAN_CRWYS = 8903; + public static final int LORD_PIQUAN_CRWYS_8904 = 8904; + public static final int ELF_HERMIT = 8906; + public static final int LADY_CARYS_HEFIN = 8907; + public static final int LADY_CARYS_HEFIN_8908 = 8908; + public static final int LADY_FFION_MEILYR = 8910; + public static final int LADY_FFION_MEILYR_8911 = 8911; + public static final int LADY_KELYN_ITHELL = 8913; + public static final int KELYN = 8914; + public static final int LADY_KELYN_ITHELL_8915 = 8915; + public static final int FRAGMENT_OF_SEREN = 8917; + public static final int FRAGMENT_OF_SEREN_8918 = 8918; + public static final int FRAGMENT_OF_SEREN_8919 = 8919; + public static final int FRAGMENT_OF_SEREN_8920 = 8920; + public static final int CRYSTAL_WHIRLWIND = 8921; + public static final int IORWERTH_WARRIOR_8922 = 8922; + public static final int IORWERTH_ARCHER_8923 = 8923; + public static final int IESTIN = 8924; + public static final int IESTIN_8925 = 8925; + public static final int IESTIN_8926 = 8926; + public static final int MAWRTH_8927 = 8927; + public static final int MAWRTH_8928 = 8928; + public static final int IONA_8929 = 8929; + public static final int EOIN_8930 = 8930; + public static final int EOIN_8931 = 8931; + public static final int REBEL_ARCHER_8932 = 8932; + public static final int REBEL_ARCHER_8933 = 8933; + public static final int REBEL_WARRIOR_8934 = 8934; + public static final int REBEL_WARRIOR_8935 = 8935; + public static final int IORWERTH_ARCHER_8936 = 8936; + public static final int IORWERTH_ARCHER_8937 = 8937; + public static final int IORWERTH_WARRIOR_8938 = 8938; + public static final int IORWERTH_WARRIOR_8939 = 8939; + public static final int KLANK_8940 = 8940; + public static final int NILOOF_8941 = 8941; + public static final int KAMEN_8942 = 8942; + public static final int THORGEL_8943 = 8943; + public static final int GENERAL_HINING_8944 = 8944; + public static final int TYRAS_GUARD_8945 = 8945; + public static final int REBEL_ARCHER_8946 = 8946; + public static final int REBEL_ARCHER_8947 = 8947; + public static final int REBEL_WARRIOR_8948 = 8948; + public static final int REBEL_WARRIOR_8949 = 8949; + public static final int ESSYLLT_8950 = 8950; + public static final int BARRIER = 8951; + public static final int BARRIER_8952 = 8952; + public static final int IORWERTH_ARCHER_8953 = 8953; + public static final int IORWERTH_ARCHER_8954 = 8954; + public static final int IORWERTH_WARRIOR_8955 = 8955; + public static final int IORWERTH_WARRIOR_8956 = 8956; + public static final int REBEL_ARCHER_8957 = 8957; + public static final int REBEL_ARCHER_8958 = 8958; + public static final int REBEL_WARRIOR_8959 = 8959; + public static final int REBEL_WARRIOR_8960 = 8960; + public static final int TYRAS_GUARD_8961 = 8961; + public static final int TYRAS_GUARD_8962 = 8962; + public static final int TYRAS_GUARD_8963 = 8963; + public static final int TYRAS_GUARD_8964 = 8964; + public static final int REBEL_SCOUT = 8965; + public static final int REBEL_SCOUT_8966 = 8966; + public static final int CARLA_8967 = 8967; + public static final int CLERK_8968 = 8968; + public static final int HEAD_MOURNER = 8969; + public static final int MOURNER_8970 = 8970; + public static final int MOURNER_8971 = 8971; + public static final int MOURNER_8972 = 8972; + public static final int RECRUITER_8973 = 8973; + public static final int JETHICK_8974 = 8974; + public static final int MOURNER_8975 = 8975; + public static final int KOFTIK_8976 = 8976; + public static final int BLESSED_SPIDER_8978 = 8978; + public static final int SLAVE_8979 = 8979; + public static final int SLAVE_8980 = 8980; + public static final int SLAVE_8981 = 8981; + public static final int SLAVE_8982 = 8982; + public static final int SLAVE_8983 = 8983; + public static final int SLAVE_8984 = 8984; + public static final int SLAVE_8985 = 8985; + public static final int UNICORN_8986 = 8986; + public static final int SIR_JERRO = 8987; + public static final int SIR_CARL = 8988; + public static final int SIR_HARRY = 8989; + public static final int HALFSOULLESS = 8990; + public static final int KARDIA = 8991; + public static final int WITCHS_CAT = 8992; + public static final int KALRAG = 8993; + public static final int OTHAINIAN = 8994; + public static final int DOOMION = 8995; + public static final int HOLTHION = 8996; + public static final int DISCIPLE_OF_IBAN = 8997; + public static final int IBAN = 8998; + public static final int MOURNER_8999 = 8999; + public static final int MOURNER_9000 = 9000; + public static final int KILRON_9001 = 9001; + public static final int OMART_9002 = 9002; + public static final int MOURNER_9003 = 9003; + public static final int MOURNER_9004 = 9004; + public static final int KING_LATHAS_9005 = 9005; + public static final int KING_THOROS = 9006; + public static final int MOURNER_9007 = 9007; + public static final int MOURNER_9008 = 9008; + public static final int MOURNER_9009 = 9009; + public static final int MOURNER_9010 = 9010; + public static final int KING_THOROS_9011 = 9011; + public static final int MOURNER_9013 = 9013; + public static final int ARIANWYN_9014 = 9014; + public static final int KELYN_9015 = 9015; + public static final int ESSYLLT_9016 = 9016; + public static final int MOURNER_9017 = 9017; + public static final int MOURNER_9018 = 9018; + public static final int ED = 9019; + public static final int BRYN = 9020; + public static final int CRYSTALLINE_HUNLLEF = 9021; + public static final int CRYSTALLINE_HUNLLEF_9022 = 9022; + public static final int CRYSTALLINE_HUNLLEF_9023 = 9023; + public static final int CRYSTALLINE_HUNLLEF_9024 = 9024; + public static final int CRYSTALLINE_RAT = 9026; + public static final int CRYSTALLINE_SPIDER = 9027; + public static final int CRYSTALLINE_BAT = 9028; + public static final int CRYSTALLINE_UNICORN = 9029; + public static final int CRYSTALLINE_SCORPION = 9030; + public static final int CRYSTALLINE_WOLF = 9031; + public static final int CRYSTALLINE_BEAR = 9032; + public static final int CRYSTALLINE_DRAGON = 9033; + public static final int CRYSTALLINE_DARK_BEAST = 9034; + public static final int CORRUPTED_HUNLLEF = 9035; + public static final int CORRUPTED_HUNLLEF_9036 = 9036; + public static final int CORRUPTED_HUNLLEF_9037 = 9037; + public static final int CORRUPTED_HUNLLEF_9038 = 9038; + public static final int CORRUPTED_RAT = 9040; + public static final int CORRUPTED_SPIDER = 9041; + public static final int CORRUPTED_BAT = 9042; + public static final int CORRUPTED_UNICORN = 9043; + public static final int CORRUPTED_SCORPION = 9044; + public static final int CORRUPTED_WOLF = 9045; + public static final int CORRUPTED_BEAR = 9046; + public static final int CORRUPTED_DRAGON = 9047; + public static final int CORRUPTED_DARK_BEAST = 9048; + public static final int ZALCANO = 9049; + public static final int ZALCANO_9050 = 9050; + public static final int GOLEM_9051 = 9051; + public static final int RHIANNON = 9052; + public static final int AMROD = 9053; + public static final int MIRIEL = 9054; + public static final int CURUFIN = 9055; + public static final int ENERDHIL = 9056; + public static final int TATIE = 9057; + public static final int FINDUILAS = 9058; + public static final int GELMIR = 9059; + public static final int MITHRELLAS = 9060; + public static final int ERESTOR = 9061; + public static final int LINDIR = 9062; + public static final int IDRIL = 9063; + public static final int INGWION = 9064; + public static final int THINGOL = 9065; + public static final int ELENWE = 9066; + public static final int OROPHIN = 9067; + public static final int VAIRE = 9068; + public static final int ELLADAN = 9069; + public static final int GUILIN = 9070; + public static final int INGWE = 9071; + public static final int CIRDAN = 9072; + public static final int GLORFINDEL = 9073; + public static final int AREDHEL = 9074; + public static final int CELEGORM = 9075; + public static final int ANAIRE = 9076; + public static final int MAEGLIN = 9077; + public static final int EDRAHIL = 9078; + public static final int FINGON = 9079; + public static final int SALGANT = 9080; + public static final int CELEBRIAN = 9081; + public static final int IMIN = 9082; + public static final int OROPHER = 9083; + public static final int FINGOLFIN = 9084; + public static final int MAHTAN = 9085; + public static final int INDIS = 9086; + public static final int IMINYE = 9087; + public static final int FEANOR = 9088; + public static final int SAEROS = 9089; + public static final int NELLAS = 9090; + public static final int RHYFEL = 9091; + public static final int GWYL = 9092; + public static final int ENILLY = 9093; + public static final int FFONI = 9094; + public static final int YMLADD = 9095; + public static final int SADWRN = 9096; + public static final int DIOL = 9097; + public static final int YSBEID = 9098; + public static final int CLEDDYF = 9099; + public static final int SAETH = 9100; + public static final int NIMRODEL = 9101; + public static final int MAEDHROS = 9102; + public static final int FINARFIN = 9103; + public static final int GWINDOR = 9104; + public static final int ELDALOTE = 9105; + public static final int ENELYE = 9106; + public static final int NERDANEL = 9107; + public static final int NIMLOTH = 9108; + public static final int FINDIS = 9109; + public static final int EARWEN = 9110; + public static final int CARANTHIR = 9111; + public static final int ENEL = 9112; + public static final int HENDOR_9113 = 9113; + public static final int GALATHIL = 9114; + public static final int TURGON = 9115; + public static final int LENWE = 9116; + public static final int ARANWE = 9117; + public static final int RABBIT_9118 = 9118; + public static final int LORD_IEUAN_AMLODD_9119 = 9119; + public static final int LORD_BAXTORIAN_CADARN = 9120; + public static final int LADY_KELYN_ITHELL_9121 = 9121; + public static final int LADY_TANGWEN_TRAHAEARN_9122 = 9122; + public static final int LORD_PIQUAN_CRWYS_9123 = 9123; + public static final int LADY_FFION_MEILYR_9124 = 9124; + public static final int LADY_CARYS_HEFIN_9125 = 9125; + public static final int LORD_IESTIN_IORWERTH = 9126; + public static final int BANKER_9127 = 9127; + public static final int BANKER_9128 = 9128; + public static final int BANKER_9129 = 9129; + public static final int BANKER_9130 = 9130; + public static final int BANKER_9131 = 9131; + public static final int BANKER_9132 = 9132; + public static final int REESE = 9133; + public static final int REESE_9134 = 9134; + public static final int CONWENNA = 9135; + public static final int CONWENNA_9136 = 9136; + public static final int ALWYN = 9137; + public static final int OSWALLT = 9138; + public static final int EIRA = 9139; + public static final int SAWMILL_OPERATOR_9140 = 9140; + public static final int PENNANT = 9141; + public static final int PENNANT_9142 = 9142; + public static final int GLADIATOR = 9143; + public static final int GLADIATOR_9144 = 9144; + public static final int ELUNED_9145 = 9145; + public static final int ISLWYN_9146 = 9146; + public static final int ELENA_9148 = 9148; + public static final int MORVRAN_9149 = 9149; + public static final int LILIFANG = 9150; + public static final int CREFYDD = 9151; + public static final int YSTWYTH = 9152; + public static final int IWAN = 9153; + public static final int DERWEN_9154 = 9154; + public static final int ELGAN = 9155; + public static final int CELYN = 9156; + public static final int ANEIRIN = 9157; + public static final int GWALLTER = 9158; + public static final int GWYN = 9159; + public static final int OSIAN = 9160; + public static final int CAERWYN = 9161; + public static final int ANWEN = 9162; + public static final int GLENDA = 9163; + public static final int GUINEVERE = 9164; + public static final int NIA = 9165; + public static final int SIAN = 9166; + public static final int BRANWEN = 9167; + public static final int LLIO = 9168; + public static final int EFA = 9169; + public static final int LLIANN = 9170; + public static final int FISHING_SPOT_9171 = 9171; + public static final int FISHING_SPOT_9172 = 9172; + public static final int FISHING_SPOT_9173 = 9173; + public static final int FISHING_SPOT_9174 = 9174; + public static final int RHODDWR_TAN = 9175; + public static final int MEDDWL_YMLAEN_LLAW = 9176; + public static final int LLEIDR_GOLAU = 9177; + public static final int GWERIN_HAPUS = 9178; + public static final int PRESWYLWYR_DALL = 9179; + public static final int MARWOLAETH_DAWNSIO = 9180; + public static final int DIRE_WOLF_9181 = 9181; + public static final int GUARD_9182 = 9182; + public static final int GUARD_9183 = 9183; + public static final int GUARD_9184 = 9184; + public static final int GUARD_9185 = 9185; + public static final int GUARD_9186 = 9186; + public static final int GUARD_9187 = 9187; + public static final int GUARD_9188 = 9188; + public static final int GUARD_9189 = 9189; + public static final int GUARD_9190 = 9190; + public static final int GUARD_9191 = 9191; + public static final int RAVEN = 9192; + public static final int LENNY = 9193; + public static final int GHOST_9194 = 9194; + public static final int IAN_9195 = 9195; + public static final int SURMA = 9196; + public static final int SLIPPERS = 9197; + public static final int RED_PANDA = 9198; + public static final int BEAR_CUB_9199 = 9199; + public static final int ED_9200 = 9200; + public static final int CRAB_9201 = 9201; + public static final int TIDE = 9202; /* This file is automatically generated. Do not edit. */ } From 2d036ce614df9ca905ae09e19973456c45228220 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 25 Jul 2019 09:33:36 +0000 Subject: [PATCH 28/30] Update Scripts to 2019-07-25-rev181 --- .../main/scripts/QuestListShowProgress.hash | 2 +- .../main/scripts/QuestListShowProgress.rs2asm | 69 ++++++++----------- 2 files changed, 29 insertions(+), 42 deletions(-) diff --git a/runelite-client/src/main/scripts/QuestListShowProgress.hash b/runelite-client/src/main/scripts/QuestListShowProgress.hash index fec40c9f7d..d3899f1431 100644 --- a/runelite-client/src/main/scripts/QuestListShowProgress.hash +++ b/runelite-client/src/main/scripts/QuestListShowProgress.hash @@ -1 +1 @@ -4D9A96A7D57F6B9661273FB645A0510DD0F02C8A9C2E133772065F8AB588614D \ No newline at end of file +A6B3A7BFE7B688A08F69B91A7FD5C7184D71147D3DAF74B1262369D85DBB3A03 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm b/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm index b451af252c..275080edfc 100644 --- a/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm +++ b/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm @@ -77,14 +77,14 @@ LABEL60: iload 5 iload 6 if_icmplt LABEL64 - jump LABEL119 + jump LABEL108 LABEL64: iload 1 iload 5 cc_find iconst 1 if_icmpeq LABEL70 - jump LABEL114 + jump LABEL103 LABEL70: iload 5 invoke 1358 @@ -96,7 +96,7 @@ LABEL70: LABEL77: iconst 901389 istore 4 - jump LABEL100 + jump LABEL89 LABEL80: iload 3 iconst 0 @@ -105,24 +105,11 @@ LABEL80: LABEL84: iconst 16776960 istore 4 - jump LABEL100 + jump LABEL89 LABEL87: - iconst 105 - iconst 74 - iconst 2099 - iload 5 - enum - iconst 603 - if_icmpeq LABEL95 - jump LABEL98 -LABEL95: - iconst 10461087 - istore 4 - jump LABEL100 -LABEL98: iconst 16711680 istore 4 -LABEL100: +LABEL89: iload 4 cc_setcolour iconst 85 @@ -137,54 +124,54 @@ LABEL100: iload 4 sconst "Iii" cc_setonmouseleave -LABEL114: +LABEL103: iload 5 iconst 1 add istore 5 jump LABEL60 -LABEL119: +LABEL108: iconst 0 invoke 2265 istore 6 istore 5 -LABEL123: +LABEL112: iload 5 iload 6 - if_icmplt LABEL127 - jump LABEL171 -LABEL127: + if_icmplt LABEL116 + jump LABEL160 +LABEL116: iload 2 iload 5 cc_find iconst 1 - if_icmpeq LABEL133 - jump LABEL166 -LABEL133: + if_icmpeq LABEL122 + jump LABEL155 +LABEL122: iload 5 invoke 1359 istore 3 iload 3 iconst 2 - if_icmpeq LABEL140 - jump LABEL143 -LABEL140: + if_icmpeq LABEL129 + jump LABEL132 +LABEL129: iconst 901389 istore 4 - jump LABEL152 -LABEL143: + jump LABEL141 +LABEL132: iload 3 iconst 0 - if_icmpeq LABEL147 - jump LABEL150 -LABEL147: + if_icmpeq LABEL136 + jump LABEL139 +LABEL136: iconst 16776960 istore 4 - jump LABEL152 -LABEL150: + jump LABEL141 +LABEL139: iconst 16711680 istore 4 -LABEL152: +LABEL141: iload 4 cc_setcolour iconst 85 @@ -199,13 +186,13 @@ LABEL152: iload 4 sconst "Iii" cc_setonmouseleave -LABEL166: +LABEL155: iload 5 iconst 1 add istore 5 - jump LABEL123 -LABEL171: + jump LABEL112 +LABEL160: sconst "questProgressUpdated" runelite_callback return From e550fca3c9626812c8e3e757b7ec93c2affabd17 Mon Sep 17 00:00:00 2001 From: dekvall Date: Thu, 25 Jul 2019 15:31:15 +0200 Subject: [PATCH 29/30] Add gnome stronghold fishing spots to fishing plugin (#9444) --- .../runelite/client/plugins/fishing/FishingSpot.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java index dca9efe014..7e0b79e90b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java @@ -86,6 +86,7 @@ import static net.runelite.api.NpcID.FISHING_SPOT_8525; import static net.runelite.api.NpcID.FISHING_SPOT_8526; import static net.runelite.api.NpcID.FISHING_SPOT_8527; import static net.runelite.api.NpcID.ROD_FISHING_SPOT; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1506; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1508; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1509; import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1513; @@ -127,10 +128,11 @@ enum FishingSpot FISHING_SPOT_4316 ), SALMON("Salmon, Trout", ItemID.RAW_SALMON, - ROD_FISHING_SPOT, ROD_FISHING_SPOT_1508, ROD_FISHING_SPOT_1509, - ROD_FISHING_SPOT_1513, ROD_FISHING_SPOT_1515, ROD_FISHING_SPOT_1516, - ROD_FISHING_SPOT_1526, ROD_FISHING_SPOT_1527, ROD_FISHING_SPOT_7463, - ROD_FISHING_SPOT_7464, ROD_FISHING_SPOT_7468, ROD_FISHING_SPOT_8524 + ROD_FISHING_SPOT, ROD_FISHING_SPOT_1506, ROD_FISHING_SPOT_1508, + ROD_FISHING_SPOT_1509, ROD_FISHING_SPOT_1513, ROD_FISHING_SPOT_1515, + ROD_FISHING_SPOT_1516, ROD_FISHING_SPOT_1526, ROD_FISHING_SPOT_1527, + ROD_FISHING_SPOT_7463, ROD_FISHING_SPOT_7464, ROD_FISHING_SPOT_7468, + ROD_FISHING_SPOT_8524 ), BARB_FISH("Sturgeon, Salmon, Trout", ItemID.LEAPING_STURGEON, FISHING_SPOT_1542, FISHING_SPOT_7323 From c0cc1a9fc4c1cb58e98bb2e72694b74929feed16 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 25 Jul 2019 14:32:05 +0100 Subject: [PATCH 30/30] Add GE limit for Drift net (#9411) --- .../net/runelite/client/plugins/grandexchange/ge_limits.json | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json b/runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json index bba7233ee1..c9d3e2b098 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json @@ -3322,6 +3322,7 @@ "21643": 70, "21646": 70, "21649": 125, + "21652": 100, "21684": 13000, "21690": 10000, "21730": 5,