client: add inventory grid plugin
Co-authored-by: Jeremy Plsek <jeremyplsek@gmail.com>
This commit is contained in:
@@ -1605,6 +1605,19 @@ public interface Client extends GameEngine
|
|||||||
|
|
||||||
void checkClickbox(Model model, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash);
|
void checkClickbox(Model model, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the if1 widget whose item is being dragged
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
Widget getIf1DraggedWidget();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the item index of the item being dragged on an if1 widget
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
int getIf1DraggedItemIndex();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets if a widget is in target mode
|
* Sets if a widget is in target mode
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2018, Jeremy Plsek <https://github.com/jplsek>
|
||||||
|
* 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 net.runelite.client.config.Config;
|
||||||
|
import net.runelite.client.config.ConfigGroup;
|
||||||
|
import net.runelite.client.config.ConfigItem;
|
||||||
|
|
||||||
|
@ConfigGroup("inventorygrid")
|
||||||
|
public interface InventoryGridConfig extends Config
|
||||||
|
{
|
||||||
|
@ConfigItem(
|
||||||
|
keyName = "showItem",
|
||||||
|
name = "Show item",
|
||||||
|
description = "Show a preview of the item in the new slot"
|
||||||
|
)
|
||||||
|
default boolean showItem()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@ConfigItem(
|
||||||
|
keyName = "showGrid",
|
||||||
|
name = "Show grid",
|
||||||
|
description = "Show a grid on the inventory while dragging"
|
||||||
|
)
|
||||||
|
default boolean showGrid()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@ConfigItem(
|
||||||
|
keyName = "showHighlight",
|
||||||
|
name = "Highlight background",
|
||||||
|
description = "Show a green background highlight on the new slot"
|
||||||
|
)
|
||||||
|
default boolean showHighlight()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,114 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2018, Jeremy Plsek <https://github.com/jplsek>
|
||||||
|
* Copyright (c) 2019, Adam <Adam@sigterm.info>
|
||||||
|
* 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 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)
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2018, Jeremy Plsek <https://github.com/jplsek>
|
||||||
|
* Copyright (c) 2019, Adam <Adam@sigterm.info>
|
||||||
|
* 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 com.google.inject.Provides;
|
||||||
|
import net.runelite.client.config.ConfigManager;
|
||||||
|
import net.runelite.client.plugins.Plugin;
|
||||||
|
import net.runelite.client.plugins.PluginDescriptor;
|
||||||
|
import net.runelite.client.ui.overlay.OverlayManager;
|
||||||
|
|
||||||
|
@PluginDescriptor(
|
||||||
|
name = "Inventory Grid",
|
||||||
|
description = "Shows a grid over the inventory and a preview of where items will be dragged",
|
||||||
|
tags = {"items", "overlay"},
|
||||||
|
enabledByDefault = false
|
||||||
|
)
|
||||||
|
public class InventoryGridPlugin extends Plugin
|
||||||
|
{
|
||||||
|
@Inject
|
||||||
|
private InventoryGridOverlay overlay;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private OverlayManager overlayManager;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void startUp()
|
||||||
|
{
|
||||||
|
overlayManager.add(overlay);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void shutDown()
|
||||||
|
{
|
||||||
|
overlayManager.remove(overlay);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Provides
|
||||||
|
InventoryGridConfig getConfig(ConfigManager configManager)
|
||||||
|
{
|
||||||
|
return configManager.getConfig(InventoryGridConfig.class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -932,6 +932,14 @@ public interface RSClient extends RSGameEngine, Client
|
|||||||
@Import("endY")
|
@Import("endY")
|
||||||
int getEndY();
|
int getEndY();
|
||||||
|
|
||||||
|
@Import("if1DraggedWidget")
|
||||||
|
@Override
|
||||||
|
RSWidget getIf1DraggedWidget();
|
||||||
|
|
||||||
|
@Import("if1DraggedItemIndex")
|
||||||
|
@Override
|
||||||
|
int getIf1DraggedItemIndex();
|
||||||
|
|
||||||
@Import("spellSelected")
|
@Import("spellSelected")
|
||||||
@Override
|
@Override
|
||||||
void setSpellSelected(boolean selected);
|
void setSpellSelected(boolean selected);
|
||||||
|
|||||||
Reference in New Issue
Block a user