Merge branch '220-1.10.25.1'

cache/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.24</version>
+		<version>1.10.25.1</version>
 	</parent>
 
 	<artifactId>cache</artifactId>

cache/src/test/java/net/runelite/cache/StoreLocation.java

@@ -57,7 +57,7 @@ public class StoreLocation
 		}
 		catch (IOException ex)
 		{
-			logger.warn("unable to initialize cache tmp area", ex);
+			throw new RuntimeException(ex);
 		}
 	}
 
@@ -71,23 +71,31 @@ private static File setupCacheDir() throws IOException
 			return file;
 		}
 
-		file.mkdir();
+		try
+		{
+			file.mkdir();
 
-		// Copy over files
-		InputStream in = StoreLocation.class.getResourceAsStream("/main_file_cache.dat2");
-		Files.copy(in, new File(file, "main_file_cache.dat2").toPath());
+			// Copy over files
+			InputStream in = StoreLocation.class.getResourceAsStream("/main_file_cache.dat2");
+			Files.copy(in, new File(file, "main_file_cache.dat2").toPath());
 
-		in = StoreLocation.class.getResourceAsStream("/main_file_cache.idx255");
-		Files.copy(in, new File(file, "main_file_cache.idx255").toPath());
+			in = StoreLocation.class.getResourceAsStream("/main_file_cache.idx255");
+			Files.copy(in, new File(file, "main_file_cache.idx255").toPath());
 
-		for (int i = 0; i <= NUM_INDEXES; ++i)
+			for (int i = 0; i <= NUM_INDEXES; ++i)
+			{
+				in = StoreLocation.class.getResourceAsStream("/main_file_cache.idx" + i);
+				Files.copy(in, new File(file, "main_file_cache.idx" + i).toPath());
+			}
+
+			logger.info("Set up cache working directory to {}", file);
+		}
+		catch (Exception ex)
 		{
-			in = StoreLocation.class.getResourceAsStream("/main_file_cache.idx" + i);
-			Files.copy(in, new File(file, "main_file_cache.idx" + i).toPath());
+			file.delete();
+			throw ex;
 		}
 
-		logger.info("Set up cache working directory to {}", file);
-
 		return file;
 	}
 

pom.xml

@@ -28,7 +28,7 @@
 
 	<groupId>net.runelite</groupId>
 	<artifactId>runelite-parent</artifactId>
-	<version>1.10.24</version>
+	<version>1.10.25.1</version>
 	<packaging>pom</packaging>
 
 	<name>RuneLite</name>
@@ -65,7 +65,7 @@
 		<url>https://github.com/runelite/runelite</url>
 		<connection>scm:git:git://github.com/runelite/runelite</connection>
 		<developerConnection>scm:git:[email protected]:runelite/runelite</developerConnection>
-		<tag>runelite-parent-1.10.24</tag>
+		<tag>runelite-parent-1.10.25.1</tag>
 	</scm>
 
 	<developers>

runelite-api/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.24</version>
+		<version>1.10.25.1</version>
 	</parent>
 
 	<artifactId>runelite-api</artifactId>

runelite-api/src/main/interfaces/interfaces.toml

@@ -67,15 +67,15 @@ deposit_equipment=44
 incinerator=46
 incinerator_confirm=47
 equipment_content_container=69
-settings_button=113
-equipment_button=114
-popup=116
+settings_button=114
+equipment_button=115
+popup=117
 
 [bank_equipment]
 id=12
 parent=69
-set_bonus=109
-stat_bonus=121
+set_bonus=110
+stat_bonus=122
 
 [bank_inventory]
 id=15
@@ -299,8 +299,8 @@ inventory_item_container=0
 [equipment_bonuses]
 id=84
 parent=1
-set_bonus=43
-stat_bonus=48
+set_bonus=44
+stat_bonus=49
 
 [equipment_inventory]
 id=85
@@ -365,6 +365,9 @@ bank_container=78
 interface_container=79
 inventory_container=83
 
+[fortis_colosseum_reward]
+id=864
+
 [fossil_island_oxygen_bar]
 id=609
 bar=1
@@ -526,6 +529,9 @@ logout_button=6
 id=81
 looting_bag_inventory=5
 
+[lunar_chest]
+id=868
+
 [minigames]
 id=160
 teleport_button=30
@@ -551,6 +557,10 @@ worldmap_options=53
 id=382
 container=0
 
+[moons_of_peril]
+id=869
+layer=2
+
 [mortton_temple]
 id=171
 status=2
@@ -792,11 +802,11 @@ inventory_item_container=0
 id=218
 kourend_home_teleport=4
 catherby_home_teleport=5
-lumbridge_home_teleport=6
-edgeville_home_teleport=100
-lunar_home_teleport=101
-arceuus_home_teleport=145
-fertile_soil=126
+lumbridge_home_teleport=7
+edgeville_home_teleport=103
+lunar_home_teleport=104
+arceuus_home_teleport=148
+fertile_soil=129
 
 [tempoross]
 id=437

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

