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,

2
runelite-client/src/main/scripts/QuestListShowProgress.hash
View File

@@ -1 +1 @@
4D9A96A7D57F6B9661273FB645A0510DD0F02C8A9C2E133772065F8AB588614D
A6B3A7BFE7B688A08F69B91A7FD5C7184D71147D3DAF74B1262369D85DBB3A03

69
runelite-client/src/main/scripts/QuestListShowProgress.rs2asm
View File

@@ -77,14 +77,14 @@ LABEL60:
iload 5
iload 6
if_icmplt LABEL64
jump LABEL119
jump LABEL108
LABEL64:
iload 1
iload 5
cc_find
iconst 1
if_icmpeq LABEL70
jump LABEL114
jump LABEL103
LABEL70:
iload 5
invoke 1358
@@ -96,7 +96,7 @@ LABEL70:
LABEL77:
iconst 901389
istore 4
jump LABEL100
jump LABEL89
LABEL80:
iload 3
iconst 0
@@ -105,24 +105,11 @@ LABEL80:
LABEL84:
iconst 16776960
istore 4
jump LABEL100
jump LABEL89
LABEL87:
iconst 105
iconst 74
iconst 2099
iload 5
enum
iconst 603
if_icmpeq LABEL95
jump LABEL98
LABEL95:
iconst 10461087
istore 4
jump LABEL100
LABEL98:
iconst 16711680
istore 4
LABEL100:
LABEL89:
iload 4
cc_setcolour
iconst 85
@@ -137,54 +124,54 @@ LABEL100:
iload 4
sconst "Iii"
cc_setonmouseleave
LABEL114:
LABEL103:
iload 5
iconst 1
add
istore 5
jump LABEL60
LABEL119:
LABEL108:
iconst 0
invoke 2265
istore 6
istore 5
LABEL123:
LABEL112:
iload 5
iload 6
if_icmplt LABEL127
jump LABEL171
LABEL127:
if_icmplt LABEL116
jump LABEL160
LABEL116:
iload 2
iload 5
cc_find
iconst 1
if_icmpeq LABEL133
jump LABEL166
LABEL133:
if_icmpeq LABEL122
jump LABEL155
LABEL122:
iload 5
invoke 1359
istore 3
iload 3
iconst 2
if_icmpeq LABEL140
jump LABEL143
LABEL140:
if_icmpeq LABEL129
jump LABEL132
LABEL129:
iconst 901389
istore 4
jump LABEL152
LABEL143:
jump LABEL141
LABEL132:
iload 3
iconst 0
if_icmpeq LABEL147
jump LABEL150
LABEL147:
if_icmpeq LABEL136
jump LABEL139
LABEL136:
iconst 16776960
istore 4
jump LABEL152
LABEL150:
jump LABEL141
LABEL139:
iconst 16711680
istore 4
LABEL152:
LABEL141:
iload 4
cc_setcolour
iconst 85
@@ -199,13 +186,13 @@ LABEL152:
iload 4
sconst "Iii"
cc_setonmouseleave
LABEL166:
LABEL155:
iload 5
iconst 1
add
istore 5
jump LABEL123
LABEL171:
jump LABEL112
LABEL160:
sconst "questProgressUpdated"
runelite_callback
return