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

22
runelite-mixins/src/main/java/net/runelite/mixins/RSBoundaryObjectMixin.java
View File

@@ -1,8 +1,8 @@
package net.runelite.mixins;
import net.runelite.api.Entity;
import net.runelite.api.Model;
import net.runelite.api.Perspective;
import net.runelite.api.Renderable;
import java.awt.geom.Area;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
@@ -36,38 +36,38 @@ public abstract class RSBoundaryObjectMixin implements RSBoundaryObject
@Inject
public Model getModelA()
{
Renderable renderable = getRenderable1();
if (renderable == null)
Entity entity = getRenderable1();
if (entity == null)
{
return null;
}
if (renderable instanceof Model)
if (entity instanceof Model)
{
return (Model) renderable;
return (Model) entity;
}
else
{
return renderable.getModel();
return entity.getModel();
}
}
@Inject
public Model getModelB()
{
Renderable renderable = getRenderable2();
if (renderable == null)
Entity entity = getRenderable2();
if (entity == null)
{
return null;
}
if (renderable instanceof Model)
if (entity instanceof Model)
{
return (Model) renderable;
return (Model) entity;
}
else
{
return renderable.getModel();
return entity.getModel();
}
}

12
runelite-mixins/src/main/java/net/runelite/mixins/RSFloorDecorationMixin.java
View File

@@ -2,7 +2,7 @@ package net.runelite.mixins;
import net.runelite.api.Model;
import net.runelite.api.Perspective;
import net.runelite.api.Renderable;
import net.runelite.api.Entity;
import java.awt.geom.Area;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
@@ -37,19 +37,19 @@ public abstract class RSFloorDecorationMixin implements RSFloorDecoration
@Override
public Model getModel()
{
Renderable renderable = getRenderable();
if (renderable == null)
Entity entity = getRenderable();
if (entity == null)
{
return null;
}
if (renderable instanceof Model)
if (entity instanceof Model)
{
return (Model) renderable;
return (Model) entity;
}
else
{
return renderable.getModel();
return entity.getModel();
}
}

30
runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java
View File

