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

fix mixins getting confused between methods

Browse Source
This commit is contained in:
Lucwousin
2019-08-11 06:34:03 +02:00
parent df0501f302
commit dbdb686843
35 changed files with 209 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,10 @@
package net.runelite.rs.api;
import net.runelite.api.DynamicObject;
import net.runelite.api.Renderable;
import net.runelite.api.Entity;
import net.runelite.mapping.Import;
public interface RSDynamicObject extends RSEntity, DynamicObject, Renderable
public interface RSDynamicObject extends RSEntity, DynamicObject, Entity
{
@Import("id")
int getId();

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

@@ -24,10 +24,10 @@
*/
package net.runelite.rs.api;
import net.runelite.api.Renderable;
import net.runelite.api.Entity;
import net.runelite.mapping.Import;
public interface RSEntity extends RSNode, Renderable
public interface RSEntity extends RSNode, Entity
{
@Import("height")
int getModelHeight();

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

@@ -4,8 +4,8 @@ import net.runelite.api.DecorativeObject;
import net.runelite.api.GameObject;
import net.runelite.api.GroundObject;
import net.runelite.api.TileItemPile;
import net.runelite.api.SceneTileModel;
import net.runelite.api.SceneTilePaint;
import net.runelite.api.TileModel;
import net.runelite.api.TilePaint;
import net.runelite.api.Tile;
import net.runelite.api.WallObject;
import net.runelite.mapping.Import;
@@ -34,11 +34,11 @@ public interface RSTile extends Tile
@Import("paint")
@Override
SceneTilePaint getSceneTilePaint();
TilePaint getSceneTilePaint();
@Import("model")
@Override
SceneTileModel getSceneTileModel();
TileModel getSceneTileModel();
@Import("x")
int getX();

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

@@ -1,9 +1,9 @@
package net.runelite.rs.api;
import net.runelite.api.SceneTileModel;
import net.runelite.api.TileModel;
import net.runelite.mapping.Import;
public interface RSTileModel extends SceneTileModel
public interface RSTileModel extends TileModel
{
@Import("underlayRgb")
@Override

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

@@ -1,9 +1,9 @@
package net.runelite.rs.api;
import net.runelite.api.SceneTilePaint;
import net.runelite.api.TilePaint;
import net.runelite.mapping.Import;
public interface RSTilePaint extends SceneTilePaint
public interface RSTilePaint extends TilePaint
{
@Import("rgb")
@Override