Merge remote-tracking branch 'runelite/master'

2021-10-01 10:42:22 +02:00
parent beabb18428 e60ce99081
commit 3e3ba784ea
68 changed files with 2764 additions and 8303 deletions
--- a/runelite-api/src/main/java/net/runelite/api/Client.java
+++ b/runelite-api/src/main/java/net/runelite/api/Client.java
@@ -2292,4 +2292,22 @@ public interface Client extends GameEngine
 	 */
 	@Nullable
 	ClanSettings getGuestClanSettings();
+
+	/**
+	 * Get clan channel by id.
+	 * @param clanId the clan id
+	 * @return
+	 * @see net.runelite.api.clan.ClanID
+	 */
+	@Nullable
+	ClanChannel getClanChannel(int clanId);
+
+	/**
+	 * Get clan settings by id
+	 * @param clanId the clan id
+	 * @return
+	 * @see net.runelite.api.clan.ClanID
+	 */
+	@Nullable
+	ClanSettings getClanSettings(int clanId);
 }
--- a/runelite-api/src/main/java/net/runelite/api/GraphicID.java
+++ b/runelite-api/src/main/java/net/runelite/api/GraphicID.java
@@ -25,7 +25,7 @@
 */
 package net.runelite.api;

-public class GraphicID
+public final class GraphicID
 {
 	public static final int WINE_MAKE = 47;
 	public static final int SPLASH = 85;
--- a/runelite-api/src/main/java/net/runelite/api/ParamID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ParamID.java
@@ -27,7 +27,7 @@ package net.runelite.api;
 /**
 * @see ParamHolder
 */
-public class ParamID
+public final class ParamID
 {
 	/**
 	 * @see SettingID
--- a/runelite-api/src/main/java/net/runelite/api/ProjectileID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ProjectileID.java
@@ -29,7 +29,7 @@ package net.runelite.api;
 * <p>
 * Note: This class is not complete and may be missing mapped IDs.
 */
-public class ProjectileID
+public final class ProjectileID
 {
 	public static final int CANNONBALL = 53;
 	public static final int GRANITE_CANNONBALL = 1443;
--- a/runelite-api/src/main/java/net/runelite/api/SettingID.java
+++ b/runelite-api/src/main/java/net/runelite/api/SettingID.java
@@ -27,7 +27,7 @@ package net.runelite.api;
 /**
 * @see ParamID#SETTING_ID
 */
-public class SettingID
+public final class SettingID
 {
 	public static final int CAMERA_ZOOM = 14;

--- a/runelite-api/src/main/java/net/runelite/api/SpriteID.java
+++ b/runelite-api/src/main/java/net/runelite/api/SpriteID.java
@@ -1209,17 +1209,52 @@ public final class SpriteID
 	public static final int KOUREND_FAVOUR_LOVAKENGJ_ICON = 1244;
 	public static final int KOUREND_FAVOUR_PISCARILIUS_ICON = 1245;
 	public static final int KOUREND_FAVOUR_SHAYZIEN_ICON = 1246;
-	/* Unmapped: 1247~1296 */
+	public static final int SPELL_BASIC_REANIMATION = 1247;
+	public static final int SPELL_ADEPT_REANIMATION = 1248;
+	public static final int SPELL_EXPERT_REANIMATION = 1249;
+	public static final int SPELL_MASTER_REANIMATION = 1250;
+	/* Unmapped: 1251 */
+	public static final int SPELL_ARCEUUS_LIBRARY_TELEPORT = 1252;
+	public static final int SPELL_DRAYNOR_MANOR_TELEPORT = 1253;
+	public static final int SPELL_SALVE_GRAVEYARD_TELEPORT = 1254;
+	/* Unmapped: 1255 */
+	public static final int SPELL_MIND_ALTAR_TELEPORT = 1256;
+	public static final int SPELL_RESPAWN_TELEPORT = 1257;
+	/* Unmapped 1258 */
+	public static final int SPELL_FENKENSTRAINS_CASTLE_TELEPORT = 1259;
+	public static final int SPELL_WEST_ARDOUGNE_TELEPORT = 1260;
+	public static final int SPELL_HARMONY_ISLAND_TELEPORT = 1261;
+	public static final int SPELL_BARROWS_TELEPORT = 1262;
+	public static final int SPELL_APE_ATOLL_TELEPORT = 1263;
+	public static final int SPELL_CEMETERY_TELEPORT = 1264;
+	/* Unmapped: 1265 */
+	public static final int SPELL_RESURRECT_CROPS = 1266;
+	public static final int SPELL_GHOSTLY_GRASP = 1267;
+	public static final int SPELL_SKELETAL_GRASP = 1268;
+	public static final int SPELL_UNDEAD_GRASP = 1269;
+	public static final int SPELL_RESURRECT_LESSER_GHOST = 1270;
+	/* Unmapped: 1271~1296 */
 	public static final int QUESTS_PAGE_ICON_PURPLE_KOUREND = 1297;
 	public static final int UNUSED_TAB_QUESTS_GREEN_ACHIEVEMENT_DIARIES = 1298;
 	public static final int TAB_QUESTS_GREEN_ACHIEVEMENT_DIARIES = 1299;
-	/* Unmapped: 1300~1305 */
+	/* Unmapped: 1300~1301 */
+	public static final int SPELL_INFERIOR_DEMONBANE = 1302;
+	public static final int SPELL_SUPERIOR_DEMONBANE = 1303;
+	public static final int SPELL_DARK_DEMONBANE = 1304;
+	public static final int SPELL_MARK_OF_DARKNESS = 1305;
 	public static final int SPELL_WARD_OF_ARCEUUS = 1306;
-	/* Unmapped: 1307~1309 */
+	public static final int SPELL_LESSER_CORRUPTION = 1307;
+	public static final int SPELL_GREATER_CORRUPTION = 1308;
+	/* Unmapped: 1309 */
 	public static final int SPELL_DEATH_CHARGE = 1310;
-	/* Unmapped: 1311~1314 */
+	public static final int SPELL_DEMONIC_OFFERING = 1311;
+	public static final int SPELL_SINISTER_OFFERING = 1312;
+	/* Unmapped: 1313~1314 */
 	public static final int SPELL_SHADOW_VEIL = 1315;
-	/* Unmapped: 1316~1324 */
+	public static final int SPELL_DARK_LURE = 1316;
+	public static final int SPELL_VILE_VIGOUR = 1317;
+	public static final int SPELL_DEGRIME = 1318;
+	/* Unmapped: 1319~1324 */
 	public static final int SPELL_WARD_OF_ARCEUUS_DISABLED = 1325;
 	/* Unmapped: 1326 */
 	public static final int SPELL_GREATER_CORRUPTION_DISABLED = 1327;
@@ -1620,6 +1655,8 @@ public final class SpriteID
 	public static final int HEALTHBAR_YELLOW_BACK_70PX = 2978;
 	/* Unmapped: 2979, 2980 */
 	public static final int SPELL_RESURRECT_SUPERIOR_SKELETON = 2981;
-	/* Unmapped: 2982~2986 */
+	/* Unmapped: 2982~2983 */
+	public static final int SPELL_RESURRECT_GREATER_ZOMBIE = 2984;
+	/* Unmapped: 2985~2986 */
 	public static final int SPELL_RESURRECT_SUPERIOR_SKELETON_DISABLED = 2987;
 }
--- a/runelite-api/src/main/java/net/runelite/api/StructID.java
+++ b/runelite-api/src/main/java/net/runelite/api/StructID.java
@@ -29,7 +29,7 @@ package net.runelite.api;
 * @see StructComposition
 * @see Client#getStructComposition(int)
 */
-public class StructID
+public final class StructID
 {
 	public static final int SETTINGS_MUSIC_VOLUME = 2753;
 	public static final int SETTINGS_EFFECT_VOLUME = 2754;
--- a/runelite-api/src/main/java/net/runelite/api/clan/ClanID.java
+++ b/runelite-api/src/main/java/net/runelite/api/clan/ClanID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 William <https://github.com/monsterxsync>
+ * Copyright (c) 2021, Adam <Adam@sigterm.info>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -22,24 +22,16 @@
 * (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;
+package net.runelite.api.clan;

-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-/**
- * An enumeration of Kourend house favour the player can earn.
- */
-@RequiredArgsConstructor
-@Getter
-public enum Favour
+public final class ClanID
 {
-	ARCEUUS("Arceuus", Varbits.KOUREND_FAVOR_ARCEUUS),
-	HOSIDIUS("Hosidius", Varbits.KOUREND_FAVOR_HOSIDIUS),
-	LOVAKENGJ("Lovakengj", Varbits.KOUREND_FAVOR_LOVAKENGJ),
-	PISCARILIUS("Piscarilius", Varbits.KOUREND_FAVOR_PISCARILIUS),
-	SHAYZIEN("Shayzien", Varbits.KOUREND_FAVOR_SHAYZIEN);
-
-	private final String name;
-	private final Varbits varbit;
+	/**
+	 * The primary clan.
+	 */
+	public static final int CLAN = 0;
+	/**
+	 * The group ironman clan.
+	 */
+	public static final int GROUP_IRONMAN = 1;
 }