@@ -24,10 +24,10 @@
*/
package net.runelite.mixins;
import net.runelite.api.Entity;
import net.runelite.api.Perspective;
import net.runelite.api.Renderable;
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.hooks.DrawCallbacks;
import net.runelite.api.mixins.Copy;
@@ -391,10 +391,10 @@ public abstract class RSSceneMixin implements RSScene
}
@Copy("newWallDecoration")
abstract public void rs$addBoundaryDecoration(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long hash, int var12);
abstract public void rs$addBoundaryDecoration(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long hash, int var12);
@Replace("newWallDecoration")
public void rl$addBoundaryDecoration(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long hash, int var12)
public void rl$addBoundaryDecoration(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long hash, int var12)
{
rs$addBoundaryDecoration(plane, x, y, floor, var5, var6, var7, var8, var9, var10, hash, var12);
Tile tile = getTiles()[plane][x][y];
@@ -409,10 +409,10 @@ public abstract class RSSceneMixin implements RSScene
}
@Copy("newGroundItemPile")
abstract public void rs$addItemPile(int plane, int x, int y, int hash, Renderable var5, long var6, Renderable var7, Renderable var8);
abstract public void rs$addItemPile(int plane, int x, int y, int hash, Entity var5, long var6, Entity var7, Entity var8);
@Replace("newGroundItemPile")
public void rl$addItemPile(int plane, int x, int y, int hash, Renderable var5, long var6, Renderable var7, Renderable var8)
public void rl$addItemPile(int plane, int x, int y, int hash, Entity var5, long var6, Entity var7, Entity var8)
{
rs$addItemPile(plane, x, y, hash, var5, var6, var7, var8);
Tile tile = getTiles()[plane][x][y];
@@ -427,10 +427,10 @@ public abstract class RSSceneMixin implements RSScene
}
@Copy("newFloorDecoration")
abstract public void rs$groundObjectSpawned(int plane, int x, int y, int floor, Renderable var5, long hash, int var7);
abstract public void rs$groundObjectSpawned(int plane, int x, int y, int floor, Entity var5, long hash, int var7);
@Replace("newFloorDecoration")
public void rl$groundObjectSpawned(int plane, int x, int y, int floor, Renderable var5, long hash, int var7)
public void rl$groundObjectSpawned(int plane, int x, int y, int floor, Entity var5, long hash, int var7)
{
rs$groundObjectSpawned(plane, x, y, floor, var5, hash, var7);
Tile tile = getTiles()[plane][x][y];
@@ -445,10 +445,10 @@ public abstract class RSSceneMixin implements RSScene
}
@Copy("newBoundaryObject")
abstract public void rs$addBoundary(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, long hash, int var10);
abstract public void rs$addBoundary(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, long hash, int var10);
@Replace("newBoundaryObject")
public void rl$addBoundary(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, long hash, int var10)
public void rl$addBoundary(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, long hash, int var10)
{
rs$addBoundary(plane, x, y, floor, var5, var6, var7, var8, hash, var10);
Tile tile = getTiles()[plane][x][y];
@@ -463,10 +463,10 @@ public abstract class RSSceneMixin implements RSScene
}
@Copy("drawTileUnderlay")
abstract public void rs$drawTileUnderlay(SceneTilePaint tile, int z, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y);
abstract public void rs$drawTileUnderlay(TilePaint tile, int z, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y);
@Replace("drawTileUnderlay")
public void rl$drawTileUnderlay(SceneTilePaint tile, int z, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y)
public void rl$drawTileUnderlay(TilePaint tile, int z, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y)
{
if (!client.isGpu())
{
@@ -590,10 +590,10 @@ public abstract class RSSceneMixin implements RSScene
}
@Copy("drawTileOverlay")
abstract public void rs$drawTileOverlay(SceneTileModel tile, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y);
abstract public void rs$drawTileOverlay(TileModel tile, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y);
@Replace("drawTileOverlay")
public void rl$drawTileOverlay(SceneTileModel tile, int pitchSin, int pitchCos, int yawSin, int yawCos, int tileX, int tileY)
public void rl$drawTileOverlay(TileModel tile, int pitchSin, int pitchCos, int yawSin, int yawCos, int tileX, int tileY)
{
if (!client.isGpu())
{

32
runelite-mixins/src/main/java/net/runelite/mixins/RSTileItemPileMixin.java
View File

@@ -1,8 +1,8 @@
package net.runelite.mixins;
import java.awt.geom.Area;
import net.runelite.api.Entity;
import net.runelite.api.Model;
import net.runelite.api.Renderable;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSTileItemPile;
@@ -38,19 +38,19 @@ public abstract class RSTileItemPileMixin implements RSTileItemPile
@Override
public Model getModelBottom()
{
Renderable renderable = getBottom();
if (renderable == null)
Entity entity = getBottom();
if (entity == null)
{
return null;
}
if (renderable instanceof Model)
if (entity instanceof Model)
{
return (Model) renderable;
return (Model) entity;
}
else
{
return renderable.getModel();
return entity.getModel();
}
}
@@ -58,19 +58,19 @@ public abstract class RSTileItemPileMixin implements RSTileItemPile
@Override
public Model getModelMiddle()
{
Renderable renderable = getMiddle();
if (renderable == null)
Entity entity = getMiddle();
if (entity == null)
{
return null;
}
if (renderable instanceof Model)
if (entity instanceof Model)
{
return (Model) renderable;
return (Model) entity;
}
else
{
return renderable.getModel();
return entity.getModel();
}
}
@@ -78,19 +78,19 @@ public abstract class RSTileItemPileMixin implements RSTileItemPile
@Override
public Model getModelTop()
{
Renderable renderable = getTop();
if (renderable == null)
Entity entity = getTop();
if (entity == null)
{
return null;
}
if (renderable instanceof Model)
if (entity instanceof Model)
{
return (Model) renderable;
return (Model) entity;
}
else
{
return renderable.getModel();
return entity.getModel();
}
}
}