develop

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

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

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

@@ -932,7 +932,7 @@ public interface Client extends GameShell
 	 * @return the corresponding object composition
 	 * @see ObjectID
 	 */
-	ObjectDefinition getObjectComposition(int objectId);
+	ObjectComposition getObjectDefinition(int objectId);
 
 	/**
 	 * Gets the NPC composition corresponding to an NPCs ID.

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

@@ -40,8 +40,8 @@ public interface DecorativeObject extends TileObject
 	Shape getConvexHull();
 	Shape getConvexHull2();
 
-	Entity getEntity1();
-	Entity getEntity2();
+	Renderable getRenderable();
+	Renderable 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 Entity
+public interface DynamicObject extends Renderable
 {
 	int getAnimationID();
 }

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

@@ -68,7 +68,7 @@ public interface GameObject extends TileObject
 	 */
 	Angle getOrientation();
 
-	Entity getEntity();
+	Renderable 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/spotanim.
  */
-public interface GraphicsObject extends Entity
+public interface GraphicsObject extends Renderable
 {
 	/**
 	 * The graphics object ID.

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

@@ -31,7 +31,7 @@ import java.awt.Shape;
  */
 public interface GroundObject extends TileObject
 {
-	Entity getEntity();
+	Renderable getRenderable();
 
 	Model getModel();
 

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

@@ -57,7 +57,7 @@ public class MenuEntry implements Cloneable
 	/**
 	 * An additional parameter for the action.
 	 */
-	private int actionParam0;
+	private int actionParam;
 	/**
 	 * A second additional parameter for the action.
 	 */
@@ -70,13 +70,13 @@ public class MenuEntry implements Cloneable
 	 */
 	private boolean forceLeftClick;
 
-	public MenuEntry(String option, String target, int type, int opcode, int actionParam0, int actionParam1, boolean forceLeftClick)
+	public MenuEntry(String option, String target, int type, int opcode, int actionParam, int actionParam1, boolean forceLeftClick)
 	{
 		this.option = option;
 		this.target = target;
 		this.identifier = type;
 		this.opcode = opcode;
-		this.actionParam0 = actionParam0;
+		this.actionParam = actionParam;
 		this.actionParam1 = actionParam1;
 		this.forceLeftClick = forceLeftClick;
 	}
@@ -94,9 +94,19 @@ public class MenuEntry implements Cloneable
 		}
 	}
 
+	public void setActionParam0(int i)
+	{
+		this.actionParam = i;
+	}
+
+	public int getActionParam0()
+	{
+		return this.actionParam;
+	}
+
 	public void setParam0(int i)
 	{
-		this.actionParam0 = i;
+		this.actionParam = i;
 	}
 
 	public void setParam1(int i)
@@ -114,6 +124,16 @@ public class MenuEntry implements Cloneable
 		return this.opcode;
 	}
 
