fix mixins getting confused between methods

runelite-api/src/main/java/net/runelite/api/Actor.java

@@ -35,7 +35,7 @@ import net.runelite.api.coords.WorldPoint;
 /**
  * Represents a RuneScape actor/entity.
  */
-public interface Actor extends Renderable
+public interface Actor extends Entity
 {
 	/**
 	 * Gets the combat level of the actor.

runelite-api/src/main/java/net/runelite/api/DecorativeObject.java

@@ -40,8 +40,8 @@ public interface DecorativeObject extends TileObject
 	Polygon getConvexHull();
 	Polygon getConvexHull2();
 
-	Renderable getRenderable();
-	Renderable getRenderable2();
+	Entity getRenderable();
+	Entity getRenderable2();
 
 	Model getModel1();
 

runelite-api/src/main/java/net/runelite/api/DynamicObject.java

@@ -1,6 +1,6 @@
 package net.runelite.api;
 
-public interface DynamicObject extends Renderable
+public interface DynamicObject extends Entity
 {
 	int getAnimationID();
 }

runelite-api/src/main/java/net/runelite/api/Entity.java

@@ -27,7 +27,7 @@ package net.runelite.api;
 /**
  * Represents an object that can be rendered.
  */
-public interface Renderable extends Node
+public interface Entity extends Node
 {
 	/**
 	 * Gets the model of the object.

runelite-api/src/main/java/net/runelite/api/GameObject.java

@@ -68,7 +68,7 @@ public interface GameObject extends TileObject
 	 */
 	Angle getOrientation();
 
-	Renderable getRenderable();
+	Entity getRenderable();
 
 	int getRsOrientation();
 

runelite-api/src/main/java/net/runelite/api/GraphicsObject.java

@@ -29,7 +29,7 @@ import net.runelite.api.coords.LocalPoint;
 /**
  * Represents a graphics object.
  */
-public interface GraphicsObject extends Renderable
+public interface GraphicsObject extends Entity
 {
 	/**
 	 * The graphics object ID.

runelite-api/src/main/java/net/runelite/api/GroundObject.java

@@ -29,7 +29,7 @@ package net.runelite.api;
  */
 public interface GroundObject extends TileObject
 {
-	Renderable getRenderable();
+	Entity getRenderable();
 
 	Model getModel();
 }

runelite-api/src/main/java/net/runelite/api/Model.java

@@ -31,7 +31,7 @@ import java.util.List;
 /**
  * Represents the model of an object.
  */
-public interface Model extends Renderable
+public interface Model extends Entity
 {
 	/**
 	 * Gets a list of all vertices of the model.

runelite-api/src/main/java/net/runelite/api/Projectile.java

@@ -27,7 +27,7 @@ package net.runelite.api;
 /**
  * Represents a projectile entity (ie. cannonball, arrow).
  */
-public interface Projectile extends Renderable
+public interface Projectile extends Entity
 {
 	/**
 	 * Gets the ID of the projectile.

runelite-api/src/main/java/net/runelite/api/Tile.java

@@ -73,14 +73,14 @@ public interface Tile
 	 *
 	 * @return the paint
 	 */
-	SceneTilePaint getSceneTilePaint();
+	TilePaint getSceneTilePaint();
 
 	/**
 	 * Gets the model of the tile in the scene.
 	 *
 	 * @return the tile model
 	 */
-	SceneTileModel getSceneTileModel();
+	TileModel getSceneTileModel();
 
 	/**
 	 * Gets the location coordinate of the tile in the world.

runelite-api/src/main/java/net/runelite/api/TileItem.java

@@ -27,7 +27,7 @@ package net.runelite.api;
 /**
  * Represents an item inside an {@link TileItemPile}.
  */
-public interface TileItem extends Renderable
+public interface TileItem extends Entity
 {
 	/**
 	 * Gets the items ID.

runelite-api/src/main/java/net/runelite/api/TileItemPile.java

@@ -41,21 +41,21 @@ public interface TileItemPile extends TileObject
 	 *
 	 * @return the bottom item
 	 */
-	Renderable getBottom();
+	Entity getBottom();
 
 	/**
 	 * Gets the item at the middle of the pile.
 	 *
 	 * @return the middle item
 	 */
-	Renderable getMiddle();
+	Entity getMiddle();
 
 	/**
 	 * Gets the item at the top of the pile.
 	 *
 	 * @return the top item
 	 */
-	Renderable getTop();
+	Entity getTop();
 
 	Model getModelBottom();
 	Model getModelMiddle();

runelite-api/src/main/java/net/runelite/api/TileModel.java

@@ -27,7 +27,7 @@ package net.runelite.api;
 /**
  * Represents the model of a tile in the current scene.
  */
-public interface SceneTileModel
+public interface TileModel
 {
 	/**
 	 * Gets the underlay color of the tile.

runelite-api/src/main/java/net/runelite/api/TilePaint.java

@@ -27,7 +27,7 @@ package net.runelite.api;
 /**
  * Represents the paint of a tile in the current scene.
  */
-public interface SceneTilePaint
+public interface TilePaint
 {
 	/**
 	 * Gets the RGB value of the paint.

runelite-api/src/main/java/net/runelite/api/WallObject.java

@@ -50,8 +50,8 @@ public interface WallObject extends TileObject
 	 */
 	int getConfig();
 
-	Renderable getRenderable1();
-	Renderable getRenderable2();
+	Entity getRenderable1();
+	Entity getRenderable2();
 
 	Model getModelA();
 	Model getModelB();

runelite-api/src/main/java/net/runelite/api/hooks/DrawCallbacks.java

@@ -24,22 +24,22 @@
  */
 package net.runelite.api.hooks;
 
-import net.runelite.api.Renderable;
-import net.runelite.api.SceneTileModel;
-import net.runelite.api.SceneTilePaint;
+import net.runelite.api.Entity;
+import net.runelite.api.TileModel;
+import net.runelite.api.TilePaint;
 import net.runelite.api.Texture;
 
 public interface DrawCallbacks
 {
-	void draw(Renderable renderable, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash);
+	void draw(Entity entity, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash);
 
 	void drawScenePaint(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z,
-						SceneTilePaint paint, int tileZ, int tileX, int tileY,
+						TilePaint paint, int tileZ, int tileX, int tileY,
 						int zoom, int centerX, int centerY);
 
 
 	void drawSceneModel(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z,
-						SceneTileModel model, int tileZ, int tileX, int tileY,
+						TileModel model, int tileZ, int tileX, int tileY,
 						int zoom, int centerX, int centerY);
 
 	void draw();