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

4
runescape-api/src/main/java/net/runelite/rs/api/RSTile.java
View File

@@ -3,7 +3,7 @@ package net.runelite.rs.api;
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.SceneTileModel;
import net.runelite.api.SceneTilePaint;
import net.runelite.api.Tile;
@@ -18,7 +18,7 @@ public interface RSTile extends Tile
@Import("tileItemPile")
@Override
ItemLayer getItemLayer();
TileItemPile getItemLayer();
@Import("wallDecoration")
@Override

3
runescape-api/src/main/java/net/runelite/rs/api/RSTileItem.java
View File

@@ -1,10 +1,9 @@
package net.runelite.rs.api;
import net.runelite.api.Item;
import net.runelite.api.Tile;
import net.runelite.api.TileItem;
import net.runelite.mapping.Import;
public interface RSTileItem extends RSEntity, TileItem, Item
public interface RSTileItem extends RSEntity, TileItem
{
@Import("id")
@Override

4
runescape-api/src/main/java/net/runelite/rs/api/RSTileItemPile.java
View File

@@ -1,9 +1,9 @@
package net.runelite.rs.api;
import net.runelite.api.ItemLayer;
import net.runelite.api.TileItemPile;
import net.runelite.mapping.Import;
public interface RSTileItemPile extends ItemLayer
public interface RSTileItemPile extends TileItemPile
{
@Import("x")
int getX();