diff --git a/runelite-api/src/main/java/net/runelite/api/hooks/Callbacks.java b/runelite-api/src/main/java/net/runelite/api/hooks/Callbacks.java index 9a1a6eb3cb..b6960d761f 100644 --- a/runelite-api/src/main/java/net/runelite/api/hooks/Callbacks.java +++ b/runelite-api/src/main/java/net/runelite/api/hooks/Callbacks.java @@ -29,6 +29,7 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseWheelEvent; import net.runelite.api.MainBufferProvider; +import net.runelite.api.widgets.WidgetItem; /** * Interface of callbacks the injected client uses to send events @@ -79,6 +80,11 @@ public interface Callbacks */ void draw(MainBufferProvider mainBufferProvider, Graphics graphics, int x, int y); + /** + * Called before the client will render an item widget. + */ + void drawItem(int itemId, WidgetItem widgetItem); + /** * Mouse pressed event. If this event will be consumed it will not be propagated further to client. * diff --git a/runelite-api/src/main/java/net/runelite/api/queries/BankItemQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/BankItemQuery.java deleted file mode 100644 index b0131dce32..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/queries/BankItemQuery.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2017, Devin French - * 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.queries; - -import net.runelite.api.Client; -import net.runelite.api.widgets.Widget; -import net.runelite.api.widgets.WidgetInfo; -import net.runelite.api.widgets.WidgetItem; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Objects; - -public class BankItemQuery extends WidgetItemQuery -{ - private static final int ITEM_EMPTY = 6512; - - @Override - public WidgetItem[] result(Client client) - { - Collection widgetItems = getBankItems(client); - if (widgetItems != null) - { - return widgetItems.stream() - .filter(Objects::nonNull) - .filter(predicate) - .toArray(WidgetItem[]::new); - } - return new WidgetItem[0]; - } - - private Collection getBankItems(Client client) - { - Collection widgetItems = new ArrayList<>(); - Widget bank = client.getWidget(WidgetInfo.BANK_ITEM_CONTAINER); - if (bank != null && !bank.isHidden()) - { - Widget[] children = bank.getDynamicChildren(); - for (int i = 0; i < children.length; i++) - { - Widget child = children[i]; - if (child.getItemId() == ITEM_EMPTY || child.isSelfHidden()) - { - continue; - } - // set bounds to same size as default inventory - Rectangle bounds = child.getBounds(); - bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32); - // Index is set to 0 because the widget's index does not correlate to the order in the bank - widgetItems.add(new WidgetItem(child.getItemId(), child.getItemQuantity(), 0, bounds)); - } - } - return widgetItems; - } -} diff --git a/runelite-api/src/main/java/net/runelite/api/queries/EquipmentItemQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/EquipmentItemQuery.java deleted file mode 100644 index 210fc1e8d0..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/queries/EquipmentItemQuery.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2017, Devin French - * 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.queries; - -import net.runelite.api.Client; -import net.runelite.api.widgets.Widget; -import net.runelite.api.widgets.WidgetInfo; -import net.runelite.api.widgets.WidgetItem; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Objects; - -public class EquipmentItemQuery extends WidgetItemQuery -{ - private static final WidgetInfo[] ALL_EQUIPMENT_WIDGET_INFOS = - { - WidgetInfo.EQUIPMENT_HELMET, - WidgetInfo.EQUIPMENT_CAPE, - WidgetInfo.EQUIPMENT_AMULET, - WidgetInfo.EQUIPMENT_WEAPON, - WidgetInfo.EQUIPMENT_BODY, - WidgetInfo.EQUIPMENT_SHIELD, - WidgetInfo.EQUIPMENT_LEGS, - WidgetInfo.EQUIPMENT_GLOVES, - WidgetInfo.EQUIPMENT_BOOTS, - WidgetInfo.EQUIPMENT_RING, - WidgetInfo.EQUIPMENT_AMMO, - }; - - private final Collection slots = new ArrayList<>(); - - public EquipmentItemQuery slotEquals(WidgetInfo... slotWidgetInfo) - { - slots.addAll(Arrays.asList(slotWidgetInfo)); - return this; - } - - @Override - public WidgetItem[] result(Client client) - { - Collection widgetItems = getEquippedItems(client); - if (widgetItems != null) - { - return widgetItems.stream() - .filter(Objects::nonNull) - .filter(predicate) - .toArray(WidgetItem[]::new); - } - return new WidgetItem[0]; - } - - private Collection getEquippedItems(Client client) - { - Collection widgetItems = new ArrayList<>(); - Widget equipment = client.getWidget(WidgetInfo.EQUIPMENT); - if (equipment != null && !equipment.isHidden()) - { - if (slots.isEmpty()) - { - slots.addAll(Arrays.asList(ALL_EQUIPMENT_WIDGET_INFOS)); - } - for (WidgetInfo slot : slots) - { - Widget parentWidget = client.getWidget(slot); - Widget itemWidget = parentWidget.getChild(1); - // Check if background icon is hidden. if hidden, item is equipped. - boolean equipped = parentWidget.getChild(2).isSelfHidden(); - // set bounds to same size as default inventory - Rectangle bounds = itemWidget.getBounds(); - bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32); - // Index is set to 0 because there is no set in stone order of equipment slots - widgetItems.add(new WidgetItem(equipped ? itemWidget.getItemId() : -1, itemWidget.getItemQuantity(), 0, bounds)); - } - } - return widgetItems; - } -} diff --git a/runelite-api/src/main/java/net/runelite/api/queries/InventoryWidgetItemQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/InventoryWidgetItemQuery.java deleted file mode 100644 index 1872eeed65..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/queries/InventoryWidgetItemQuery.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2017, Devin French - * 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.queries; - -import net.runelite.api.Client; -import net.runelite.api.widgets.Widget; -import net.runelite.api.widgets.WidgetInfo; -import net.runelite.api.widgets.WidgetItem; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Objects; - -public class InventoryWidgetItemQuery extends WidgetItemQuery -{ - private static final WidgetInfo[] INVENTORY_WIDGET_INFOS = - { - WidgetInfo.DEPOSIT_BOX_INVENTORY_ITEMS_CONTAINER, - WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER, - WidgetInfo.SHOP_INVENTORY_ITEMS_CONTAINER, - WidgetInfo.GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER, - WidgetInfo.GUIDE_PRICES_INVENTORY_ITEMS_CONTAINER, - WidgetInfo.EQUIPMENT_INVENTORY_ITEMS_CONTAINER, - WidgetInfo.INVENTORY - }; - - @Override - public WidgetItem[] result(Client client) - { - Collection widgetItems = getInventoryItems(client); - if (widgetItems != null) - { - return widgetItems.stream() - .filter(Objects::nonNull) - .filter(predicate) - .toArray(WidgetItem[]::new); - } - return new WidgetItem[0]; - } - - private Collection getInventoryItems(Client client) - { - Collection widgetItems = new ArrayList<>(); - for (WidgetInfo widgetInfo : INVENTORY_WIDGET_INFOS) - { - Widget inventory = client.getWidget(widgetInfo); - if (inventory == null || inventory.isHidden()) - { - continue; - } - if (widgetInfo == WidgetInfo.INVENTORY) - { - widgetItems.addAll(inventory.getWidgetItems()); - break; - } - else - { - Widget[] children = inventory.getDynamicChildren(); - for (int i = 0; i < children.length; i++) - { - Widget child = children[i]; - // set bounds to same size as default inventory - Rectangle bounds = child.getBounds(); - bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32); - widgetItems.add(new WidgetItem(child.getItemId(), child.getItemQuantity(), i, bounds)); - } - break; - } - } - return widgetItems; - } -} diff --git a/runelite-api/src/main/java/net/runelite/api/queries/ShopItemQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/ShopItemQuery.java deleted file mode 100644 index cd037f0a28..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/queries/ShopItemQuery.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2017, Devin French - * 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.queries; - -import net.runelite.api.Client; -import net.runelite.api.widgets.Widget; -import net.runelite.api.widgets.WidgetInfo; -import net.runelite.api.widgets.WidgetItem; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Objects; - -public class ShopItemQuery extends WidgetItemQuery -{ - @Override - public WidgetItem[] result(Client client) - { - Collection widgetItems = getShopItems(client); - if (widgetItems != null) - { - return widgetItems.stream() - .filter(Objects::nonNull) - .filter(predicate) - .toArray(WidgetItem[]::new); - } - return new WidgetItem[0]; - } - - private Collection getShopItems(Client client) - { - Collection widgetItems = new ArrayList<>(); - Widget shop = client.getWidget(WidgetInfo.SHOP_ITEMS_CONTAINER); - if (shop != null && !shop.isHidden()) - { - Widget[] children = shop.getDynamicChildren(); - for (int i = 1; i < children.length; i++) - { - Widget child = children[i]; - // set bounds to same size as default inventory - Rectangle bounds = child.getBounds(); - bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32); - widgetItems.add(new WidgetItem(child.getItemId(), child.getItemQuantity(), i - 1, bounds)); - } - } - return widgetItems; - } -} 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 f5ac6f4d8a..d84bae473e 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 @@ -129,6 +129,7 @@ public class WidgetID public static final int SKILLS_GROUP_ID = 320; public static final int QUESTTAB_GROUP_ID = 629; public static final int MUSIC_GROUP_ID = 239; + public static final int BARROWS_PUZZLE_GROUP_ID = 25; static class WorldMap { @@ -577,7 +578,7 @@ public class WidgetID { static final int POINTS_INFOBOX = 6; } - + static class ExperienceDrop { static final int DROP_1 = 15; @@ -771,4 +772,26 @@ public class WidgetID static final int CONTAINER = 0; static final int LIST = 3; } + + static class Barrows_Puzzle + { + static final int PARENT = 0; + static final int CONTAINER = 1; + static final int TOP_ROW_PUZZLE = 2; + static final int SEQUENCE_1 = 3; + static final int SEQUENCE_1_TEXT = 4; + static final int SEQUENCE_2 = 5; + static final int SEQUENCE_2_TEXT = 6; + static final int SEQUENCE_3 = 7; + static final int SEQUENCE_3_TEXT = 8; + static final int SEQUENCE_4 = 9; + static final int SEQUENCE_4_TEXT = 10; + static final int NEXT_SHAPE_TEXT = 11; + static final int ANSWER1_CONTAINER = 12; + static final int ANSWER1 = 13; + static final int ANSWER2_CONTAINER = 14; + static final int ANSWER2 = 15; + static final int ANSWER3_CONTAINER = 16; + static final int ANSWER3 = 17; + } } 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 01ba6a0e49..5f12519d5d 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 @@ -410,6 +410,14 @@ public enum WidgetInfo BARROWS_BROTHERS(WidgetID.BARROWS_GROUP_ID, WidgetID.Barrows.BARROWS_BROTHERS), BARROWS_POTENTIAL(WidgetID.BARROWS_GROUP_ID, WidgetID.Barrows.BARROWS_POTENTIAL), BARROWS_REWARD_INVENTORY(WidgetID.BARROWS_REWARD_GROUP_ID, WidgetID.Barrows.BARROWS_REWARD_INVENTORY), + BARROWS_PUZZLE_PARENT(WidgetID.BARROWS_PUZZLE_GROUP_ID, WidgetID.Barrows_Puzzle.PARENT), + BARROWS_PUZZLE_ANSWER1(WidgetID.BARROWS_PUZZLE_GROUP_ID, WidgetID.Barrows_Puzzle.ANSWER1), + BARROWS_PUZZLE_ANSWER1_CONTAINER(WidgetID.BARROWS_PUZZLE_GROUP_ID, WidgetID.Barrows_Puzzle.ANSWER1_CONTAINER), + BARROWS_PUZZLE_ANSWER2(WidgetID.BARROWS_PUZZLE_GROUP_ID, WidgetID.Barrows_Puzzle.ANSWER2), + BARROWS_PUZZLE_ANSWER2_CONTAINER(WidgetID.BARROWS_PUZZLE_GROUP_ID, WidgetID.Barrows_Puzzle.ANSWER2_CONTAINER), + BARROWS_PUZZLE_ANSWER3(WidgetID.BARROWS_PUZZLE_GROUP_ID, WidgetID.Barrows_Puzzle.ANSWER3), + BARROWS_PUZZLE_ANSWER3_CONTAINER(WidgetID.BARROWS_PUZZLE_GROUP_ID, WidgetID.Barrows_Puzzle.ANSWER3_CONTAINER), + BARROWS_FIRST_PUZZLE(WidgetID.BARROWS_PUZZLE_GROUP_ID, WidgetID.Barrows_Puzzle.SEQUENCE_1), BLAST_MINE(WidgetID.BLAST_MINE_GROUP_ID, 2), diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetItem.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetItem.java index fbbc8938f2..51f63ad40f 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetItem.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetItem.java @@ -25,11 +25,15 @@ package net.runelite.api.widgets; import java.awt.Rectangle; +import lombok.AllArgsConstructor; +import lombok.ToString; import net.runelite.api.Point; /** * An item that is being represented in a {@link Widget}. */ +@AllArgsConstructor +@ToString public class WidgetItem { private final int id; @@ -37,20 +41,6 @@ public class WidgetItem private final int index; private final Rectangle canvasBounds; - public WidgetItem(int id, int quantity, int index, Rectangle canvasBounds) - { - this.id = id; - this.quantity = quantity; - this.index = index; - this.canvasBounds = canvasBounds; - } - - @Override - public String toString() - { - return "WidgetItem{" + "id=" + id + ", quantity=" + quantity + ", index=" + index + ", canvasBounds=" + canvasBounds + '}'; - } - /** * Gets the ID of the item represented. * diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java index 20384bffe8..af5e7e2631 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java @@ -50,7 +50,6 @@ import net.runelite.client.rs.ClientUpdateCheckMode; import net.runelite.client.task.Scheduler; import net.runelite.client.util.DeferredEventBus; import net.runelite.client.util.ExecutorServiceExceptionLogger; -import net.runelite.client.util.QueryRunner; import net.runelite.http.api.RuneLiteAPI; import okhttp3.OkHttpClient; import org.slf4j.Logger; @@ -75,7 +74,6 @@ public class RuneLiteModule extends AbstractModule bindConstant().annotatedWith(Names.named("developerMode")).to(developerMode); bind(ScheduledExecutorService.class).toInstance(new ExecutorServiceExceptionLogger(Executors.newSingleThreadScheduledExecutor())); bind(OkHttpClient.class).toInstance(RuneLiteAPI.CLIENT); - bind(QueryRunner.class); bind(MenuManager.class); bind(ChatMessageManager.class); bind(ItemManager.class); diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java index 08cd4ea3fe..ae1dff022f 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java @@ -43,6 +43,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.BufferProvider; import net.runelite.api.Client; import net.runelite.api.MainBufferProvider; +import net.runelite.api.NullItemID; import net.runelite.api.RenderOverview; import net.runelite.api.Renderable; import net.runelite.api.WorldMapManager; @@ -52,6 +53,7 @@ import net.runelite.api.hooks.Callbacks; import net.runelite.api.hooks.DrawCallbacks; import net.runelite.api.widgets.Widget; import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_VIEW; +import net.runelite.api.widgets.WidgetItem; import net.runelite.client.Notifier; import net.runelite.client.RuneLite; import net.runelite.client.chat.ChatMessageManager; @@ -62,6 +64,7 @@ import net.runelite.client.task.Scheduler; import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.DrawManager; import net.runelite.client.ui.overlay.OverlayLayer; +import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.OverlayRenderer; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.util.DeferredEventBus; @@ -80,6 +83,7 @@ public class Hooks implements Callbacks private static final Injector injector = RuneLite.getInjector(); private static final Client client = injector.getInstance(Client.class); private static final OverlayRenderer renderer = injector.getInstance(OverlayRenderer.class); + private static final OverlayManager overlayManager = injector.getInstance(OverlayManager.class); private static final GameTick GAME_TICK = new GameTick(); private static final BeforeRender BEFORE_RENDER = new BeforeRender(); @@ -443,6 +447,10 @@ public class Hooks implements Callbacks { graphics2d.dispose(); } + + // WidgetItemOverlays render at ABOVE_WIDGETS, reset widget item + // list for next frame. + overlayManager.getItemWidgets().clear(); } @Override @@ -490,4 +498,14 @@ public class Hooks implements Callbacks pixelPos += pixelJump; } } + + @Override + public void drawItem(int itemId, WidgetItem widgetItem) + { + // Empty bank item + if (widgetItem.getId() != NullItemID.NULL_6512) + { + overlayManager.getItemWidgets().add(widgetItem); + } + } } diff --git a/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java b/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java index 6261f1aabe..6c62b3e081 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java +++ b/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java @@ -85,7 +85,7 @@ public enum AgilityShortcut CORSAIR_COVE_DUNGEON_PILLAR(15, "Pillar Jump", new WorldPoint(1980, 8996, 0), PILLAR_31809), EDGEVILLE_DUNGEON_MONKEYBARS(15, "Monkey Bars", null, MONKEYBARS_23566), TROLLHEIM_ROCKS(15, "Rocks", null, new WorldPoint(2838, 3614, 0), ROCKS_3748), // No fixed world map location, but rocks near death plateau have a requirement of 15 - YANILLE_UNDERWALL_TUNNEL(16, "Underwall Tunnel", new WorldPoint(2574, 3109, 0), HOLE_16520, WALL_17047), + YANILLE_UNDERWALL_TUNNEL(16, "Underwall Tunnel", new WorldPoint(2574, 3109, 0), HOLE_16520, CASTLE_WALL), YANILLE_WATCHTOWER_TRELLIS(18, "Trellis", null, TRELLIS_20056), COAL_TRUCKS_LOG_BALANCE(20, "Log Balance", new WorldPoint(2598, 3475, 0), LOG_BALANCE_23274), GRAND_EXCHANGE_UNDERWALL_TUNNEL(21, "Underwall Tunnel", new WorldPoint(3139, 3515, 0), UNDERWALL_TUNNEL_16529, UNDERWALL_TUNNEL_16530), @@ -106,7 +106,7 @@ public enum AgilityShortcut CATHERBY_OBELISK_GRAPPLE(36, "Grapple Rock", new WorldPoint(2841, 3434, 0), CROSSBOW_TREE_17062), GNOME_STRONGHOLD_ROCKS(37, "Rocks", new WorldPoint(2485, 3515, 0), ROCKS_16534, ROCKS_16535), AL_KHARID_MINING_PITCLIFF_SCRAMBLE(38, "Rocks", new WorldPoint(3305, 3315, 0), ROCKS_16549, ROCKS_16550), - YANILLE_WALL_GRAPPLE(39, "Grapple Wall", new WorldPoint(2552, 3072, 0), CASTLE_WALL), + YANILLE_WALL_GRAPPLE(39, "Grapple Wall", new WorldPoint(2552, 3072, 0), WALL_17047), NEITIZNOT_BRIDGE_REPAIR(40, "Bridge Repair - Quest", new WorldPoint(2315, 3828, 0), ROPE_BRIDGE_21306, ROPE_BRIDGE_21307), KOUREND_LAKE_JUMP_EAST(40, "Stepping Stones", new WorldPoint(1612, 3570, 0), STEPPING_STONE_29729, STEPPING_STONE_29730), KOUREND_LAKE_JUMP_WEST(40, "Stepping Stones", new WorldPoint(1604, 3572, 0), STEPPING_STONE_29729, STEPPING_STONE_29730), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsConfig.java index 6fc2e05947..41f2bbc67d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsConfig.java @@ -86,4 +86,15 @@ public interface BarrowsConfig extends Config { return Color.RED; } + + @ConfigItem( + keyName = "showPuzzleAnswer", + name = "Show Puzzle Answer", + description = "Configures if the puzzle answer should be shown.", + position = 5 + ) + default boolean showPuzzleAnswer() + { + return true; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java index 1c480719ec..4ecdebccf3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.barrows; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; +import java.awt.Rectangle; import java.util.List; import javax.inject.Inject; import net.runelite.api.Client; @@ -38,6 +39,7 @@ import net.runelite.api.Perspective; import net.runelite.api.Player; import net.runelite.api.WallObject; import net.runelite.api.coords.LocalPoint; +import net.runelite.api.widgets.Widget; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; @@ -66,6 +68,7 @@ class BarrowsOverlay extends Overlay Player local = client.getLocalPlayer(); final Color npcColor = getMinimapDotColor(1); final Color playerColor = getMinimapDotColor(2); + Widget puzzleAnswer = plugin.getPuzzleAnswer(); // tunnels are only on z=0 if (!plugin.getWalls().isEmpty() && client.getPlane() == 0 && config.showMinimap()) @@ -119,6 +122,13 @@ class BarrowsOverlay extends Overlay renderBarrowsBrothers(graphics); } + if (puzzleAnswer != null && config.showPuzzleAnswer() && !puzzleAnswer.isHidden()) + { + Rectangle answerRect = puzzleAnswer.getBounds(); + graphics.setColor(Color.GREEN); + graphics.draw(answerRect); + } + return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java index 321bb0a10a..bc505755ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.barrows; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.inject.Provides; import java.util.HashSet; @@ -82,6 +83,11 @@ public class BarrowsPlugin extends Plugin ); private static final Set BARROWS_LADDERS = Sets.newHashSet(NullObjectID.NULL_20675, NullObjectID.NULL_20676, NullObjectID.NULL_20677); + private static final ImmutableList POSSIBLE_SOLUTIONS = ImmutableList.of( + WidgetInfo.BARROWS_PUZZLE_ANSWER1, + WidgetInfo.BARROWS_PUZZLE_ANSWER2, + WidgetInfo.BARROWS_PUZZLE_ANSWER3 + ); @Getter(AccessLevel.PACKAGE) private final Set walls = new HashSet<>(); @@ -89,6 +95,9 @@ public class BarrowsPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private final Set ladders = new HashSet<>(); + @Getter + private Widget puzzleAnswer; + @Inject private OverlayManager overlayManager; @@ -130,6 +139,7 @@ public class BarrowsPlugin extends Plugin overlayManager.remove(brotherOverlay); walls.clear(); ladders.clear(); + puzzleAnswer = null; // Restore widgets final Widget potential = client.getWidget(WidgetInfo.BARROWS_POTENTIAL); @@ -213,6 +223,7 @@ public class BarrowsPlugin extends Plugin // on region changes the tiles get set to null walls.clear(); ladders.clear(); + puzzleAnswer = null; } } @@ -243,5 +254,21 @@ public class BarrowsPlugin extends Plugin .runeLiteFormattedMessage(message.build()) .build()); } + else if (event.getGroupId() == WidgetID.BARROWS_PUZZLE_GROUP_ID) + { + final int answer = client.getWidget(WidgetInfo.BARROWS_FIRST_PUZZLE).getModelId() - 3; + puzzleAnswer = null; + + for (WidgetInfo puzzleNode : POSSIBLE_SOLUTIONS) + { + final Widget widgetToCheck = client.getWidget(puzzleNode); + + if (widgetToCheck != null && widgetToCheck.getModelId() == answer) + { + puzzleAnswer = client.getWidget(puzzleNode); + break; + } + } + } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java index a759520dea..99798156ad 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java @@ -25,65 +25,39 @@ package net.runelite.client.plugins.inventorytags; import java.awt.Color; -import java.awt.Dimension; import java.awt.Graphics2D; +import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.inject.Inject; -import net.runelite.api.Query; -import net.runelite.api.queries.InventoryWidgetItemQuery; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.game.ItemManager; -import net.runelite.client.ui.overlay.Overlay; -import net.runelite.client.ui.overlay.OverlayLayer; -import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.OverlayPriority; -import net.runelite.client.util.QueryRunner; +import net.runelite.client.ui.overlay.WidgetItemOverlay; -public class InventoryTagsOverlay extends Overlay +public class InventoryTagsOverlay extends WidgetItemOverlay { - private final QueryRunner queryRunner; private final ItemManager itemManager; private final InventoryTagsPlugin plugin; @Inject - private InventoryTagsOverlay(QueryRunner queryRunner, ItemManager itemManager, InventoryTagsPlugin plugin) + private InventoryTagsOverlay(ItemManager itemManager, InventoryTagsPlugin plugin) { - setPosition(OverlayPosition.DYNAMIC); - setPriority(OverlayPriority.LOW); - setLayer(OverlayLayer.ABOVE_WIDGETS); - this.queryRunner = queryRunner; this.itemManager = itemManager; this.plugin = plugin; } @Override - public Dimension render(Graphics2D graphics) + public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) { - if (!plugin.isHasTaggedItems()) + final String group = plugin.getTag(itemId); + if (group != null) { - return null; - } - - // Now query the inventory for the tagged item ids - final Query query = new InventoryWidgetItemQuery(); - final WidgetItem[] widgetItems = queryRunner.runQuery(query); - - // Iterate through all found items and draw the outlines - for (final WidgetItem item : widgetItems) - { - final String group = plugin.getTag(item.getId()); - - if (group != null) + final Color color = plugin.getGroupNameColor(group); + if (color != null) { - final Color color = plugin.getGroupNameColor(group); - if (color != null) - { - final BufferedImage outline = itemManager.getItemOutline(item.getId(), item.getQuantity(), color); - graphics.drawImage(outline, item.getCanvasLocation().getX() + 1, item.getCanvasLocation().getY() + 1, null); - } + Rectangle bounds = itemWidget.getCanvasBounds(); + final BufferedImage outline = itemManager.getItemOutline(itemId, itemWidget.getQuantity(), color); + graphics.drawImage(outline, (int) bounds.getX() + 1, (int) bounds.getY() + 1, null); } } - - return null; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java index c513ebe3d5..4683328550 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java @@ -30,15 +30,9 @@ import com.google.inject.Provides; import java.awt.Color; import java.util.List; import javax.inject.Inject; -import lombok.AccessLevel; -import lombok.Getter; import net.runelite.api.Client; -import net.runelite.api.InventoryID; -import net.runelite.api.Item; -import net.runelite.api.ItemContainer; import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; -import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.MenuOpened; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.WidgetMenuOptionClicked; @@ -107,9 +101,6 @@ public class InventoryTagsPlugin extends Plugin @Inject private OverlayManager overlayManager; - @Getter(AccessLevel.PACKAGE) - private boolean hasTaggedItems; - private boolean editorMode; @Provides @@ -151,7 +142,7 @@ public class InventoryTagsPlugin extends Plugin { removeInventoryMenuOptions(); overlayManager.remove(overlay); - hasTaggedItems = editorMode = false; + editorMode = false; } @Subscribe @@ -179,14 +170,10 @@ public class InventoryTagsPlugin extends Plugin if (event.getMenuOption().equals(MENU_SET)) { setTag(event.getId(), selectedMenu); - - hasTaggedItems = true; } else if (event.getMenuOption().equals(MENU_REMOVE)) { unsetTag(event.getId()); - - checkForTags(client.getItemContainer(InventoryID.INVENTORY)); } } @@ -235,47 +222,6 @@ public class InventoryTagsPlugin extends Plugin } } - @Subscribe - public void onItemContainerChanged(ItemContainerChanged itemContainerChanged) - { - ItemContainer itemContainer = itemContainerChanged.getItemContainer(); - if (itemContainer == client.getItemContainer(InventoryID.INVENTORY)) - { - checkForTags(itemContainer); - } - } - - private void checkForTags(ItemContainer itemContainer) - { - hasTaggedItems = false; - - if (itemContainer == null) - { - return; - } - - Item[] items = itemContainer.getItems(); - if (items != null) - { - for (Item item : items) - { - if (item == null) - { - continue; - } - - String tag = getTag(item.getId()); - if (tag == null) - { - continue; - } - - hasTaggedItems = true; - return; - } - } - } - Color getGroupNameColor(final String name) { switch (name) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java index ca289d4013..a37570aa22 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java @@ -24,125 +24,93 @@ */ package net.runelite.client.plugins.itemcharges; -import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import javax.inject.Inject; import net.runelite.api.ItemID; -import net.runelite.api.Query; -import net.runelite.api.queries.EquipmentItemQuery; -import net.runelite.api.queries.InventoryWidgetItemQuery; -import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; -import static net.runelite.client.plugins.itemcharges.ItemChargeType.*; +import static net.runelite.client.plugins.itemcharges.ItemChargeType.ABYSSAL_BRACELET; +import static net.runelite.client.plugins.itemcharges.ItemChargeType.BELLOWS; +import static net.runelite.client.plugins.itemcharges.ItemChargeType.FUNGICIDE_SPRAY; +import static net.runelite.client.plugins.itemcharges.ItemChargeType.IMPBOX; +import static net.runelite.client.plugins.itemcharges.ItemChargeType.TELEPORT; +import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERCAN; +import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERSKIN; import net.runelite.client.ui.FontManager; -import net.runelite.client.ui.overlay.Overlay; -import net.runelite.client.ui.overlay.OverlayLayer; -import net.runelite.client.ui.overlay.OverlayPosition; +import net.runelite.client.ui.overlay.WidgetItemOverlay; import net.runelite.client.ui.overlay.components.TextComponent; -import net.runelite.client.util.QueryRunner; -class ItemChargeOverlay extends Overlay +class ItemChargeOverlay extends WidgetItemOverlay { - private final QueryRunner queryRunner; private final ItemChargePlugin itemChargePlugin; private final ItemChargeConfig config; @Inject - ItemChargeOverlay(QueryRunner queryRunner, ItemChargePlugin itemChargePlugin, ItemChargeConfig config) + ItemChargeOverlay(ItemChargePlugin itemChargePlugin, ItemChargeConfig config) { - setPosition(OverlayPosition.DYNAMIC); - setLayer(OverlayLayer.ABOVE_WIDGETS); - this.queryRunner = queryRunner; this.itemChargePlugin = itemChargePlugin; this.config = config; } @Override - public Dimension render(Graphics2D graphics) + public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) { if (!displayOverlay()) { - return null; + return; } graphics.setFont(FontManager.getRunescapeSmallFont()); - for (WidgetItem item : getChargeWidgetItems()) + int charges; + if (itemId == ItemID.DODGY_NECKLACE) { - int charges; - if (item.getId() == ItemID.DODGY_NECKLACE) + if (!config.showDodgyCount()) { - if (!config.showDodgyCount()) - { - continue; - } - - charges = config.dodgyNecklace(); - } - else if (item.getId() == ItemID.BINDING_NECKLACE) - { - if (!config.showBindingNecklaceCharges()) - { - continue; - } - - charges = config.bindingNecklace(); - } - else - { - ItemWithCharge chargeItem = ItemWithCharge.findItem(item.getId()); - if (chargeItem == null) - { - continue; - } - - ItemChargeType type = chargeItem.getType(); - if ((type == TELEPORT && !config.showTeleportCharges()) - || (type == FUNGICIDE_SPRAY && !config.showFungicideCharges()) - || (type == IMPBOX && !config.showImpCharges()) - || (type == WATERCAN && !config.showWateringCanCharges()) - || (type == WATERSKIN && !config.showWaterskinCharges()) - || (type == BELLOWS && !config.showBellowCharges()) - || (type == ABYSSAL_BRACELET && !config.showAbyssalBraceletCharges())) - { - continue; - } - - charges = chargeItem.getCharges(); + return; } - final Rectangle bounds = item.getCanvasBounds(); - final TextComponent textComponent = new TextComponent(); - textComponent.setPosition(new Point(bounds.x, bounds.y + 16)); - textComponent.setText(charges < 0 ? "?" : String.valueOf(charges)); - textComponent.setColor(itemChargePlugin.getColor(charges)); - textComponent.render(graphics); + charges = config.dodgyNecklace(); } - return null; - } + else if (itemId == ItemID.BINDING_NECKLACE) + { + if (!config.showBindingNecklaceCharges()) + { + return; + } - private Collection getChargeWidgetItems() - { - Query inventoryQuery = new InventoryWidgetItemQuery(); - WidgetItem[] inventoryWidgetItems = queryRunner.runQuery(inventoryQuery); + charges = config.bindingNecklace(); + } + else + { + ItemWithCharge chargeItem = ItemWithCharge.findItem(itemId); + if (chargeItem == null) + { + return; + } - Query equipmentQuery = new EquipmentItemQuery().slotEquals( - WidgetInfo.EQUIPMENT_AMULET, - WidgetInfo.EQUIPMENT_RING, - WidgetInfo.EQUIPMENT_GLOVES, - WidgetInfo.EQUIPMENT_WEAPON - ); - WidgetItem[] equipmentWidgetItems = queryRunner.runQuery(equipmentQuery); + ItemChargeType type = chargeItem.getType(); + if ((type == TELEPORT && !config.showTeleportCharges()) + || (type == FUNGICIDE_SPRAY && !config.showFungicideCharges()) + || (type == IMPBOX && !config.showImpCharges()) + || (type == WATERCAN && !config.showWateringCanCharges()) + || (type == WATERSKIN && !config.showWaterskinCharges()) + || (type == BELLOWS && !config.showBellowCharges()) + || (type == ABYSSAL_BRACELET && !config.showAbyssalBraceletCharges())) + { + return; + } - Collection jewellery = new ArrayList<>(); - jewellery.addAll(Arrays.asList(inventoryWidgetItems)); - jewellery.addAll(Arrays.asList(equipmentWidgetItems)); - return jewellery; + charges = chargeItem.getCharges(); + } + + final Rectangle bounds = itemWidget.getCanvasBounds(); + final TextComponent textComponent = new TextComponent(); + textComponent.setPosition(new Point(bounds.x, bounds.y + 16)); + textComponent.setText(charges < 0 ? "?" : String.valueOf(charges)); + textComponent.setColor(itemChargePlugin.getColor(charges)); + textComponent.render(graphics); } private boolean displayOverlay() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index 9eac070c94..17486efe0d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -32,24 +32,19 @@ import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.ItemID; import net.runelite.api.Point; -import net.runelite.api.Query; import net.runelite.api.Varbits; -import net.runelite.api.queries.InventoryWidgetItemQuery; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.game.ItemManager; import static net.runelite.client.plugins.runepouch.config.RunePouchOverlayMode.BOTH; import static net.runelite.client.plugins.runepouch.config.RunePouchOverlayMode.MOUSE_HOVER; import net.runelite.client.ui.FontManager; -import net.runelite.client.ui.overlay.Overlay; -import net.runelite.client.ui.overlay.OverlayLayer; -import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +import net.runelite.client.ui.overlay.WidgetItemOverlay; import net.runelite.client.ui.overlay.tooltip.Tooltip; import net.runelite.client.ui.overlay.tooltip.TooltipManager; import net.runelite.client.util.ColorUtil; -import net.runelite.client.util.QueryRunner; -public class RunepouchOverlay extends Overlay +public class RunepouchOverlay extends WidgetItemOverlay { private static final Varbits[] AMOUNT_VARBITS = { @@ -61,8 +56,6 @@ public class RunepouchOverlay extends Overlay }; private static final Dimension IMAGE_SIZE = new Dimension(11, 11); - - private final QueryRunner queryRunner; private final Client client; private final RunepouchConfig config; private final TooltipManager tooltipManager; @@ -71,37 +64,26 @@ public class RunepouchOverlay extends Overlay private ItemManager itemManager; @Inject - RunepouchOverlay(QueryRunner queryRunner, Client client, RunepouchConfig config, TooltipManager tooltipManager) + RunepouchOverlay(Client client, RunepouchConfig config, TooltipManager tooltipManager) { - setPosition(OverlayPosition.DYNAMIC); - setLayer(OverlayLayer.ABOVE_WIDGETS); this.tooltipManager = tooltipManager; - this.queryRunner = queryRunner; this.client = client; this.config = config; } @Override - public Dimension render(Graphics2D graphics) + public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) { - Query query = new InventoryWidgetItemQuery().idEquals(ItemID.RUNE_POUCH); - WidgetItem[] items = queryRunner.runQuery(query); - if (items.length == 0) + if (itemId != ItemID.RUNE_POUCH) { - return null; - } - - WidgetItem runePouch = items[0]; - Point location = runePouch.getCanvasLocation(); - if (location == null) - { - return null; + return; } assert AMOUNT_VARBITS.length == RUNE_VARBITS.length; graphics.setFont(FontManager.getRunescapeSmallFont()); + Point location = itemWidget.getCanvasLocation(); StringBuilder tooltipBuilder = new StringBuilder(); for (int i = 0; i < AMOUNT_VARBITS.length; i++) @@ -158,12 +140,11 @@ public class RunepouchOverlay extends Overlay String tooltip = tooltipBuilder.toString(); if (!tooltip.isEmpty() - && runePouch.getCanvasBounds().contains(client.getMouseCanvasPosition().getX(), client.getMouseCanvasPosition().getY()) + && itemWidget.getCanvasBounds().contains(client.getMouseCanvasPosition().getX(), client.getMouseCanvasPosition().getY()) && (config.runePouchOverlayMode() == MOUSE_HOVER || config.runePouchOverlayMode() == BOTH)) { tooltipManager.add(new Tooltip(tooltip)); } - return null; } private BufferedImage getRuneImage(Runes rune) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java index 675381b1fb..e8c49b20a0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java @@ -24,111 +24,88 @@ */ package net.runelite.client.plugins.slayer; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import static com.google.common.collect.ObjectArrays.concat; -import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; import java.util.Set; import javax.inject.Inject; -import com.google.common.primitives.ImmutableIntArray; import net.runelite.api.ItemID; -import net.runelite.api.Query; -import net.runelite.api.queries.EquipmentItemQuery; -import net.runelite.api.queries.InventoryWidgetItemQuery; -import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.ui.FontManager; -import net.runelite.client.ui.overlay.Overlay; -import net.runelite.client.ui.overlay.OverlayLayer; -import net.runelite.client.ui.overlay.OverlayPosition; +import net.runelite.client.ui.overlay.WidgetItemOverlay; import net.runelite.client.ui.overlay.components.TextComponent; -import net.runelite.client.util.QueryRunner; -class SlayerOverlay extends Overlay +class SlayerOverlay extends WidgetItemOverlay { private final static Set SLAYER_JEWELRY = ImmutableSet.of( - ItemID.SLAYER_RING_1, - ItemID.SLAYER_RING_2, - ItemID.SLAYER_RING_3, - ItemID.SLAYER_RING_4, - ItemID.SLAYER_RING_5, - ItemID.SLAYER_RING_6, - ItemID.SLAYER_RING_7, - ItemID.SLAYER_RING_8 + ItemID.SLAYER_RING_1, + ItemID.SLAYER_RING_2, + ItemID.SLAYER_RING_3, + ItemID.SLAYER_RING_4, + ItemID.SLAYER_RING_5, + ItemID.SLAYER_RING_6, + ItemID.SLAYER_RING_7, + ItemID.SLAYER_RING_8 ); - private final static ImmutableIntArray ALL_SLAYER_ITEMS = ImmutableIntArray.of( - ItemID.SLAYER_HELMET, - ItemID.SLAYER_HELMET_I, - ItemID.BLACK_SLAYER_HELMET, - ItemID.BLACK_SLAYER_HELMET_I, - ItemID.GREEN_SLAYER_HELMET, - ItemID.GREEN_SLAYER_HELMET_I, - ItemID.PURPLE_SLAYER_HELMET, - ItemID.PURPLE_SLAYER_HELMET_I, - ItemID.RED_SLAYER_HELMET, - ItemID.RED_SLAYER_HELMET_I, - ItemID.TURQUOISE_SLAYER_HELMET, - ItemID.TURQUOISE_SLAYER_HELMET_I, - ItemID.HYDRA_SLAYER_HELMET, - ItemID.HYDRA_SLAYER_HELMET_I, - ItemID.SLAYER_RING_ETERNAL, - ItemID.ENCHANTED_GEM, - ItemID.ETERNAL_GEM, - ItemID.BRACELET_OF_SLAUGHTER, - ItemID.EXPEDITIOUS_BRACELET, - ItemID.SLAYER_RING_1, - ItemID.SLAYER_RING_2, - ItemID.SLAYER_RING_3, - ItemID.SLAYER_RING_4, - ItemID.SLAYER_RING_5, - ItemID.SLAYER_RING_6, - ItemID.SLAYER_RING_7, - ItemID.SLAYER_RING_8 + private final static Set ALL_SLAYER_ITEMS = ImmutableSet.of( + ItemID.SLAYER_HELMET, + ItemID.SLAYER_HELMET_I, + ItemID.BLACK_SLAYER_HELMET, + ItemID.BLACK_SLAYER_HELMET_I, + ItemID.GREEN_SLAYER_HELMET, + ItemID.GREEN_SLAYER_HELMET_I, + ItemID.PURPLE_SLAYER_HELMET, + ItemID.PURPLE_SLAYER_HELMET_I, + ItemID.RED_SLAYER_HELMET, + ItemID.RED_SLAYER_HELMET_I, + ItemID.TURQUOISE_SLAYER_HELMET, + ItemID.TURQUOISE_SLAYER_HELMET_I, + ItemID.HYDRA_SLAYER_HELMET, + ItemID.HYDRA_SLAYER_HELMET_I, + ItemID.SLAYER_RING_ETERNAL, + ItemID.ENCHANTED_GEM, + ItemID.ETERNAL_GEM, + ItemID.BRACELET_OF_SLAUGHTER, + ItemID.EXPEDITIOUS_BRACELET, + ItemID.SLAYER_RING_1, + ItemID.SLAYER_RING_2, + ItemID.SLAYER_RING_3, + ItemID.SLAYER_RING_4, + ItemID.SLAYER_RING_5, + ItemID.SLAYER_RING_6, + ItemID.SLAYER_RING_7, + ItemID.SLAYER_RING_8 ); private final SlayerConfig config; private final SlayerPlugin plugin; - private final QueryRunner queryRunner; @Inject - private SlayerOverlay(SlayerPlugin plugin, SlayerConfig config, QueryRunner queryRunner) + private SlayerOverlay(SlayerPlugin plugin, SlayerConfig config) { - setPosition(OverlayPosition.DYNAMIC); - setLayer(OverlayLayer.ABOVE_WIDGETS); this.plugin = plugin; this.config = config; - this.queryRunner = queryRunner; - } - - private ImmutableList getSlayerItems() - { - int[] slayerItems = ALL_SLAYER_ITEMS.toArray(); - Query inventoryQuery = new InventoryWidgetItemQuery().idEquals(slayerItems); - WidgetItem[] inventoryWidgetItems = queryRunner.runQuery(inventoryQuery); - - Query equipmentQuery = new EquipmentItemQuery().slotEquals(WidgetInfo.EQUIPMENT_HELMET, WidgetInfo.EQUIPMENT_RING, WidgetInfo.EQUIPMENT_GLOVES).idEquals(slayerItems); - WidgetItem[] equipmentWidgetItems = queryRunner.runQuery(equipmentQuery); - - WidgetItem[] items = concat(inventoryWidgetItems, equipmentWidgetItems, WidgetItem.class); - return ImmutableList.copyOf(items); } @Override - public Dimension render(Graphics2D graphics) + public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) { + if (!ALL_SLAYER_ITEMS.contains(itemId)) + { + return; + } + if (!config.showItemOverlay()) { - return null; + return; } int amount = plugin.getAmount(); if (amount <= 0) { - return null; + return; } int slaughterCount = plugin.getSlaughterChargeCount(); @@ -136,33 +113,26 @@ class SlayerOverlay extends Overlay graphics.setFont(FontManager.getRunescapeSmallFont()); - for (WidgetItem item : getSlayerItems()) + final Rectangle bounds = itemWidget.getCanvasBounds(); + final TextComponent textComponent = new TextComponent(); + + switch (itemId) { - int itemId = item.getId(); - - final Rectangle bounds = item.getCanvasBounds(); - final TextComponent textComponent = new TextComponent(); - - switch (item.getId()) - { - case ItemID.EXPEDITIOUS_BRACELET: - textComponent.setText(String.valueOf(expeditiousCount)); - break; - case ItemID.BRACELET_OF_SLAUGHTER: - textComponent.setText(String.valueOf(slaughterCount)); - break; - default: - textComponent.setText(String.valueOf(amount)); - break; - } - - // Draw the counter in the bottom left for equipment, and top left for jewelry - textComponent.setPosition(new Point(bounds.x, bounds.y + (SLAYER_JEWELRY.contains(itemId) - ? bounds.height - : graphics.getFontMetrics().getHeight()))); - textComponent.render(graphics); + case ItemID.EXPEDITIOUS_BRACELET: + textComponent.setText(String.valueOf(expeditiousCount)); + break; + case ItemID.BRACELET_OF_SLAUGHTER: + textComponent.setText(String.valueOf(slaughterCount)); + break; + default: + textComponent.setText(String.valueOf(amount)); + break; } - return null; + // Draw the counter in the bottom left for equipment, and top left for jewelry + textComponent.setPosition(new Point(bounds.x, bounds.y + (SLAYER_JEWELRY.contains(itemId) + ? bounds.height + : graphics.getFontMetrics().getHeight()))); + textComponent.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java index d3663a7def..70acbcba06 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java @@ -38,7 +38,7 @@ enum Task ABERRANT_SPECTRES("Aberrant spectres", ItemID.ABERRANT_SPECTRE, "Spectre"), ABYSSAL_DEMONS("Abyssal demons", ItemID.ABYSSAL_DEMON), ABYSSAL_SIRE("Abyssal Sire", ItemID.ABYSSAL_ORPHAN), - ADAMANT_DRAGONS("Adamant dragons", ItemID.ADAMANTITE_BAR), + ADAMANT_DRAGONS("Adamant dragons", ItemID.ADAMANT_DRAGON_MASK), ALCHEMICAL_HYDRA("Alchemical Hydra", ItemID.IKKLE_HYDRA), ANKOU("Ankou", ItemID.ANKOU_MASK), AVIANSIES("Aviansies", ItemID.ENSOULED_AVIANSIE_HEAD), @@ -137,7 +137,7 @@ enum Task RATS("Rats", ItemID.RATS_TAIL), RED_DRAGONS("Red dragons", ItemID.BABY_RED_DRAGON), ROCKSLUGS("Rockslugs", ItemID.ROCKSLUG, 4, ItemID.BAG_OF_SALT), - RUNE_DRAGONS("Rune dragons", ItemID.RUNITE_BAR), + RUNE_DRAGONS("Rune dragons", ItemID.RUNE_DRAGON_MASK), SCORPIA("Scorpia", ItemID.SCORPIAS_OFFSPRING), CHAOS_DRUIDS("Chaos druids", ItemID.ELDER_CHAOS_HOOD, "Elder Chaos druid", "Chaos druid"), BANDITS("Bandits", ItemID.BANDIT, "Bandit"), diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java index 17041f6129..9d3804ebab 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java @@ -26,15 +26,14 @@ package net.runelite.client.rs; import com.google.common.annotations.VisibleForTesting; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; - -import javax.inject.Inject; -import javax.inject.Singleton; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import javax.inject.Inject; +import javax.inject.Singleton; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; @Singleton class ClientConfigLoader @@ -52,13 +51,13 @@ class ClientConfigLoader RSConfig fetch() throws IOException { final Request request = new Request.Builder() - .url(CONFIG_URL) - .build(); + .url(CONFIG_URL) + .build(); final RSConfig config = new RSConfig(); try (final Response response = httpClient.newCall(request).execute(); final BufferedReader in = new BufferedReader( - new InputStreamReader(response.body().byteStream()))) + new InputStreamReader(response.body().byteStream()))) { String str; diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index 47a8bba151..9c70435b0b 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -32,12 +32,47 @@ import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import io.sigpipe.jbsdiff.InvalidHeaderException; import io.sigpipe.jbsdiff.Patch; +import java.applet.Applet; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.lang.reflect.Field; +import java.net.URL; +import java.net.URLClassLoader; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.jar.Attributes; +import java.util.jar.JarEntry; +import java.util.jar.JarInputStream; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; +import java.util.logging.Logger; +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + import javassist.ClassPool; import javassist.NotFoundException; import lombok.extern.slf4j.Slf4j; +import static net.runelite.client.rs.ClientUpdateCheckMode.AUTO; +import static net.runelite.client.rs.ClientUpdateCheckMode.NONE; +import static net.runelite.client.rs.ClientUpdateCheckMode.VANILLA; + import net.runelite.client.RuneLite; -import net.runelite.client.rs.bytecode.ByteCodePatcher; import net.runelite.client.rs.bytecode.ByteCodeUtils; +import net.runelite.client.rs.bytecode.ByteCodePatcher; import net.runelite.client.rs.bytecode.Hooks; import net.runelite.http.api.RuneLiteAPI; import okhttp3.Request; @@ -45,28 +80,6 @@ import okhttp3.Response; import org.apache.commons.compress.compressors.CompressorException; import org.xeustechnologies.jcl.JarClassLoader; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; -import java.applet.Applet; -import java.io.*; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.security.cert.Certificate; -import java.security.cert.CertificateException; -import java.security.cert.CertificateFactory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.jar.*; -import java.util.logging.Logger; - -import static net.runelite.client.rs.ClientUpdateCheckMode.*; - @Slf4j @Singleton public class ClientLoader @@ -75,7 +88,6 @@ public class ClientLoader private final ClientConfigLoader clientConfigLoader; private ClientUpdateCheckMode updateCheckMode; private JarOutputStream target; - private boolean scrapedHooks = false; @Inject private ClientLoader( @@ -86,20 +98,248 @@ public class ClientLoader this.clientConfigLoader = clientConfigLoader; } + public Applet load() + { + if (updateCheckMode == NONE) + { + return null; + } + + try + { + File injectedClientFile = ByteCodeUtils.injectedClientFile; + File hijackedClientFile = ByteCodeUtils.hijackedClientFile; + Manifest manifest = new Manifest(); + manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0"); + target = new JarOutputStream(new FileOutputStream(injectedClientFile), manifest); + RSConfig config = clientConfigLoader.fetch(); + + Map zipFile = new HashMap<>(); + { + Certificate[] jagexCertificateChain = getJagexCertificateChain(); + String codebase = config.getCodeBase(); + String initialJar = config.getInitialJar(); + URL url = new URL(codebase + initialJar); + Request request = new Request.Builder() + .url(url) + .build(); + + try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + { + JarInputStream jis; + + jis = new JarInputStream(response.body().byteStream()); + + byte[] tmp = new byte[4096]; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(756 * 1024); + for (; ; ) + { + JarEntry metadata = jis.getNextJarEntry(); + if (metadata == null) + { + break; + } + + buffer.reset(); + for (; ; ) + { + int n = jis.read(tmp); + if (n <= -1) + { + break; + } + buffer.write(tmp, 0, n); + } + + zipFile.put(metadata.getName(), buffer.toByteArray()); + } + } + } + + if (updateCheckMode == AUTO) + { + Map hashes; + try (InputStream is = ClientLoader.class.getResourceAsStream("/patch/hashes.json")) + { + hashes = new Gson().fromJson(new InputStreamReader(is), new TypeToken>() + { + }.getType()); + } + + for (Map.Entry file : hashes.entrySet()) + { + byte[] bytes = zipFile.get(file.getKey()); + + String ourHash = null; + if (bytes != null) + { + ourHash = Hashing.sha512().hashBytes(bytes).toString(); + } + + if (!file.getValue().equals(ourHash)) + { + if (hijackedClientFile.exists()) { + Logger.getAnonymousLogger().warning("[RuneLit] Hash checking / Client patching skipped due to hijacked client."); + updateCheckMode = VANILLA; + break; + } else { + log.info("{} had a hash mismatch; falling back to vanilla. {} != {}", file.getKey(), file.getValue(), ourHash); + log.info("Client is outdated!"); + updateCheckMode = VANILLA; + break; + } + } + } + } + + if (updateCheckMode == AUTO) + { + ByteArrayOutputStream patchOs = new ByteArrayOutputStream(756 * 1024); + int patchCount = 0; + + for (Map.Entry file : zipFile.entrySet()) + { + byte[] bytes; + try (InputStream is = ClientLoader.class.getResourceAsStream("/patch/" + file.getKey() + ".bs")) + { + if (is == null) + { + continue; + } + + bytes = ByteStreams.toByteArray(is); + } + + patchOs.reset(); + Patch.patch(file.getValue(), bytes, patchOs); + file.setValue(patchOs.toByteArray()); + + ++patchCount; + + if (!file.getKey().startsWith("META")) { + add(file.getValue(), file.getKey(), target); + } + } + if (target!=null) + target.close(); + + log.info("Patched {} classes", patchCount); + } + if (hooksFile.exists()) { + ByteCodePatcher.classPool = new ClassPool(true); + ByteCodePatcher.classPool.appendClassPath(RuneLite.RUNELITE_DIR+"/injectedClient-"+ RuneLiteAPI.getVersion() +"-.jar"); + Gson gson = new Gson(); + Hooks hooks = gson.fromJson(new BufferedReader(new FileReader(hooksFile)), Hooks.class); + + if (hooks.clientInstance.equals("")|| + hooks.projectileClass.equals("") || + hooks.actorClass.equals("") || + hooks.playerClass.equals("")) { + System.out.println("[RuneLit] Bad hooks, re-scraping."); + ByteCodePatcher.clientInstance = getClientInstance(ByteCodeUtils.injectedClientFile.getPath()); + ByteCodePatcher.findHooks(injectedClientFile.getPath()); + } else { + ByteCodePatcher.clientInstance = hooks.clientInstance; + ByteCodePatcher.applyHooks(ByteCodeUtils.injectedClientFile, hooks); + System.out.println("[RuneLit] Loaded hooks"); + } + + } else { + System.out.println("[RuneLit] Hooks file not found, scraping hooks."); + ByteCodePatcher.clientInstance = getClientInstance(ByteCodeUtils.injectedClientFile.getPath()); + ByteCodePatcher.findHooks(injectedClientFile.getPath()); + } + + Map zipFile2 = new HashMap<>(); + JarInputStream jis = new JarInputStream(new FileInputStream(hijackedClientFile)); + + byte[] tmp = new byte[4096]; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(756 * 1024); + for (; ; ) { + JarEntry metadata = jis.getNextJarEntry(); + if (metadata == null) { + break; + } + + buffer.reset(); + for (; ; ) { + int n = jis.read(tmp); + if (n <= -1) { + break; + } + buffer.write(tmp, 0, n); + } + + zipFile2.put(metadata.getName(), buffer.toByteArray()); + } + + String initialClass = config.getInitialClass(); + + ClassLoader rsClassLoader = new ClassLoader(ClientLoader.class.getClassLoader()) + { + @Override + protected Class findClass(String name) throws ClassNotFoundException + { + String path = name.replace('.', '/').concat(".class"); + byte[] data = zipFile2.get(path); + if (data == null) + { + throw new ClassNotFoundException(name); + } + + return defineClass(name, data, 0, data.length); + } + }; + + Class clientClass = rsClassLoader.loadClass(initialClass); + + Applet rs = (Applet) clientClass.newInstance(); + rs.setStub(new RSAppletStub(config)); + return rs; + } + catch (IOException | ClassNotFoundException | InstantiationException | IllegalAccessException + | CompressorException | InvalidHeaderException | CertificateException | SecurityException e) + { + if (e instanceof ClassNotFoundException) + { + log.error("Unable to load client - class not found. This means you" + + " are not running RuneLite with Maven as the client patch" + + " is not in your classpath."); + } + + log.error("Error loading RS!", e); + return null; + } catch (NotFoundException e) { + e.printStackTrace(); + } + return null; + } + + private void add(byte[] bytes, String entryName ,JarOutputStream target) throws IOException { + BufferedInputStream in = null; + try { + JarEntry entry = new JarEntry(entryName); + target.putNextEntry(entry); + target.write(bytes); + target.closeEntry(); + } finally { + if (in != null) + in.close(); + } + } + private static Certificate[] getJagexCertificateChain() throws CertificateException { CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509"); Collection certificates = certificateFactory.generateCertificates(ClientLoader.class.getResourceAsStream("jagex.crt")); return certificates.toArray(new Certificate[certificates.size()]); } - - public static String initVanillaInjected(String jarFile) { - List protectedMethods = new ArrayList<>(); - String clientInstance = ""; + + public static String getClientInstance(String jarFile) { JarClassLoader jcl = new JarClassLoader(); try { ClassPool classPool = new ClassPool(true); - classPool.appendClassPath(RuneLite.RUNELITE_DIR + "/injectedClient-" + RuneLiteAPI.getVersion() + "-.jar"); + classPool.appendClassPath(RuneLite.RUNELITE_DIR+"/injectedClient-"+ RuneLiteAPI.getVersion() +"-.jar"); } catch (NotFoundException e) { e.printStackTrace(); } @@ -114,7 +354,7 @@ public class ClientLoader ClassLoader cl = ClassLoader.getSystemClassLoader(); try { URLClassLoader child = new URLClassLoader( - new URL[]{temp.toURI().toURL()}, + new URL[] {temp.toURI().toURL()}, cl ); try { @@ -123,24 +363,17 @@ public class ClientLoader try { jcl2.add(new FileInputStream(ByteCodeUtils.injectedClientFile)); Field[] fields = classToLoad.getDeclaredFields(); - Method[] methods = classToLoad.getMethods(); for (Field f : fields) { try { - - if (f.getType().getName() == "client") { - ByteCodePatcher.hooks.clientInstance = classToLoad.getName() + "." + f.getName(); - System.out.println("[RuneLit] Found client instance at " + classToLoad.getName() + "." + f.getName()); - return classToLoad.getName() + "." + f.getName(); + if (f.getType().getName()=="client") { + ByteCodePatcher.hooks.clientInstance = classToLoad.getName()+"."+f.getName(); + System.out.println("[RuneLit] Found client instance at "+classToLoad.getName()+"."+f.getName()); + return classToLoad.getName()+"."+f.getName(); } } catch (Exception e) { e.printStackTrace(); } } - for (Method m : methods) { - if (m.getName().contains("protect")) { - protectedMethods.add(classToLoad.getName()+":"+m.getName()); - } - } } catch (FileNotFoundException e) { e.printStackTrace(); } @@ -150,7 +383,7 @@ public class ClientLoader } catch (Exception e) { e.printStackTrace(); - System.out.println("Class not found: " + entry.getName()); + System.out.println("Class not found: "+entry.getName()); } } } @@ -158,219 +391,6 @@ public class ClientLoader } catch (Exception e) { e.printStackTrace(); } - String[] hooksProtectedMethods = new String[protectedMethods.size()]; - int i = 0; - for (String s : protectedMethods) { - hooksProtectedMethods[i] = s; - i++; - } - ByteCodePatcher.hooks.protectedMethods = hooksProtectedMethods; - return clientInstance; - } - - public Applet load() { - if (updateCheckMode == NONE) { - return null; - } - - try { - File injectedClientFile = ByteCodeUtils.injectedClientFile; - File hijackedClientFile = ByteCodeUtils.hijackedClientFile; - Manifest manifest = new Manifest(); - manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0"); - target = new JarOutputStream(new FileOutputStream(injectedClientFile), manifest); - RSConfig config = clientConfigLoader.fetch(); - - Map zipFile = new HashMap<>(); - { - Certificate[] jagexCertificateChain = getJagexCertificateChain(); - String codebase = config.getCodeBase(); - String initialJar = config.getInitialJar(); - URL url = new URL(codebase + initialJar); - Request request = new Request.Builder() - .url(url) - .build(); - - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) { - JarInputStream jis; - - jis = new JarInputStream(response.body().byteStream()); - - byte[] tmp = new byte[4096]; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(756 * 1024); - for (; ; ) { - JarEntry metadata = jis.getNextJarEntry(); - if (metadata == null) { - break; - } - - buffer.reset(); - for (; ; ) { - int n = jis.read(tmp); - if (n <= -1) { - break; - } - buffer.write(tmp, 0, n); - } - - zipFile.put(metadata.getName(), buffer.toByteArray()); - } - } - } - - if (updateCheckMode == AUTO) { - Map hashes; - try (InputStream is = ClientLoader.class.getResourceAsStream("/patch/hashes.json")) { - hashes = new Gson().fromJson(new InputStreamReader(is), new TypeToken>() { - }.getType()); - } - - for (Map.Entry file : hashes.entrySet()) { - byte[] bytes = zipFile.get(file.getKey()); - - String ourHash = null; - if (bytes != null) { - ourHash = Hashing.sha512().hashBytes(bytes).toString(); - } - - if (!file.getValue().equals(ourHash)) { - if (hijackedClientFile.exists()) { - Logger.getAnonymousLogger().warning("[RuneLit] Hash checking / Client patching skipped due to hijacked client."); - updateCheckMode = VANILLA; - break; - } else { - log.info("{} had a hash mismatch; falling back to vanilla. {} != {}", file.getKey(), file.getValue(), ourHash); - log.info("Client is outdated!"); - updateCheckMode = VANILLA; - break; - } - } - } - } - - if (updateCheckMode == AUTO) { - ByteArrayOutputStream patchOs = new ByteArrayOutputStream(756 * 1024); - int patchCount = 0; - - for (Map.Entry file : zipFile.entrySet()) { - byte[] bytes; - try (InputStream is = ClientLoader.class.getResourceAsStream("/patch/" + file.getKey() + ".bs")) { - if (is == null) { - continue; - } - - bytes = ByteStreams.toByteArray(is); - } - - patchOs.reset(); - Patch.patch(file.getValue(), bytes, patchOs); - file.setValue(patchOs.toByteArray()); - - ++patchCount; - - if (!file.getKey().startsWith("META")) { - add(file.getValue(), file.getKey(), target); - } - } - if (target != null) - target.close(); - - log.info("Patched {} classes", patchCount); - } - if (hooksFile.exists()) { - ByteCodePatcher.classPool = new ClassPool(true); - ByteCodePatcher.classPool.appendClassPath(RuneLite.RUNELITE_DIR + "/injectedClient-" + RuneLiteAPI.getVersion() + "-.jar"); - Gson gson = new Gson(); - Hooks hooks = gson.fromJson(new BufferedReader(new FileReader(hooksFile)), Hooks.class); - if (hooks.clientInstance.equals("") || - hooks.projectileClass.equals("") || - hooks.actorClass.equals("") || - hooks.clientInstance.equals("") || - hooks.playerClass.equals("")) { - System.out.println("[RuneLit] Bad hooks, re-scraping."); - ByteCodePatcher.clientInstance = ByteCodeUtils.injectedClientFile.getPath(); - ByteCodePatcher.findHooks(injectedClientFile.getPath()); - } else { - ByteCodePatcher.clientInstance = hooks.clientInstance; - ByteCodePatcher.applyHooks(ByteCodeUtils.injectedClientFile, hooks); - System.out.println("[RuneLit] Loaded hooks"); - } - - } else { - System.out.println("[RuneLit] Hooks file not found, scraping hooks."); - ByteCodePatcher.clientInstance = initVanillaInjected(ByteCodeUtils.injectedClientFile.getPath()); - ByteCodePatcher.findHooks(injectedClientFile.getPath()); - } - - Map zipFile2 = new HashMap<>(); - JarInputStream jis = new JarInputStream(new FileInputStream(hijackedClientFile)); - - byte[] tmp = new byte[4096]; - ByteArrayOutputStream buffer = new ByteArrayOutputStream(756 * 1024); - for (; ; ) { - JarEntry metadata = jis.getNextJarEntry(); - if (metadata == null) { - break; - } - - buffer.reset(); - for (; ; ) { - int n = jis.read(tmp); - if (n <= -1) { - break; - } - buffer.write(tmp, 0, n); - } - - zipFile2.put(metadata.getName(), buffer.toByteArray()); - } - - String initialClass = config.getInitialClass(); - - ClassLoader rsClassLoader = new ClassLoader(ClientLoader.class.getClassLoader()) { - @Override - protected Class findClass(String name) throws ClassNotFoundException { - String path = name.replace('.', '/').concat(".class"); - byte[] data = zipFile2.get(path); - if (data == null) { - throw new ClassNotFoundException(name); - } - - return defineClass(name, data, 0, data.length); - } - }; - - Class clientClass = rsClassLoader.loadClass(initialClass); - - Applet rs = (Applet) clientClass.newInstance(); - rs.setStub(new RSAppletStub(config)); - return rs; - } catch (IOException | ClassNotFoundException | InstantiationException | IllegalAccessException - | CompressorException | InvalidHeaderException | CertificateException | SecurityException e) { - if (e instanceof ClassNotFoundException) { - log.error("Unable to load client - class not found. This means you" - + " are not running RuneLite with Maven as the client patch" - + " is not in your classpath."); - } - - log.error("Error loading RS!", e); - return null; - } catch (NotFoundException e) { - e.printStackTrace(); - } - return null; - } - - private void add(byte[] bytes, String entryName, JarOutputStream target) throws IOException { - BufferedInputStream in = null; - try { - JarEntry entry = new JarEntry(entryName); - target.putNextEntry(entry); - target.write(bytes); - target.closeEntry(); - } finally { - if (in != null) - in.close(); - } + return ""; } } diff --git a/runelite-client/src/main/java/net/runelite/client/rs/RSAppletStub.java b/runelite-client/src/main/java/net/runelite/client/rs/RSAppletStub.java index 04a046b94e..a3a2a0f14a 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/RSAppletStub.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/RSAppletStub.java @@ -25,12 +25,11 @@ */ package net.runelite.client.rs; -import lombok.RequiredArgsConstructor; - import java.applet.AppletContext; import java.applet.AppletStub; import java.net.MalformedURLException; import java.net.URL; +import lombok.RequiredArgsConstructor; @RequiredArgsConstructor class RSAppletStub implements AppletStub diff --git a/runelite-client/src/main/java/net/runelite/client/rs/RSConfig.java b/runelite-client/src/main/java/net/runelite/client/rs/RSConfig.java index 3dc50d18e5..e0c5539323 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/RSConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/RSConfig.java @@ -25,10 +25,9 @@ */ package net.runelite.client.rs; -import lombok.Getter; - import java.util.HashMap; import java.util.Map; +import lombok.Getter; @Getter class RSConfig diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodePatcher.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodePatcher.java index 9b1b614cc4..b75a8c9631 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodePatcher.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodePatcher.java @@ -7,12 +7,23 @@ import javassist.CtClass; import javassist.NotFoundException; import net.runelite.client.RuneLite; import net.runelite.client.rs.ClientLoader; -import net.runelite.client.rs.bytecode.transformers.*; +import net.runelite.client.rs.bytecode.transformers.ActorTransform; +import net.runelite.client.rs.bytecode.transformers.PlayerTransform; +import net.runelite.client.rs.bytecode.transformers.ProjectileTransform; import net.runelite.http.api.RuneLiteAPI; import org.xeustechnologies.jcl.JarClassLoader; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; @@ -32,7 +43,7 @@ public class ByteCodePatcher { public static void applyHooks(File jf, Hooks hooks) { try { URLClassLoader child = new URLClassLoader( - new URL[]{jf.toURI().toURL()}, + new URL[] {jf.toURI().toURL()}, cl ); try { @@ -42,8 +53,6 @@ public class ByteCodePatcher { transformProjectile(projectileClass); Class playerClass = Class.forName(hooks.playerClass, false, child); transformPlayer(playerClass); - Class clientClass = Class.forName(hooks.clientClass, false, child); - transformClient(clientClass); ByteCodeUtils.updateHijackedJar(); } catch (Exception e) { e.printStackTrace(); @@ -57,7 +66,7 @@ public class ByteCodePatcher { public static void findHooks(String jf) { try { classPool = new ClassPool(true); - classPool.appendClassPath(RuneLite.RUNELITE_DIR + "/injectedClient-" + RuneLiteAPI.getVersion() + "-.jar"); + classPool.appendClassPath(RuneLite.RUNELITE_DIR+"/injectedClient-"+ RuneLiteAPI.getVersion() +"-.jar"); } catch (NotFoundException e) { e.printStackTrace(); } @@ -90,7 +99,7 @@ public class ByteCodePatcher { public static void checkClasses(File jf, JarEntry entry) { try { URLClassLoader child = new URLClassLoader( - new URL[]{jf.toURI().toURL()}, + new URL[] {jf.toURI().toURL()}, cl ); try { @@ -98,23 +107,22 @@ public class ByteCodePatcher { checkActor(classToLoad); checkProjectile(classToLoad); checkPlayer(classToLoad); - checkClient(classToLoad); } catch (Exception e) { - e.printStackTrace(); + e.printStackTrace(); } } catch (Exception e) { e.printStackTrace(); - System.out.println("Class not found: " + entry.getName()); + System.out.println("Class not found: "+entry.getName()); } } public static void checkActor(Class current) { try { - Method method = current.getDeclaredMethod("setCombatInfo", int.class, int.class, int.class, int.class, int.class, int.class); - if (method != null) { + Method method = current.getDeclaredMethod("setCombatInfo", new Class[] { int.class, int.class, int.class, int.class, int.class, int.class }); + if (method!=null) { hooks.actorClass = current.getName(); - System.out.println("[Z-lyte] Transforming Actor at class: " + current.getName()); + System.out.println("[RuneLit] Transforming Actor at class: "+current.getName()); ActorTransform at = new ActorTransform(); at.modify(current); } @@ -126,17 +134,17 @@ public class ByteCodePatcher { } public static void transformActor(Class actor) { - System.out.println("[RuneLit] Transforming Actor at class: " + actor.getName()); + System.out.println("[RuneLit] Transforming Actor at class: "+actor.getName()); ActorTransform at = new ActorTransform(); at.modify(actor); } public static void checkProjectile(Class current) { try { - Method method = current.getDeclaredMethod("projectileMoved", int.class, int.class, int.class, int.class); - if (method != null) { + Method method = current.getDeclaredMethod("projectileMoved", new Class[] { int.class, int.class, int.class, int.class}); + if (method!=null) { hooks.projectileClass = current.getName(); - System.out.println("[RuneLit] Transforming Projectile at class: " + current.getName()); + System.out.println("[RuneLit] Transforming Projectile at class: "+current.getName()); ProjectileTransform pt = new ProjectileTransform(); pt.modify(current); } @@ -148,7 +156,7 @@ public class ByteCodePatcher { } public static void transformProjectile(Class projectile) { - System.out.println("[RuneLit] Transforming Projectile at class: " + projectile.getName()); + System.out.println("[RuneLit] Transforming Projectile at class: "+projectile.getName()); ProjectileTransform pt = new ProjectileTransform(); pt.modify(projectile); } @@ -156,26 +164,12 @@ public class ByteCodePatcher { public static void checkPlayer(Class current) { try { Method method = current.getDeclaredMethod("getSkullIcon"); - if (method != null) { + if (method!=null) { hooks.playerClass = current.getName(); - System.out.println("[RuneLit] Transforming Player at class: " + current.getName()); + System.out.println("[RuneLit] Transforming Player at class: "+current.getName()); PlayerTransform pt = new PlayerTransform(); pt.modify(current); } - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void checkClient(Class current) { - try { - Method method = current.getDeclaredMethod("getProjectiles"); - if (method != null) { - hooks.clientInstance = current.getName(); - System.out.println("[RuneLit] Transforming Projectile at class: " + current.getName()); - ClientTransform ct = new ClientTransform(); - ct.modify(current); - } } catch (NoSuchMethodException e) { //e.printStackTrace(); } catch (NoClassDefFoundError e) { @@ -183,16 +177,10 @@ public class ByteCodePatcher { } } - public static void transformClient(Class client) { - System.out.println("[RuneLit] Transforming Client at class: " + client.getName()); - ClientTransform ct = new ClientTransform(); - ct.modify(client); - } - public static void transformPlayer(Class player) { - System.out.println("[RuneLit] Transforming Player at class: " + player.getName()); + System.out.println("[RuneLit] Transforming Player at class: "+player.getName()); PlayerTransform pt = new PlayerTransform(); pt.modify(player); - } + } diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodeUtils.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodeUtils.java index 7e4f1172aa..646d595982 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodeUtils.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/ByteCodeUtils.java @@ -4,18 +4,26 @@ import javassist.CtClass; import net.runelite.client.RuneLite; import net.runelite.http.api.RuneLiteAPI; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; -import java.util.jar.*; +import java.util.jar.Attributes; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; public class ByteCodeUtils { //TODO: Write method to delete old revision injected clients. - public static File injectedClientFile = new File(RuneLite.RUNELITE_DIR + "/injectedClient-" + RuneLiteAPI.getVersion() + "-.jar"); - public static File hijackedClientFile = new File(RuneLite.RUNELITE_DIR + "/hijackedClient-" + RuneLiteAPI.getVersion() + "-.jar"); + public static File injectedClientFile = new File(RuneLite.RUNELITE_DIR+"/injectedClient-"+ RuneLiteAPI.getVersion() +"-.jar"); + public static File hijackedClientFile = new File(RuneLite.RUNELITE_DIR+"/hijackedClient-"+ RuneLiteAPI.getVersion() +"-.jar"); public static JarOutputStream target; @@ -39,12 +47,12 @@ public class ByteCodeUtils { JarEntry entry = entries.nextElement(); boolean skip = false; for (CtClass ct : ByteCodePatcher.modifiedClasses) { - if ((ct.getName() + ".class").equals(entry.getName())) { + if ((ct.getName()+".class").equals(entry.getName())) { skip = true; } } if (!skip) - add(entry); + add(entry); } for (CtClass ct : ByteCodePatcher.modifiedClasses) { @@ -59,10 +67,10 @@ public class ByteCodeUtils { private static void add(CtClass ct) { try { - JarEntry newEntry = new JarEntry(ct.getName() + ".class"); - target.putNextEntry(newEntry); - target.write(ct.toBytecode()); - target.closeEntry(); + JarEntry newEntry = new JarEntry(ct.getName()+".class"); + target.putNextEntry(newEntry); + target.write(ct.toBytecode()); + target.closeEntry(); } catch (Exception e) { e.printStackTrace(); } @@ -70,7 +78,7 @@ public class ByteCodeUtils { private static void add(JarEntry entry) throws IOException { try { - if (!entry.getName().startsWith("META") && !entry.getName().equals("")) { + if (!entry.getName().startsWith("META")&&!entry.getName().equals("")) { target.putNextEntry(entry); target.write(getBytesFromZipFile(entry.getName())); target.closeEntry(); @@ -86,7 +94,7 @@ public class ByteCodeUtils { zipFile = new ZipFile(injectedClientFile); Enumeration entries = zipFile.entries(); - while (entries.hasMoreElements()) { + while(entries.hasMoreElements()){ ZipEntry entry = entries.nextElement(); if (entry.getName().equals(entryName)) { InputStream stream = zipFile.getInputStream(entry); @@ -104,6 +112,6 @@ public class ByteCodeUtils { } catch (IOException e) { e.printStackTrace(); } - return null; + return null; } } diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/Hooks.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/Hooks.java index a879bb6aae..6d75fc81da 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/Hooks.java @@ -1,16 +1,11 @@ package net.runelite.client.rs.bytecode; -import java.lang.reflect.Method; -import java.util.List; - public class Hooks { public String clientInstance = ""; public String actorClass = ""; public String projectileClass = ""; public String playerClass = ""; - public String clientClass = "client"; //Always named client - public String[] protectedMethods; public Hooks() { } diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ActorTransform.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ActorTransform.java index b97cd0dcfb..37b4777c56 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ActorTransform.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ActorTransform.java @@ -1,10 +1,17 @@ package net.runelite.client.rs.bytecode.transformers; +import javassist.CannotCompileException; import javassist.CtClass; import javassist.CtMethod; import javassist.CtNewMethod; import javassist.NotFoundException; import net.runelite.client.rs.bytecode.ByteCodePatcher; +import net.runelite.client.rs.bytecode.ByteCodeUtils; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; public class ActorTransform { public CtClass ct = null; @@ -29,7 +36,7 @@ public class ActorTransform { ct.addMethod(protectedAnimation); CtMethod getAnimation = ct.getDeclaredMethod("getAnimation"); ct.removeMethod(getAnimation); - getAnimation = CtNewMethod.make("public int getAnimation() { return this.getRsAnimation(); }", ct); + getAnimation = CtNewMethod.make("public int getAnimation() { return this.getRsAnimation(); }",ct); ct.addMethod(getAnimation); } catch (Exception e) { e.printStackTrace(); @@ -44,7 +51,7 @@ public class ActorTransform { getAnimationChanged = CtNewMethod.make("public void animationChanged(int n) { " + " net.runelite.api.events.AnimationChanged animationChanged = new net.runelite.api.events.AnimationChanged();" + " animationChanged.setActor((net.runelite.api.Actor)this);" + - " " + ByteCodePatcher.clientInstance + ".getCallbacks().post((java.lang.Object)animationChanged); }", ct); + " "+ByteCodePatcher.clientInstance+".getCallbacks().post((java.lang.Object)animationChanged); }",ct); ct.addMethod(getAnimationChanged); } catch (Exception e) { e.printStackTrace(); diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ClientTransform.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ClientTransform.java deleted file mode 100644 index 75e4f6ff93..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ClientTransform.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.runelite.client.rs.bytecode.transformers; - -import javassist.CtClass; -import javassist.CtMethod; -import javassist.CtNewMethod; -import javassist.NotFoundException; -import javassist.bytecode.AnnotationsAttribute; -import javassist.bytecode.ClassFile; -import javassist.bytecode.ConstPool; -import net.runelite.client.rs.bytecode.ByteCodePatcher; - -public class ClientTransform { - public CtClass ct = null; - - public void modify(Class client) { - try { - ct = ByteCodePatcher.classPool.get(client.getName()); - transformGetProjectiles(); - ByteCodePatcher.modifiedClasses.add(ct); - } catch (NotFoundException e) { - e.printStackTrace(); - } - } - - public void transformGetProjectiles() { - - CtMethod getProjectiles; - try { - CtMethod protectedAnimation = ct.getDeclaredMethod("1protect$getProjectilesDeque"); - ct.removeMethod(protectedAnimation); - protectedAnimation.setName("getProjectilesDeque"); - ct.addMethod(protectedAnimation); - getProjectiles = ct.getDeclaredMethod("getProjectiles"); - ct.removeMethod(getProjectiles); - getProjectiles = CtNewMethod.make("public java.util.List getProjectiles() { " + - " java.util.ArrayList localArrayList = new java.util.ArrayList();" + - " net.runelite.rs.api.RSDeque localRSDeque = getProjectilesDeque();" + - " net.runelite.rs.api.RSNode localRSNode = localRSDeque.getHead();" + - " for (net.runelite.api.Node localNode = localRSNode.getNext(); localNode != localRSNode; localNode = localNode.getNext()) {" + - " net.runelite.api.Projectile localProjectile = (net.runelite.api.Projectile)localNode;" + - " localArrayList.add(localProjectile); }" + - " return localArrayList; }", ct); - - ct.addMethod(getProjectiles); - ClassFile classFile = ct.getClassFile(); - ConstPool constPool = classFile.getConstPool(); - AnnotationsAttribute attr = new AnnotationsAttribute(constPool, AnnotationsAttribute.visibleTag); - javassist.bytecode.annotation.Annotation annotation = new javassist.bytecode.annotation.Annotation("Override", constPool); - attr.setAnnotation(annotation); - getProjectiles.getMethodInfo().addAttribute(attr); - } catch (Exception e) { - e.printStackTrace(); - } - } - -} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/PlayerTransform.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/PlayerTransform.java index 475cb578fd..1fbec240c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/PlayerTransform.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/PlayerTransform.java @@ -38,27 +38,26 @@ public class PlayerTransform { String SkullIcon = "net.runelite.api.SkullIcon"; getSkullIcon = ct.getDeclaredMethod("getSkullIcon"); ct.removeMethod(getSkullIcon); - getSkullIcon = CtNewMethod.make("public " + SkullIcon + " getSkullIcon() {" + + getSkullIcon = CtNewMethod.make("public "+SkullIcon+" getSkullIcon() {" + " switch (this.getRsSkullIcon()) {" + " case 0: {" + - " return " + SkullIcon + ".SKULL; }" + + " return "+SkullIcon+".SKULL; }" + " case 1: {" + - " return " + SkullIcon + ".SKULL_FIGHT_PIT; }" + + " return "+SkullIcon+".SKULL_FIGHT_PIT; }" + " case 8: {" + - " return " + SkullIcon + ".DEAD_MAN_FIVE; }" + + " return "+SkullIcon+".DEAD_MAN_FIVE; }" + " case 9: {" + - " return " + SkullIcon + ".DEAD_MAN_FOUR; }" + + " return "+SkullIcon+".DEAD_MAN_FOUR; }" + " case 10: {" + - " return " + SkullIcon + ".DEAD_MAN_THREE; }" + + " return "+SkullIcon+".DEAD_MAN_THREE; }" + " case 11: {" + - " return " + SkullIcon + ".DEAD_MAN_TWO; }" + + " return "+SkullIcon+".DEAD_MAN_TWO; }" + " case 12: {" + - " return " + SkullIcon + ".DEAD_MAN_ONE; } }" + - " return null; }", ct); + " return "+SkullIcon+".DEAD_MAN_ONE; } }" + + " return null; }",ct); ct.addMethod(getSkullIcon); } catch (Exception e) { e.printStackTrace(); } } } - diff --git a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ProjectileTransform.java b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ProjectileTransform.java index 1ad1e94e7f..9cdae79a77 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ProjectileTransform.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/bytecode/transformers/ProjectileTransform.java @@ -4,6 +4,7 @@ import javassist.CtClass; import javassist.CtMethod; import javassist.CtNewMethod; import net.runelite.client.rs.bytecode.ByteCodePatcher; +import net.runelite.client.rs.bytecode.ByteCodeUtils; public class ProjectileTransform { public CtClass ct = null; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java index 5ee3303462..5a6e240f90 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java @@ -41,6 +41,7 @@ import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.MenuAction; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.widgets.WidgetItem; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.RuneLiteConfig; @@ -96,6 +97,8 @@ public class OverlayManager */ @Getter(AccessLevel.PACKAGE) private final List overlays = new ArrayList<>(); + @Getter + private final List itemWidgets = new ArrayList<>(); private final Map> overlayLayers = new EnumMap<>(OverlayLayer.class); @@ -168,6 +171,12 @@ public class OverlayManager // Add is always true overlays.add(overlay); loadOverlay(overlay); + // WidgetItemOverlays have a reference to the overlay manager in order to get the WidgetItems + // for each frame. + if (overlay instanceof WidgetItemOverlay) + { + ((WidgetItemOverlay) overlay).setOverlayManager(this); + } rebuildOverlayLayers(); return true; } diff --git a/runelite-api/src/main/java/net/runelite/api/queries/WidgetItemQuery.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java similarity index 54% rename from runelite-api/src/main/java/net/runelite/api/queries/WidgetItemQuery.java rename to runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java index 9a71a9bf3c..0eaae6e50b 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/WidgetItemQuery.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Devin French + * Copyright (c) 2019, Adam * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,53 +22,57 @@ * (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.queries; +package net.runelite.client.ui.overlay; -import net.runelite.api.Client; -import net.runelite.api.Query; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.util.List; +import lombok.AccessLevel; +import lombok.Setter; import net.runelite.api.widgets.WidgetItem; -public abstract class WidgetItemQuery extends Query +public abstract class WidgetItemOverlay extends Overlay { + @Setter(AccessLevel.PACKAGE) + private OverlayManager overlayManager; - public WidgetItemQuery idEquals(int... ids) + protected WidgetItemOverlay() { - predicate = and(item -> - { - for (int id : ids) - { - if (item.getId() == id) - { - return true; - } - } - return false; - }); - return this; + super.setPosition(OverlayPosition.DYNAMIC); + super.setPriority(OverlayPriority.LOW); + super.setLayer(OverlayLayer.ABOVE_WIDGETS); } - public WidgetItemQuery indexEquals(int... indexes) + public abstract void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget); + + @Override + public Dimension render(Graphics2D graphics) { - predicate = and(item -> + final List itemWidgets = overlayManager.getItemWidgets(); + for (WidgetItem widget : itemWidgets) { - for (int index : indexes) - { - if (item.getIndex() == index) - { - return true; - } - } - return false; - }); - return this; + renderItemOverlay(graphics, widget.getId(), widget); + } + return null; } - public WidgetItemQuery quantityEquals(int quantity) + // Don't allow setting position, priority, or layer + + @Override + public void setPosition(OverlayPosition position) { - predicate = and(item -> item.getQuantity() == quantity); - return this; + throw new IllegalStateException(); } @Override - public abstract WidgetItem[] result(Client client); + public void setPriority(OverlayPriority priority) + { + throw new IllegalStateException(); + } + + @Override + public void setLayer(OverlayLayer layer) + { + throw new IllegalStateException(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/util/QueryRunner.java b/runelite-client/src/main/java/net/runelite/client/util/QueryRunner.java deleted file mode 100644 index 0f34fc5448..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/util/QueryRunner.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2017, Tomas Slusny - * 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.util; - -import javax.inject.Inject; -import javax.inject.Singleton; -import net.runelite.api.Client; -import net.runelite.api.Query; - -@Singleton -public class QueryRunner -{ - @Inject - private Client client; - - @SuppressWarnings("unchecked") - public T[] runQuery(Query query) - { - return (T[]) query.result(client); - } -} \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 6c3d1f1ae0..56b9190ead 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -28,6 +28,7 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.EnumSet; import java.util.List; import java.util.Map; @@ -108,6 +109,8 @@ import net.runelite.api.mixins.Shadow; import net.runelite.api.vars.AccountType; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; +import net.runelite.api.widgets.WidgetItem; +import net.runelite.api.widgets.WidgetType; import net.runelite.rs.api.RSChatLineBuffer; import net.runelite.rs.api.RSClanMemberManager; import net.runelite.rs.api.RSClient; @@ -1324,8 +1327,11 @@ public abstract class RSClientMixin implements RSClient @MethodHook("renderWidgetLayer") @Inject - public static void renderWidgetLayer(Widget[] widgets, int parentId, int var2, int var3, int var4, int var5, int x, int y, int var8) + public static void renderWidgetLayer(Widget[] widgets, int parentId, int minX, int minY, int maxX, int maxY, int x, int y, int var8) { + Callbacks callbacks = client.getCallbacks(); + HashTable componentTable = client.getComponentTable(); + for (Widget rlWidget : widgets) { RSWidget widget = (RSWidget) rlWidget; @@ -1338,10 +1344,30 @@ public abstract class RSClientMixin implements RSClient { widget.setRenderParentId(parentId); } - widget.setRenderX(x + widget.getRelativeX()); - widget.setRenderY(y + widget.getRelativeY()); - HashTable componentTable = client.getComponentTable(); + final int renderX = x + widget.getRelativeX(); + final int renderY = y + widget.getRelativeY(); + widget.setRenderX(renderX); + widget.setRenderY(renderY); + + final int widgetType = widget.getType(); + if (widgetType == WidgetType.GRAPHIC && widget.getItemId() != -1) + { + if (renderX >= minX && renderX <= maxX && renderY >= minY && renderY <= maxY) + { + WidgetItem widgetItem = new WidgetItem(widget.getItemId(), widget.getItemQuantity(), -1, widget.getBounds()); + callbacks.drawItem(widget.getItemId(), widgetItem); + } + } + else if (widgetType == WidgetType.INVENTORY) + { + Collection widgetItems = widget.getWidgetItems(); + for (WidgetItem widgetItem : widgetItems) + { + callbacks.drawItem(widgetItem.getId(), widgetItem); + } + } + WidgetNode childNode = componentTable.get(widget.getId()); if (childNode != null) {