From 71d088502418d448e5460b2ad8cac419046461f3 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 3 May 2022 12:11:35 -0400 Subject: [PATCH 01/11] widgetoverlay: add chatbox and inventory layers --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 6 ++++++ .../src/main/java/net/runelite/api/widgets/WidgetInfo.java | 6 ++++++ .../java/net/runelite/client/ui/overlay/WidgetOverlay.java | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 27b3f9054b..7f0ea9eb78 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -452,6 +452,8 @@ public final class WidgetID static final int MAGIC_ICON = 71; static final int INTERFACE_CONTAINER = 72; static final int INVENTORY_CONTAINER = 78; + static final int CHATBOX_PARENT = 94; + static final int INVENTORY_PARENT = 95; } static class ResizableViewportBottomLine @@ -478,6 +480,10 @@ public final class WidgetID static final int MAGIC_ICON = 64; static final int INTERFACE_CONTAINER = 69; static final int INVENTORY_CONTAINER = 75; + static final int CHATBOX_PARENT = 91; + static final int TABS1 = 92; + static final int TABS2 = 93; + static final int INVENTORY_PARENT = 94; } static class Chatbox diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 12866d2110..87a4f0da93 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -264,6 +264,8 @@ public enum WidgetInfo RESIZABLE_VIEWPORT_MUSIC_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.MUSIC_ICON), RESIZABLE_VIEWPORT_INTERFACE_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.INTERFACE_CONTAINER), RESIZABLE_VIEWPORT_INVENTORY_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.INVENTORY_CONTAINER), + RESIZABLE_VIEWPORT_CHATBOX_PARENT(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.CHATBOX_PARENT), + RESIZABLE_VIEWPORT_INVENTORY_PARENT(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.INVENTORY_PARENT), RESIZABLE_MINIMAP_WIDGET(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.MINIMAP), RESIZABLE_MINIMAP_DRAW_AREA(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.MINIMAP_DRAW_AREA), @@ -287,6 +289,10 @@ public enum WidgetInfo RESIZABLE_VIEWPORT_BOTTOM_LINE_MUSIC_ICON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.MUSIC_ICON), RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.INVENTORY_CONTAINER), RESIZABLE_VIEWPORT_BOTTOM_LINE_INTERFACE_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.INTERFACE_CONTAINER), + RESIZABLE_VIEWPORT_BOTTOM_LINE_CHATBOX_PARENT(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.CHATBOX_PARENT), + RESIZABLE_VIEWPORT_BOTTOM_LINE_TABS1(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.TABS1), + RESIZABLE_VIEWPORT_BOTTOM_LINE_TABS2(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.TABS2), + RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_PARENT(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.INVENTORY_PARENT), PRAYER_THICK_SKIN(WidgetID.PRAYER_GROUP_ID, WidgetID.Prayer.THICK_SKIN), PRAYER_BURST_OF_STRENGTH(WidgetID.PRAYER_GROUP_ID, WidgetID.Prayer.BURST_OF_STRENGTH), diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java index 7a4816a0f8..fa54590dea 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java @@ -42,6 +42,12 @@ public class WidgetOverlay extends Overlay public static Collection createOverlays(final OverlayManager overlayManager, final Client client) { return Arrays.asList( + new WidgetOverlay(client, WidgetInfo.RESIZABLE_VIEWPORT_CHATBOX_PARENT, OverlayPosition.DETACHED), + new WidgetOverlay(client, WidgetInfo.RESIZABLE_VIEWPORT_INVENTORY_PARENT, OverlayPosition.DETACHED), + new WidgetOverlay(client, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_CHATBOX_PARENT, OverlayPosition.DETACHED), + new WidgetOverlay(client, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_TABS1, OverlayPosition.DETACHED), + new WidgetOverlay(client, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_TABS2, OverlayPosition.DETACHED), + new WidgetOverlay(client, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_PARENT, OverlayPosition.DETACHED), new WidgetOverlay(client, WidgetInfo.RESIZABLE_MINIMAP_WIDGET, OverlayPosition.CANVAS_TOP_RIGHT), new WidgetOverlay(client, WidgetInfo.RESIZABLE_MINIMAP_STONES_WIDGET, OverlayPosition.CANVAS_TOP_RIGHT), // The client forces the oxygen bar below the xp tracker, so set its priority lower From e0fb164f2c2a7401c99db39614f229ffb755b8f8 Mon Sep 17 00:00:00 2001 From: RuneLite updater Date: Wed, 11 May 2022 10:36:04 +0000 Subject: [PATCH 02/11] Update 205 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1f9c442a4f..13c7a55873 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ true - 204.6 + 205 From bfc7ccd623d15d7260185d6a85e833685c6c891c Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 10 May 2022 20:35:44 -0600 Subject: [PATCH 03/11] cache: add running/crawling anim opcodes from rev 205 --- .../cache/definitions/NpcDefinition.java | 16 +++++++--- .../cache/definitions/loaders/NpcLoader.java | 30 ++++++++++++++++--- .../cache/definitions/savers/NpcSaver.java | 14 ++++----- 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java index 4c66d95fd8..3ee8d73fa5 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java @@ -37,12 +37,20 @@ public class NpcDefinition public int[] models; public int[] chatheadModels; public int standingAnimation = -1; - public int rotateLeftAnimation = -1; - public int rotateRightAnimation = -1; + public int idleRotateLeftAnimation = -1; + public int idleRotateRightAnimation = -1; public int walkingAnimation = -1; public int rotate180Animation = -1; - public int rotate90RightAnimation = -1; - public int rotate90LeftAnimation = -1; + public int rotateLeftAnimation = -1; + public int rotateRightAnimation = -1; + public int runAnimation = -1; + public int runRotate180Animation = -1; + public int runRotateLeftAnimation = -1; + public int runRotateRightAnimation = -1; + public int crawlAnimation = -1; + public int crawlRotate180Animation = -1; + public int crawlRotateLeftAnimation = -1; + public int crawlRotateRightAnimation = -1; public short[] recolorToFind; public short[] recolorToReplace; public short[] retextureToFind; diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java index 1804340bcb..a4fc0208c6 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java @@ -85,18 +85,18 @@ public class NpcLoader } else if (opcode == 15) { - def.rotateLeftAnimation = stream.readUnsignedShort(); + def.idleRotateLeftAnimation = stream.readUnsignedShort(); } else if (opcode == 16) { - def.rotateRightAnimation = stream.readUnsignedShort(); + def.idleRotateRightAnimation = stream.readUnsignedShort(); } else if (opcode == 17) { def.walkingAnimation = stream.readUnsignedShort(); def.rotate180Animation = stream.readUnsignedShort(); - def.rotate90RightAnimation = stream.readUnsignedShort(); - def.rotate90LeftAnimation = stream.readUnsignedShort(); + def.rotateLeftAnimation = stream.readUnsignedShort(); + def.rotateRightAnimation = stream.readUnsignedShort(); } else if (opcode == 18) { @@ -224,6 +224,28 @@ public class NpcLoader { def.isPet = true; } + else if (opcode == 114) + { + def.runAnimation = stream.readUnsignedShort(); + } + else if (opcode == 115) + { + def.runAnimation = stream.readUnsignedShort(); + def.runRotate180Animation = stream.readUnsignedShort(); + def.runRotateLeftAnimation = stream.readUnsignedShort(); + def.runRotateRightAnimation = stream.readUnsignedShort(); + } + else if (opcode == 116) + { + def.crawlAnimation = stream.readUnsignedShort(); + } + else if (opcode == 117) + { + def.crawlAnimation = stream.readUnsignedShort(); + def.crawlRotate180Animation = stream.readUnsignedShort(); + def.crawlRotateLeftAnimation = stream.readUnsignedShort(); + def.crawlRotateRightAnimation = stream.readUnsignedShort(); + } else if (opcode == 118) { def.varbitId = stream.readUnsignedShort(); diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/NpcSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/NpcSaver.java index 577681cf80..838f0285fd 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/savers/NpcSaver.java +++ b/cache/src/main/java/net/runelite/cache/definitions/savers/NpcSaver.java @@ -62,23 +62,23 @@ public class NpcSaver out.writeByte(14); out.writeShort(npc.walkingAnimation); } - if (npc.rotateLeftAnimation != -1) + if (npc.idleRotateLeftAnimation != -1) { out.writeByte(15); - out.writeShort(npc.rotateLeftAnimation); + out.writeShort(npc.idleRotateLeftAnimation); } - if (npc.rotateRightAnimation != -1) + if (npc.idleRotateRightAnimation != -1) { out.writeByte(16); - out.writeShort(npc.rotateRightAnimation); + out.writeShort(npc.idleRotateRightAnimation); } - if (npc.rotate180Animation != -1 || npc.rotate90LeftAnimation != -1 || npc.rotate90RightAnimation != -1) + if (npc.rotate180Animation != -1 || npc.rotateLeftAnimation != -1 || npc.rotateRightAnimation != -1) { out.writeByte(17); out.writeShort(npc.walkingAnimation); out.writeShort(npc.rotate180Animation); - out.writeShort(npc.rotate90RightAnimation); - out.writeShort(npc.rotate90LeftAnimation); + out.writeShort(npc.rotateLeftAnimation); + out.writeShort(npc.rotateRightAnimation); } for (int i = 0; i < 5; ++i) { From 7d5bc2bd31d330fe1605528e66bb41e9a69a6cee Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 29 Apr 2022 10:29:51 -0400 Subject: [PATCH 04/11] api: update Jagex API --- .../java/com/jagex/oldscape/pub/OAuthApi.java | 4 --- .../jagex/oldscape/pub/OtlTokenRequester.java | 33 ------------------- .../jagex/oldscape/pub/OtlTokenResponse.java | 32 ------------------ 3 files changed, 69 deletions(-) delete mode 100644 runelite-api/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java delete mode 100644 runelite-api/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java diff --git a/runelite-api/src/main/java/com/jagex/oldscape/pub/OAuthApi.java b/runelite-api/src/main/java/com/jagex/oldscape/pub/OAuthApi.java index 39565602fd..80e1313f89 100644 --- a/runelite-api/src/main/java/com/jagex/oldscape/pub/OAuthApi.java +++ b/runelite-api/src/main/java/com/jagex/oldscape/pub/OAuthApi.java @@ -26,10 +26,6 @@ package com.jagex.oldscape.pub; public interface OAuthApi { - boolean isOnLoginScreen(); - - void setOtlTokenRequester(OtlTokenRequester otlTokenRequester); - /** * Gets a unique per-RuneScape-Account identifier or {@code -1} if the client has not logged in yet */ diff --git a/runelite-api/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java b/runelite-api/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java deleted file mode 100644 index 6d829b4aea..0000000000 --- a/runelite-api/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2022, 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 com.jagex.oldscape.pub; - -import java.net.URL; -import java.util.concurrent.Future; - -public interface OtlTokenRequester -{ - Future request(URL url); -} diff --git a/runelite-api/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java b/runelite-api/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java deleted file mode 100644 index d78bd75500..0000000000 --- a/runelite-api/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2022, 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 com.jagex.oldscape.pub; - -public interface OtlTokenResponse -{ - boolean isSuccess(); - - String getToken(); -} From 901cfa419271ba96cf6ce8fc1d879cd2c80f144a Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 29 Apr 2022 12:16:57 -0400 Subject: [PATCH 05/11] client: remove setupJxAuth --- .../java/net/runelite/client/RuneLite.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index dc3ab7a24d..a9e5bde5e9 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -27,11 +27,9 @@ package net.runelite.client; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Strings; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; -import com.jagex.oldscape.pub.OAuthApi; import java.applet.Applet; import java.io.File; import java.io.IOException; @@ -318,11 +316,6 @@ public class RuneLite } applet.start(); - - if (applet instanceof OAuthApi) - { - setupJxAuth((OAuthApi) applet); - } } SplashScreen.stage(.57, null, "Loading configuration"); @@ -551,21 +544,4 @@ public class RuneLite System.setProperty(key, value); } } - - private void setupJxAuth(OAuthApi oAuthApi) - { - String accessToken = System.getenv("JX_ACCESS_TOKEN"); - if (Strings.isNullOrEmpty(accessToken)) - { - return; - } - - try - { - } - catch (LinkageError ex) - { - log.error("error setting up OTL requester", ex); - } - } } From 8076c8e0a50f2148af9d58e137b1c3257d5e0319 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 10 May 2022 20:38:12 -0600 Subject: [PATCH 06/11] Update Item IDs to 2022-5-11 --- runelite-api/src/main/java/net/runelite/api/ItemID.java | 7 ++++++- .../src/main/java/net/runelite/api/NullItemID.java | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) 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 6934dc7203..675dceb08c 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -12659,6 +12659,11 @@ public final class ItemID public static final int CABBAGE_26975 = 26975; public static final int CABBAGE_26977 = 26977; public static final int CABBAGE_26979 = 26979; - public static final int LION_HELM = 26981; + public static final int LOST_BAG_26984 = 26984; + public static final int LOST_BAG_26986 = 26986; + public static final int LOST_BAG_26988 = 26988; + public static final int AMULET_OF_THE_EYE_26990 = 26990; + public static final int AMULET_OF_THE_EYE_26992 = 26992; + public static final int AMULET_OF_THE_EYE_26994 = 26994; /* 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 32cf3307b1..162fe7f1b4 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -14111,7 +14111,14 @@ public final class NullItemID public static final int NULL_26976 = 26976; public static final int NULL_26978 = 26978; public static final int NULL_26980 = 26980; + public static final int NULL_26981 = 26981; public static final int NULL_26982 = 26982; public static final int NULL_26983 = 26983; + public static final int NULL_26985 = 26985; + public static final int NULL_26987 = 26987; + public static final int NULL_26989 = 26989; + public static final int NULL_26991 = 26991; + public static final int NULL_26993 = 26993; + public static final int NULL_26995 = 26995; /* This file is automatically generated. Do not edit. */ } From 7a81bf4e39f861b5a47ded4eecc7223f6df49a14 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 10 May 2022 20:38:12 -0600 Subject: [PATCH 07/11] Update Item variations to 2022-5-11 --- .../src/main/resources/item_variations.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 3adeb990b7..b16f6c354b 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -10650,6 +10650,18 @@ 26897, 26898 ], + "lost bag": [ + 26912, + 26984, + 26986, + 26988 + ], + "amulet of the eye": [ + 26914, + 26990, + 26992, + 26994 + ], "vat": [ 26932, 26933 From 82a6c7e05bf75bf4755bb157929758b0a464238e Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 10 May 2022 20:38:12 -0600 Subject: [PATCH 08/11] Update Object IDs to 2022-5-11 --- .../main/java/net/runelite/api/NullObjectID.java | 2 -- .../src/main/java/net/runelite/api/ObjectID.java | 14 -------------- 2 files changed, 16 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 d33578c0a6..804877dae7 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -21640,8 +21640,6 @@ public final class NullObjectID public static final int NULL_43847 = 43847; public static final int NULL_43848 = 43848; public static final int NULL_43850 = 43850; - public static final int NULL_43855 = 43855; - public static final int NULL_43866 = 43866; public static final int NULL_43871 = 43871; public static final int NULL_43872 = 43872; public static final int NULL_43874 = 43874; 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 dd159ed98d..2133546b01 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -22197,20 +22197,6 @@ public final class ObjectID public static final int BLOOD_RIFT_43825 = 43825; public static final int PLANT_43827 = 43827; public static final int BARRIER_43849 = 43849; - public static final int CRATE_43851 = 43851; - public static final int DIRTY_GROUND = 43852; - public static final int DIRTY_GROUND_43853 = 43853; - public static final int DIRTY_GROUND_43854 = 43854; - public static final int PILE_OF_JUNK = 43856; - public static final int PILE_OF_JUNK_43857 = 43857; - public static final int PILE_OF_JUNK_43858 = 43858; - public static final int PILE_OF_JUNK_43859 = 43859; - public static final int PILE_OF_JUNK_43860 = 43860; - public static final int PILE_OF_JUNK_43861 = 43861; - public static final int FROZEN_CHURNING_MACHINE = 43862; - public static final int FROZEN_CHURNING_MACHINE_43863 = 43863; - public static final int FROZEN_CHURNING_MACHINE_43864 = 43864; - public static final int FROZEN_CHURNING_MACHINE_43865 = 43865; public static final int RUBBLE_43867 = 43867; public static final int STAIRS_43868 = 43868; public static final int SCIMITAR = 43869; From ae0a415f5438d412587ad9bd42060f3f260ab4f8 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 10 May 2022 20:38:13 -0600 Subject: [PATCH 09/11] Update NPC IDs to 2022-5-11 --- .../src/main/java/net/runelite/api/NpcID.java | 11 +---------- .../src/main/java/net/runelite/api/NullNpcID.java | 2 -- 2 files changed, 1 insertion(+), 12 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 3f6c6632f6..1dcf3dd2b6 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -9647,14 +9647,7 @@ public final class NpcID public static final int ABYSSAL_WALKER_11454 = 11454; public static final int THE_GREAT_GUARDIAN_11455 = 11455; public static final int THE_GREAT_GUARDIAN_11456 = 11456; - public static final int SUSPICIOUS_CRATE = 11462; - public static final int SUSPICIOUS_CRATE_11463 = 11463; - public static final int PHOEBE_KAY = 11464; - public static final int XI_PLZPETDOGZ_XIX = 11465; - public static final int XI_PLZPETDOGZ_XIX_11466 = 11466; - public static final int CAMARST_11467 = 11467; - public static final int EASTER_BUNNY = 11468; - public static final int EASTER_BUNNY_11470 = 11470; + public static final int MENAPHITE_SHADOW = 11462; public static final int TARIK_11473 = 11473; public static final int MAISA_11474 = 11474; public static final int MAISA_11475 = 11475; @@ -9675,7 +9668,6 @@ public final class NpcID public static final int MENAPHITE_AKH_11491 = 11491; public static final int MENAPHITE_AKH_11492 = 11492; public static final int MENAPHITE_AKH_11493 = 11493; - public static final int MENAPHITE_SHADOW = 11494; public static final int MENAPHITE_AKH_11495 = 11495; public static final int MENAPHITE_AKH_11496 = 11496; public static final int MENAPHITE_AKH_11497 = 11497; @@ -9739,7 +9731,6 @@ public final class NpcID public static final int CITIZEN_11556 = 11556; public static final int CITIZEN_11557 = 11557; public static final int CITIZEN_11558 = 11558; - public static final int SCABARAS = 11560; public static final int SELIM_11561 = 11561; public static final int JEX_11562 = 11562; public static final int JEX_11563 = 11563; diff --git a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java index 7dd4520230..4401a38790 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -1798,9 +1798,7 @@ public final class NullNpcID public static final int NULL_11459 = 11459; public static final int NULL_11460 = 11460; public static final int NULL_11461 = 11461; - public static final int NULL_11469 = 11469; public static final int NULL_11471 = 11471; - public static final int NULL_11472 = 11472; public static final int NULL_11488 = 11488; public static final int NULL_11512 = 11512; public static final int NULL_11559 = 11559; From 7626d4e7dc652987ebaeaf751525614d84e3aa86 Mon Sep 17 00:00:00 2001 From: RuneLite updater Date: Wed, 11 May 2022 10:50:17 +0000 Subject: [PATCH 10/11] Release 1.8.19 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index d07a54e610..a1a9636379 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.19-SNAPSHOT + 1.8.19 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 19df978fcc..218af4cd75 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.19-SNAPSHOT + 1.8.19 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index abdf2ea434..2862ca90c8 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.19-SNAPSHOT + 1.8.19 cache diff --git a/pom.xml b/pom.xml index 13c7a55873..43f8c873d4 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.19-SNAPSHOT + 1.8.19 pom RuneLite @@ -63,7 +63,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.8.19 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 8f87a2ec93..762def70e5 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.19-SNAPSHOT + 1.8.19 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 0587bdb41d..e98a73b548 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.19-SNAPSHOT + 1.8.19 client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index d54f72c1e4..799ac87058 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.8.19-SNAPSHOT + 1.8.19 jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 82e41a0588..8234c538dc 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.19-SNAPSHOT + 1.8.19 script-assembler-plugin From 69a7de850b5eb827afe32067dd00c3c7e6b48a3b Mon Sep 17 00:00:00 2001 From: RuneLite updater Date: Wed, 11 May 2022 10:50:21 +0000 Subject: [PATCH 11/11] Bump for 1.8.20-SNAPSHOT [ci skip] --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index a1a9636379..816de5ab88 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.19 + 1.8.20-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 218af4cd75..f1772f58f3 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.19 + 1.8.20-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 2862ca90c8..1f704ced83 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.19 + 1.8.20-SNAPSHOT cache diff --git a/pom.xml b/pom.xml index 43f8c873d4..f87c1e5965 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.19 + 1.8.20-SNAPSHOT pom RuneLite @@ -63,7 +63,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.8.19 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 762def70e5..6f42b539de 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.19 + 1.8.20-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index e98a73b548..3c3dc26cca 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.19 + 1.8.20-SNAPSHOT client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index 799ac87058..5a6f697f5c 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.8.19 + 1.8.20-SNAPSHOT jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 8234c538dc..a58ba56eef 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.19 + 1.8.20-SNAPSHOT script-assembler-plugin