From e0af1d775359228d217bd60ecf519fcd356479be Mon Sep 17 00:00:00 2001 From: zeruth Date: Sat, 8 Jun 2019 17:39:32 -0400 Subject: [PATCH] Fix build / Fix scammer plugin crash --- .../net/runelite/injector/InjectMojo.java | 2 +- .../inventorygrid/InventoryGridOverlay.java | 116 ------------------ .../net/runelite/mixins/RSUserListMixin.java | 6 + 3 files changed, 7 insertions(+), 117 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java diff --git a/injector-plugin/src/main/java/net/runelite/injector/InjectMojo.java b/injector-plugin/src/main/java/net/runelite/injector/InjectMojo.java index 333bd1d9d3..08ac162588 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/InjectMojo.java +++ b/injector-plugin/src/main/java/net/runelite/injector/InjectMojo.java @@ -48,7 +48,7 @@ public class InjectMojo extends AbstractMojo @Parameter(defaultValue = "${project.build.outputDirectory}") private File outputDirectory; - @Parameter(defaultValue = "./rs-client/target/rs-client-${project.version}.jar", readonly = true, required = true) + @Parameter(defaultValue = "./runescape-client/target/rs-client-${project.version}.jar", readonly = true, required = true) private String rsClientPath; @Parameter(defaultValue = "${net.runelite.rs:vanilla:jar}", readonly = true, required = true) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java deleted file mode 100644 index f628f007c6..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) 2018, Jeremy Plsek - * Copyright (c) 2019, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.inventorygrid; - -import com.google.inject.Inject; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.image.BufferedImage; -import net.runelite.api.Client; -import net.runelite.api.widgets.Widget; -import net.runelite.api.widgets.WidgetInfo; -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; - -class InventoryGridOverlay extends Overlay -{ - private static final int INVENTORY_SIZE = 28; - private static final int DRAG_DELAY = 5; - - private static final Color HIGHLIGHT = new Color(0, 255, 0, 45); - private static final Color GRID = new Color(255, 255, 255, 45); - - private final InventoryGridConfig config; - private final Client client; - private final ItemManager itemManager; - - @Inject - private InventoryGridOverlay(InventoryGridConfig config, Client client, ItemManager itemManager) - { - this.itemManager = itemManager; - this.client = client; - this.config = config; - - setPosition(OverlayPosition.DYNAMIC); - setLayer(OverlayLayer.ABOVE_WIDGETS); - } - - @Override - public Dimension render(Graphics2D graphics) - { - final Widget if1DraggingWidget = client.getIf1DraggedWidget(); - final Widget inventoryWidget = client.getWidget(WidgetInfo.INVENTORY); - - if (if1DraggingWidget == null || if1DraggingWidget != inventoryWidget - || client.getItemPressedDuration() < DRAG_DELAY) - { - return null; - } - - final net.runelite.api.Point mouse = client.getMouseCanvasPosition(); - final Point mousePoint = new Point(mouse.getX(), mouse.getY()); - - for (int i = 0; i < INVENTORY_SIZE; ++i) - { - WidgetItem widgetItem = inventoryWidget.getWidgetItem(i); - - final Rectangle bounds = widgetItem.getCanvasBounds(); - boolean inBounds = bounds.contains(mousePoint); - - if (config.showItem() && inBounds) - { - final WidgetItem draggedItem = inventoryWidget.getWidgetItem(client.getIf1DraggedItemIndex()); - final BufferedImage draggedItemImage = itemManager.getImage(draggedItem.getId()); - final int x = (int) bounds.getX(); - final int y = (int) bounds.getY(); - - graphics.setComposite(AlphaComposite.SrcOver.derive(0.3f)); - graphics.drawImage(draggedItemImage, x, y, null); - graphics.setComposite(AlphaComposite.SrcOver); - } - - if (config.showHighlight() && inBounds) - { - graphics.setColor(HIGHLIGHT); - graphics.fill(bounds); - } - else if (config.showGrid()) - { - graphics.setColor(GRID); - graphics.fill(bounds); - } - } - - return null; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSUserListMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSUserListMixin.java index 5c0330852e..0760cd302f 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSUserListMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSUserListMixin.java @@ -1,5 +1,6 @@ package net.runelite.mixins; +import net.runelite.api.Nameable; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.MethodHook; import net.runelite.api.mixins.Mixin; @@ -31,6 +32,11 @@ public abstract class RSUserListMixin implements RSUserList { } + @Inject + public void remove(Nameable nameable) + { + } + @Inject @MethodHook(value = "addLast", end = true) public void add(RSUsername name, RSUsername prevName)