@@ -78,4 +78,10 @@ public final class EnumID
 	 * val: struct slayer task
 	 */
 	public static final int SLAYER_TASK = 5008;
+
+	/**
+	 * key: weapon type
+	 * val: enum
+	 */
+	public static final int WEAPON_STYLES = 3908;
 }

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

@@ -32,16 +32,19 @@
 import static net.runelite.api.HitsplatID.DAMAGE_MAX_ME_ORANGE;
 import static net.runelite.api.HitsplatID.DAMAGE_MAX_ME_WHITE;
 import static net.runelite.api.HitsplatID.DAMAGE_MAX_ME_YELLOW;
+import static net.runelite.api.HitsplatID.DAMAGE_MAX_ME_POISE;
 import static net.runelite.api.HitsplatID.DAMAGE_ME;
 import static net.runelite.api.HitsplatID.DAMAGE_ME_CYAN;
 import static net.runelite.api.HitsplatID.DAMAGE_ME_ORANGE;
 import static net.runelite.api.HitsplatID.DAMAGE_ME_WHITE;
 import static net.runelite.api.HitsplatID.DAMAGE_ME_YELLOW;
+import static net.runelite.api.HitsplatID.DAMAGE_ME_POISE;
 import static net.runelite.api.HitsplatID.DAMAGE_OTHER;
 import static net.runelite.api.HitsplatID.DAMAGE_OTHER_CYAN;
 import static net.runelite.api.HitsplatID.DAMAGE_OTHER_ORANGE;
 import static net.runelite.api.HitsplatID.DAMAGE_OTHER_WHITE;
 import static net.runelite.api.HitsplatID.DAMAGE_OTHER_YELLOW;
+import static net.runelite.api.HitsplatID.DAMAGE_OTHER_POISE;
 import net.runelite.api.annotations.HitsplatType;
 
 /**
@@ -85,11 +88,13 @@ public boolean isMine()
 			case DAMAGE_ME_YELLOW:
 			case DAMAGE_ME_ORANGE:
 			case DAMAGE_ME_WHITE:
+			case DAMAGE_ME_POISE:
 			case DAMAGE_MAX_ME:
 			case DAMAGE_MAX_ME_CYAN:
 			case DAMAGE_MAX_ME_ORANGE:
 			case DAMAGE_MAX_ME_YELLOW:
 			case DAMAGE_MAX_ME_WHITE:
+			case DAMAGE_MAX_ME_POISE:
 				return true;
 			default:
 				return false;
@@ -106,6 +111,7 @@ public boolean isOthers()
 			case DAMAGE_OTHER_YELLOW:
 			case DAMAGE_OTHER_ORANGE:
 			case DAMAGE_OTHER_WHITE:
+			case DAMAGE_OTHER_POISE:
 				return true;
 			default:
 				return false;

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

@@ -30,10 +30,12 @@ public final class HitsplatID
 	public static final int BLOCK_OTHER = 13;
 	public static final int DAMAGE_ME = 16;
 	public static final int DAMAGE_OTHER = 17;
-	public static final int POISON = 2;
+	public static final int POISON = 65;
 	public static final int DISEASE = 4;
 	public static final int VENOM = 5;
 	public static final int HEAL = 6;
+	public static final int CYAN_UP = 11;
+	public static final int CYAN_DOWN = 15;
 	public static final int DAMAGE_ME_CYAN = 18;
 	public static final int DAMAGE_OTHER_CYAN = 19;
 	public static final int DAMAGE_ME_ORANGE = 20;
@@ -47,4 +49,12 @@ public final class HitsplatID
 	public static final int DAMAGE_MAX_ME_ORANGE = 45;
 	public static final int DAMAGE_MAX_ME_YELLOW = 46;
 	public static final int DAMAGE_MAX_ME_WHITE = 47;
+	public static final int DAMAGE_ME_POISE = 53;
+	public static final int DAMAGE_OTHER_POISE = 54;
+	public static final int DAMAGE_MAX_ME_POISE = 55;
+	public static final int CORRUPTION = 0;
+	public static final int PRAYER_DRAIN = 60;
+	public static final int BLEED = 67;
+	public static final int SANITY_DRAIN = 71;
+	public static final int SANITY_RESTORE = 72;
 }

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

@@ -100,7 +100,15 @@ public enum InventoryID
 	/**
 	 * TOA reward chest
 	 */
-	TOA_REWARD_CHEST(811);
+	TOA_REWARD_CHEST(811),
+	/**
+	 * Reward chest for Moons of Peril
+	 */
+	LUNAR_CHEST(847),
+	/**
+	 * Reward chest for the Fortis Colosseum
+	 */
+	FORTIS_COLOSSEUM_REWARD_CHEST(843);
 
 	private final int id;