ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

project: Fix upstream merge (#1157)

Browse Source 
* Fix upstream merge

* Update RSItemContainerMixin.java
This commit is contained in:
Lucwousin
2019-07-28 00:05:55 +02:00
committed by Kyleeld
parent 9ed6f586dd
commit 22f6146ea7
25 changed files with 3548 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
runelite-client/src/main/java/net/runelite/client/graphics/ModelOutlineRenderer.java
View File

@@ -37,7 +37,7 @@ import net.runelite.api.Client;
import net.runelite.api.DecorativeObject;
import net.runelite.api.GameObject;
import net.runelite.api.GroundObject;
import net.runelite.api.ItemLayer;
import net.runelite.api.TileItemPile;
import net.runelite.api.MainBufferProvider;
import net.runelite.api.Model;
import net.runelite.api.NPC;
@@ -990,32 +990,32 @@ public class ModelOutlineRenderer
}
}
private void drawOutline(ItemLayer itemLayer, int outlineWidth, Color innerColor, Color outerColor)
private void drawOutline(TileItemPile tileItemPile, int outlineWidth, Color innerColor, Color outerColor)
{
LocalPoint lp = itemLayer.getLocalLocation();
LocalPoint lp = tileItemPile.getLocalLocation();
if (lp != null)
{
Model model = itemLayer.getModelBottom();
Model model = tileItemPile.getModelBottom();
if (model != null)
{
drawModelOutline(model, lp.getX(), lp.getY(),
Perspective.getTileHeight(client, lp, itemLayer.getPlane()),
Perspective.getTileHeight(client, lp, tileItemPile.getPlane()),
0, outlineWidth, innerColor, outerColor);
}
model = itemLayer.getModelMiddle();
model = tileItemPile.getModelMiddle();
if (model != null)
{
drawModelOutline(model, lp.getX(), lp.getY(),
Perspective.getTileHeight(client, lp, itemLayer.getPlane()),
Perspective.getTileHeight(client, lp, tileItemPile.getPlane()),
0, outlineWidth, innerColor, outerColor);
}
model = itemLayer.getModelTop();
model = tileItemPile.getModelTop();
if (model != null)
{
drawModelOutline(model, lp.getX(), lp.getY(),
Perspective.getTileHeight(client, lp, itemLayer.getPlane()),
Perspective.getTileHeight(client, lp, tileItemPile.getPlane()),
0, outlineWidth, innerColor, outerColor);
}
}
@@ -1086,9 +1086,9 @@ public class ModelOutlineRenderer
{
drawOutline((GroundObject) tileObject, outlineWidth, innerColor, outerColor);
}
else if (tileObject instanceof ItemLayer)
else if (tileObject instanceof TileItemPile)
{
drawOutline((ItemLayer) tileObject, outlineWidth, innerColor, outerColor);
drawOutline((TileItemPile) tileObject, outlineWidth, innerColor, outerColor);
}
else if (tileObject instanceof DecorativeObject)
{

12
runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
View File

@@ -46,7 +46,7 @@ import net.runelite.api.GameObject;
import net.runelite.api.GraphicsObject;
import net.runelite.api.TileItem;
import net.runelite.api.GroundObject;
import net.runelite.api.ItemLayer;
import net.runelite.api.TileItemPile;
import net.runelite.api.NPC;
import net.runelite.api.NPCDefinition;
import net.runelite.api.Node;
@@ -279,16 +279,16 @@ class DevToolsOverlay extends Overlay
private void renderGroundItems(Graphics2D graphics, Tile tile, Player player)
{
ItemLayer itemLayer = tile.getItemLayer();
if (itemLayer != null)
TileItemPile tileItemPile = tile.getItemLayer();
if (tileItemPile != null)
{
if (player.getLocalLocation().distanceTo(itemLayer.getLocalLocation()) <= MAX_DISTANCE)
if (player.getLocalLocation().distanceTo(tileItemPile.getLocalLocation()) <= MAX_DISTANCE)
{
Node current = itemLayer.getBottom();
Node current = tileItemPile.getBottom();
while (current instanceof TileItem)
{
TileItem item = (TileItem) current;
OverlayUtil.renderTileOverlay(graphics, itemLayer, "ID: " + item.getId() + " Qty:" + item.getQuantity(), RED);
OverlayUtil.renderTileOverlay(graphics, tileItemPile, "ID: " + item.getId() + " Qty:" + item.getQuantity(), RED);
current = current.getNext();
}
}

8
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
View File

@@ -54,7 +54,7 @@ import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.ItemDefinition;
import net.runelite.api.ItemID;
import net.runelite.api.ItemLayer;
import net.runelite.api.TileItemPile;
import net.runelite.api.MenuAction;
import net.runelite.api.MenuEntry;
import net.runelite.api.Node;
@@ -678,9 +678,9 @@ public class GroundItemsPlugin extends Plugin
int itemId = event.getIdentifier();
Scene scene = client.getScene();
Tile tile = scene.getTiles()[client.getPlane()][event.getActionParam0()][event.getActionParam1()];
ItemLayer itemLayer = tile.getItemLayer();
TileItemPile tileItemPile = tile.getItemLayer();
if (itemLayer == null)
if (tileItemPile == null)
{
return;
}
@@ -689,7 +689,7 @@ public class GroundItemsPlugin extends Plugin
MenuEntry lastEntry = menuEntries[menuEntries.length - 1];
int quantity = 1;
Node current = itemLayer.getBottom();
Node current = tileItemPile.getBottom();
while (current instanceof TileItem)
{

4
runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
View File

@@ -53,7 +53,7 @@ enum Task
ABERRANT_SPECTRES("Aberrant spectres", ItemID.ABERRANT_SPECTRE,
asList("Abhorrent spectre", "Deviant spectre", "Repugnant spectre"), Collections.emptyList()),
ABYSSAL_DEMONS("Abyssal demons", ItemID.ABYSSAL_DEMON,
asList("Ayssal Sire"), Collections.emptyList()),
asList("Abyssal Sire"), Collections.emptyList()),
ABYSSAL_SIRE("Abyssal Sire", ItemID.ABYSSAL_ORPHAN),
ADAMANT_DRAGONS("Adamant dragons", ItemID.ADAMANT_DRAGON_MASK),
ALCHEMICAL_HYDRA("Alchemical Hydra", ItemID.IKKLE_HYDRA),
@@ -120,7 +120,7 @@ enum Task
asList("Dwarf", "Black guard"), Collections.emptyList()),
EARTH_WARRIORS("Earth warriors", ItemID.BRONZE_FULL_HELM_T),
ELVES("Elves", ItemID.ELF,
asList("Elf"), asList(NpcID.MOURNER_5311)),
asList("Elf"), Collections.emptyList()),
FEVER_SPIDERS("Fever spiders", ItemID.FEVER_SPIDER),
FIRE_GIANTS("Fire giants", ItemID.FIRE_BATTLESTAFF),
REVENANTS("Revenants", ItemID.REVENANT_ETHER,