+	public void setId(int i)
+	{
+		this.identifier = i;
+	}
+
+	public int getId()
+	{
+		return this.identifier;
+	}
+
 	/**
 	 * Get opcode, but as it's enum counterpart
 	 */

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 Entity
+public interface Model extends Renderable
 {
 	/**
 	 * Gets a list of all vertices of the model.

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

@@ -27,7 +27,7 @@ package net.runelite.api;
 /**
  * Information about a specific {@link ObjectID}
  */
-public interface ObjectDefinition
+public interface ObjectComposition
 {
 	/**
 	 * Gets ID for the object.
@@ -72,5 +72,5 @@ public interface ObjectDefinition
 	 *
 	 * @throws NullPointerException if {@link #getImpostorIds()} is null
 	 */
-	ObjectDefinition getImpostor();
+	ObjectComposition getImpostor();
 }

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 Entity
+public interface Projectile extends Renderable
 {
 	/**
 	 * Gets the ID of the projectile.

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

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

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

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

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

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

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

@@ -347,4 +347,7 @@ public final class ScriptID
 
 	@ScriptArguments()
 	public static final int BANKMAIN_SEARCHING = 514;
+
+	@ScriptArguments(integer = 7)
+	public static final int SETTINGS_SLIDER_CHOOSE_ONOP = 3885;
 }

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2020 Abex
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.api;
+
+public class SettingID
+{
+	public static final int CAMERA_ZOOM = 14;
+
+	public static final int MUSIC_VOLUME = 30;
+	public static final int EFFECT_VOLUME = 31;
+	public static final int AREA_VOLUME = 32;
+}

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

@@ -71,14 +71,14 @@ public interface Tile extends TileObject
 	 *
 	 * @return the paint
 	 */
-	TilePaint getTilePaint();
+	SceneTilePaint getSceneTilePaint();
 
 	/**
 	 * Gets the model of the tile in the scene.
 	 *
 	 * @return the tile model
 	 */
-	TileModel getTileModel();
+	SceneTileModel getSceneTileModel();
 
 	/**
 	 * Gets the location coordinate of the tile in scene coords

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 Entity
+public interface TileItem extends Renderable
 {
 	/**
 	 * @return the ID of the item

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

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

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

@@ -52,8 +52,8 @@ public interface WallObject extends TileObject
 	 */
 	int getConfig();
 
-	Entity getEntity1();
-	Entity getEntity2();
+	Renderable getRenderable();
+	Renderable getRenderable2();
 
 	Model getModelA();
 	Model getModelB();

runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java

@@ -90,7 +90,7 @@ public class MenuOptionClicked extends MenuEntry implements Event
 		setTarget(e.getTarget());
 		setIdentifier(e.getIdentifier());
 		setOpcode(e.getOpcode());
-		setActionParam0(e.getActionParam0());
+		setActionParam(e.getActionParam());
 		setActionParam1(e.getActionParam1());
 		setForceLeftClick(e.isForceLeftClick());
 	}

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

@@ -25,22 +25,22 @@
 package net.runelite.api.hooks;
 
 import net.runelite.api.Model;
-import net.runelite.api.Entity;
-import net.runelite.api.TileModel;
-import net.runelite.api.TilePaint;
+import net.runelite.api.Renderable;
+import net.runelite.api.SceneTileModel;
+import net.runelite.api.SceneTilePaint;
 import net.runelite.api.Texture;
 
 public interface DrawCallbacks
 {
-	void draw(Entity entity, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash);
+	void draw(Renderable renderable, 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,
-						TilePaint paint, int tileZ, int tileX, int tileY,
+						SceneTilePaint 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,
-						TileModel model, int tileZ, int tileX, int tileY,
+						SceneTileModel model, int tileZ, int tileX, int tileY,
 						int zoom, int centerX, int centerY);
 
 	void draw();

runelite-api/src/main/java/net/runelite/api/widgets/Widget.java

@@ -758,7 +758,7 @@ public interface Widget
 	 */
 	Object[] getOnLoadListener();
 
-	Object[] getOnInvTransmit();
+	Object[] getOnInvTransmitListener();
 
 	/**
 	 * Returns the archive id of the font used

runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java

@@ -181,6 +181,22 @@ public class WidgetID
 	public static final int DUEL_INVENTORY_OTHER_GROUP_ID = 481;
 	public static final int TRAILBLAZER_AREAS_GROUP_ID = 512;
 
+	public static final int SETTINGS_SIDE_GROUP_ID = 116;
+	public static final int SETTINGS_GROUP_ID = 134;
+
+	static class SettingsSide
+	{
+		static final int CAMERA_ZOOM_SLIDER_TRACK = 59;
+		static final int MUSIC_SLIDER = 13;
+		static final int SOUND_EFFECT_SLIDER = 17;
+		static final int AREA_SOUND_SLIDER = 21;
+	}
+
+	static class Settings
+	{
+		static final int INIT = 1;
+	}
+
 	static class WorldMap
 	{
 		static final int MAPVIEW = 7;
@@ -766,6 +782,7 @@ public class WidgetID
 			static final int BASE_POINTS = 33;
 			static final int HONOUR_POINTS_REWARD = 49;
 		}
+		static final int CORRECT_STYLE = 3;
 		static final int GAME_WIDGET = 3;
 		static final int CURRENT_WAVE_WIDGET = 4;
 		static final int CURRENT_WAVE = 5;

runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java

@@ -480,6 +480,7 @@ public enum WidgetInfo
 	BA_COLL_ROLE_TEXT(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.ROLE),
 	BA_COLL_ROLE_SPRITE(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.ROLE_SPRITE),
 
+	BA_ATK_LISTEN_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.CORRECT_STYLE),
 	BA_ATK_WAVE_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.CURRENT_WAVE),
 	BA_ATK_CALL_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.ATK.TO_CALL),
 	BA_ATK_LISTEN_TOP_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.ATK.LISTEN_TOP),
@@ -919,7 +920,8 @@ public enum WidgetInfo
 	HALLOWED_SEPULCHRE_TIMER_CONTAINER(WidgetID.HALLOWED_SEPULCHRE_TIMER_GROUP_ID, WidgetID.HallowedSepulchreTimer.CONTAINER),
 
 	HEALTH_OVERLAY_BAR(WidgetID.HEALTH_OVERLAY_BAR_GROUP_ID, WidgetID.EncounterHealthBar.CONTAINER),
-
+	SETTINGS_INIT(WidgetID.SETTINGS_GROUP_ID, WidgetID.Settings.INIT),
+	SETTINGS_SIDE_CAMERA_ZOOM_SLIDER_TRACK(WidgetID.SETTINGS_SIDE_GROUP_ID, WidgetID.SettingsSide.CAMERA_ZOOM_SLIDER_TRACK),
 	TRAILBLAZER_AREA_TELEPORT(WidgetID.TRAILBLAZER_AREAS_GROUP_ID, WidgetID.TrailblazerAreas.TELEPORT),
 	;