Skip to content

runelite merge 1.2.24 #1694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chsami merged 13 commits into from
Mar 12, 2026
Merged

runelite merge 1.2.24 #1694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c7ebe1f
interfacestyles: add glow icons for 2010 gameframe (#19940)
raiyni Mar 8, 2026
3d62ae0
Update Widget IDs to 2026-3-11
Mar 10, 2026
d709063
Update Legacy ID classes to 2026-3-11
Mar 10, 2026
7e55d38
Update GameVals to 2026-3-11
Mar 10, 2026
738da3f
Release 1.12.20
Mar 11, 2026
3437a79
Bump for 1.12.21-SNAPSHOT
Mar 11, 2026
7c5f13c
worldmap: fix Heroes' Guild East mining locations
pillowfication Mar 11, 2026
0175371
client: fix builds on JDK17+
Nightfirecat Mar 11, 2026
69bc89c
gpu: regions: add additional random event areas
cdfisher Apr 7, 2025
e616557
gpu: regions: add various quest areas
cdfisher Apr 7, 2025
cbb6aba
gpu: regions: add various locations
cdfisher Apr 7, 2025
152b0d8
Merge branch 'runelite/master' into development
chsami Mar 12, 2026
75f1e45
build(gradle): update microbot version to 2.1.24
chsami Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ org.gradle.parallel=true
org.gradle.caching=false

project.build.group=net.runelite
project.build.version=1.12.19
project.build.version=1.12.20

glslang.path=
microbot.version=2.1.23
microbot.version=2.1.24
microbot.commit.sha=nogit
microbot.repo.url=http://138.201.81.246:8081/repository/microbot-snapshot/
microbot.repo.username=
Expand Down
8 changes: 4 additions & 4 deletions runelite-api/src/main/interfaces/interfaces.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,10 +824,10 @@ parent=0
kourend_home_teleport=4
catherby_home_teleport=5
lumbridge_home_teleport=7
edgeville_home_teleport=105
lunar_home_teleport=106
arceuus_home_teleport=150
fertile_soil=131
edgeville_home_teleport=106
lunar_home_teleport=107
arceuus_home_teleport=151
fertile_soil=132

[tempoross]
id=437
Expand Down
1 change: 1 addition & 0 deletions runelite-api/src/main/java/net/runelite/api/NullItemID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16663,5 +16663,6 @@ public final class NullItemID
public static final int NULL_33131 = 33131;
public static final int NULL_33134 = 33134;
public static final int NULL_33136 = 33136;
public static final int NULL_33138 = 33138;
/* This file is automatically generated. Do not edit. */
}
54 changes: 54 additions & 0 deletions runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19934,6 +19934,60 @@ public static final class Row
public static final int SKILL_FEATURE_WOODCUTTING_ARCTIC_PINE_SPLIT = 13269;
public static final int SKILL_FEATURE_WOODCUTTING_WAKA_CANOE = 13270;
public static final int SKILL_FEATURE_WOODCUTTING_SKILLCAPE = 13271;
public static final int SKILL_FEATURE_MAGIC_STANDARD_MINIGAME_TELEPORT = 13293;
public static final int SKILL_FEATURE_MAGIC_ANCIENT_MINIGAME_TELEPORT = 13294;
public static final int SKILL_FEATURE_MAGIC_LUNAR_MINIGAME_TELEPORT = 13295;
public static final int SKILL_FEATURE_MAGIC_ARCEUUS_MINIGAME_TELEPORT = 13296;
}
}

public static final class MinigameTeleport
{
public static final int ID = 214;

/**
* integer
*/
public static final int COL_ID = 0;

/**
* string
*/
public static final int COL_NAME = 1;

/**
* boolean
*/
public static final int COL_MEMBERS_ONLY = 2;

/**
* graphic
*/
public static final int COL_MINIGAME_ICON = 3;

public static final class Row
{
public static final int MINIGAME_BARBARIAN_ASSAULT = 13272;
public static final int MINIGAME_BLAST_FURNACE = 13273;
public static final int MINIGAME_BURTHORPE_GAMES_ROOM = 13274;
public static final int MINIGAME_BOUNTY_HUNTER = 13275;
public static final int MINIGAME_CASTLE_WARS = 13276;
public static final int MINIGAME_CLAN_WARS = 13277;
public static final int MINIGAME_FISHING_TRAWLER = 13278;
public static final int MINIGAME_GIANTS_FOUNDRY = 13279;
public static final int MINIGAME_GUARDIANS_OF_THE_RIFT = 13280;
public static final int MINIGAME_LAST_MAN_STANDING = 13281;
public static final int MINIGAME_MAGE_TRAINING_ARENA = 13282;
public static final int MINIGAME_MASTERING_MIXOLOGY = 13283;
public static final int MINIGAME_NIGHTMARE_ZONE = 13284;
public static final int MINIGAME_PEST_CONTROL = 13285;
public static final int MINIGAME_RAT_PITS = 13286;
public static final int MINIGAME_SHADES_OF_MORTTON = 13287;
public static final int MINIGAME_SORCERESSS_GARDEN = 13288;
public static final int MINIGAME_SOUL_WARS = 13289;
public static final int MINIGAME_TITHE_FARM = 13290;
public static final int MINIGAME_TROUBLE_BREWING = 13291;
public static final int MINIGAME_TZHAAR_FIGHT_PIT = 13292;
}
}
/* This file is automatically generated. Do not edit. */
Expand Down
429 changes: 231 additions & 198 deletions runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions runelite-api/src/main/java/net/runelite/api/gameval/InventoryID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,5 +1010,6 @@ public final class InventoryID
public static final int RAZMIREBUILDINGSTORE_IRON = 1003;
public static final int RAZMIREBUILDINGSTORE_UIM = 1004;
public static final int RAZMIREBUILDINGSTORE_GIM = 1005;
public static final int ITEMGRANT_NOTRACKING = 1006;
/* This file is automatically generated. Do not edit. */
}
1 change: 1 addition & 0 deletions runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86794,6 +86794,7 @@ public final class ItemID
* Open silklined herb sack
*/
public static final int SLAYER_HERB_SACK_SILK_OPEN = 33137;
public static final int MINIGAME_TELEPORT = 33138;

public static final class Cert
{
Expand Down
78 changes: 78 additions & 0 deletions runelite-api/src/main/java/net/runelite/api/gameval/SpriteID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1826,6 +1826,31 @@ public static final class Magicon2
public static final int _47 = 366;
public static final int _48 = 367;
public static final int _49 = 368;
public static final int _50 = 7479;
public static final int _51 = 7480;
public static final int _52 = 7481;
public static final int _53 = 7482;
public static final int _54 = 7483;
public static final int _55 = 7484;
public static final int _56 = 7485;
public static final int _57 = 7486;
public static final int _58 = 7487;
public static final int _59 = 7488;
public static final int _60 = 7489;
public static final int _61 = 7490;
public static final int _62 = 7491;
public static final int _63 = 7492;
public static final int _64 = 7493;
public static final int _65 = 7494;
public static final int _66 = 7495;
public static final int _67 = 7496;
public static final int _68 = 7497;
public static final int _69 = 7498;
public static final int _70 = 7499;
public static final int _71 = 7500;
public static final int _72 = 7501;
public static final int _73 = 7502;
public static final int _74 = 7503;

public static final int BIND = _0;
public static final int SNARE = _1;
Expand Down Expand Up @@ -1929,6 +1954,31 @@ public static final class Magicoff2
public static final int _47 = 416;
public static final int _48 = 417;
public static final int _49 = 418;
public static final int _50 = 7504;
public static final int _51 = 7505;
public static final int _52 = 7506;
public static final int _53 = 7507;
public static final int _54 = 7508;
public static final int _55 = 7509;
public static final int _56 = 7510;
public static final int _57 = 7511;
public static final int _58 = 7512;
public static final int _59 = 7513;
public static final int _60 = 7514;
public static final int _61 = 7515;
public static final int _62 = 7516;
public static final int _63 = 7517;
public static final int _64 = 7518;
public static final int _65 = 7519;
public static final int _66 = 7520;
public static final int _67 = 7521;
public static final int _68 = 7522;
public static final int _69 = 7523;
public static final int _70 = 7524;
public static final int _71 = 7525;
public static final int _72 = 7526;
public static final int _73 = 7527;
public static final int _74 = 7528;

public static final int BIND = _0;
public static final int SNARE = _1;
Expand Down Expand Up @@ -11065,4 +11115,32 @@ public static final class StatSilhouette
public static final int _22 = 7453;
public static final int _23 = 7454;
}

public static final class IconMinigames64x64
{
public static final int _0 = 7455;
public static final int _1 = 7456;
public static final int _2 = 7457;
public static final int _3 = 7458;
public static final int _4 = 7459;
public static final int _5 = 7460;
public static final int _6 = 7461;
public static final int _7 = 7462;
public static final int _8 = 7463;
public static final int _9 = 7464;
public static final int _10 = 7465;
public static final int _11 = 7466;
public static final int _12 = 7467;
public static final int _13 = 7468;
public static final int _14 = 7469;
public static final int _15 = 7470;
public static final int _16 = 7471;
public static final int _17 = 7472;
public static final int _18 = 7473;
public static final int _19 = 7474;
public static final int _20 = 7475;
public static final int _21 = 7476;
public static final int _22 = 7477;
public static final int _23 = 7478;
}
}
2 changes: 2 additions & 0 deletions runelite-api/src/main/java/net/runelite/api/gameval/VarPlayerID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public final class VarPlayerID
public static final int SHEEP = 179;
public static final int FLUFFS = 180;
public static final int HEROQUEST = 188;
public static final int PRAYGUILD = 190;
public static final int MURDERQUEST = 192;
public static final int MURDERSUS = 195;
public static final int DESERTRESCUE = 197;
Expand Down Expand Up @@ -299,6 +300,7 @@ public final class VarPlayerID
public static final int CHAMPIONS_DEFEATED = 617;
public static final int DEVIOUS_BASE = 622;
public static final int WIN05_VAR = 623;
public static final int MAGICTRAINING5 = 628;
public static final int MAGICTRAINING6 = 629;
public static final int HANDSAND = 635;
public static final int HANDSAND_TRANSMIT = 636;
Expand Down
17 changes: 17 additions & 0 deletions runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,11 @@ public final class VarbitID
public static final int WIN05_DECO_COUNT_PINK = 1482;
public static final int WIN05_DECO_SHAPE = 1483;
public static final int DEADMAN_TOURNAMENT_FINALAREA = 1497;
public static final int MAGICTRAINING_TELE_POINTS_OLD = 1498;
public static final int MAGICTRAINING_ENTRA_NOOB = 1499;
public static final int MAGICTRAINING_GRAVE_BONE1COUNT = 1500;
public static final int MAGICTRAINING_GRAVE_BONE2COUNT = 1501;
public static final int MAGICTRAINING_GRAVE_BONE3COUNT = 1502;
public static final int MAGICTRAINING_ENCHAN_ORBTOTAL = 1503;
public static final int MAGICTRAINING_ALCHEM_COINREWARD = 1504;
public static final int MAGICTRAINING_BONESPEACHES = 1505;
Expand Down Expand Up @@ -3186,6 +3191,7 @@ public final class VarbitID
public static final int POH_MENAGERIE_SMOKEPET = 4366;
public static final int POH_MENAGERIE_KRAKENPET = 4367;
public static final int DAN_RAGS_THE_RAGGERS_OH_DAN = 4370;
public static final int OPTION_LEVEL_UP_POPUP_LIST = 4371;
public static final int TRADE_THIS_PLAYER_REMOVED = 4374;
public static final int TRADE_OTHER_PLAYER_REMOVED = 4375;
public static final int TRADINGPOST_TOGGLES = 4378;
Expand Down Expand Up @@ -3514,6 +3520,17 @@ public final class VarbitID
public static final int PISCARILIUS_BURGLARY_TARGET = 4903;
public static final int SHAYZIEN_ARMOUR_CHALLENGE = 4904;
public static final int PISCARILIUS_BURGLARY_COMPLETED = 4905;
public static final int MONASTERY_ENTER = 4907;
public static final int ZEAH_WATERINGCAN_CHARGES = 4908;
public static final int ZEAH_TITHE_MINIGAME_UNLOCKED = 4909;
public static final int ZEAH_BLOOD_ALTAR_UNLOCKED = 4910;
public static final int ZEAH_SOUL_ALTAR_UNLOCKED = 4911;
public static final int ZEAH_LIBRARY_FETCHBOOK = 4912;
public static final int ZEAH_LIBRARY_BOOKHUNTER = 4913;
public static final int ZEAH_LIBRARY_SHUFFLEMANUSCRIPT = 4914;
public static final int ZEAH_LIBRARY_METMANUSCRIPTSEEKER = 4915;
public static final int ZEAH_TELEPORT_UNLOCKED = 4916;
public static final int ZEAH_SHAYZIEN_METCRIMEFIGHTER = 4917;
public static final int RC_NO_TALLY_REQUIRED_SOUL_UNUSED = 4918;
public static final int RC_NO_TALLY_REQUIRED_BLOOD_UNUSED = 4919;
public static final int MILL_FLOUR = 4920;
Expand Down
2 changes: 1 addition & 1 deletion runelite-client/src/main/java/net/runelite/client/account/SessionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ private void startServer() throws IOException
server = HttpServer.create(new InetSocketAddress("localhost", 0), 1);
server.createContext("/oauth", req ->
{
try
try // NOPMD: UseTryWithResources: false positive
{
final HttpUrl url = HttpUrl.get("http://localhost" + req.getRequestURI());
final String username = url.queryParameter("username");
Expand Down
22 changes: 22 additions & 0 deletions ...lite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,28 @@ enum SpriteOverride
SKILL_HUNTER(SpriteID.Staticons2.HUNTER, AROUND_2010),
SKILL_CONSTRUCTION(SpriteID.Staticons2.CONSTRUCTION, AROUND_2010),

GLOW_ATTACK(SpriteID.StatSilhouette._0, AROUND_2010),
GLOW_STRENGTH(SpriteID.StatSilhouette._1, AROUND_2010),
GLOW_DEFENCE(SpriteID.StatSilhouette._2, AROUND_2010),
GLOW_RANGED(SpriteID.StatSilhouette._3, AROUND_2010),
GLOW_MAGIC(SpriteID.StatSilhouette._5, AROUND_2010),
GLOW_HITPOINTS(SpriteID.StatSilhouette._6, AROUND_2010),
GLOW_AGILITY(SpriteID.StatSilhouette._7, AROUND_2010),
GLOW_HERBLORE(SpriteID.StatSilhouette._8, AROUND_2010),
GLOW_THIEVING(SpriteID.StatSilhouette._9, AROUND_2010),
GLOW_CRAFTING(SpriteID.StatSilhouette._10, AROUND_2010),
GLOW_FLETCHING(SpriteID.StatSilhouette._11, AROUND_2010),
GLOW_MINING(SpriteID.StatSilhouette._12, AROUND_2010),
GLOW_SMITHING(SpriteID.StatSilhouette._13, AROUND_2010),
GLOW_FISHING(SpriteID.StatSilhouette._14, AROUND_2010),
GLOW_COOKING(SpriteID.StatSilhouette._15, AROUND_2010),
GLOW_FIREMAKING(SpriteID.StatSilhouette._16, AROUND_2010),
GLOW_WOODCUTTING(SpriteID.StatSilhouette._17, AROUND_2010),
GLOW_RUNECRAFT(SpriteID.StatSilhouette._18, AROUND_2010),
GLOW_SLAYER(SpriteID.StatSilhouette._19, AROUND_2010),
GLOW_HUNTER(SpriteID.StatSilhouette._22, AROUND_2010),
GLOW_CONSTRUCTION(SpriteID.StatSilhouette._21, AROUND_2010),

COMPASS(SpriteID.COMPASS, AROUND_2005),
WINDOW_CLOSE_BUTTON_RED_X(SpriteID.CloseButtons.RED_X, AROUND_2010),
WINDOW_CLOSE_BUTTON_RED_X_HOVERED(SpriteID.CloseButtons.RED_X_HOVERED, AROUND_2010),
Expand Down
4 changes: 2 additions & 2 deletions runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ enum MiningSiteLocation
GRIMSTONE_SOUTH(new WorldPoint(2909, 4062, 0), new Rock(2, Ore.COAL), new Rock(4, Ore.NICKEL)),
GWENITH(new WorldPoint(2163, 3415, 0), new Rock(10, Ore.GOLD)),
GWENITH_PRIFDDINAS_MAP(new WorldPoint(3187, 6167, 0), new Rock(10, Ore.GOLD)),
HEROES_GUILD_EAST_BOTTOM(new WorldPoint(2939, 9898, 0), new Rock(3, Ore.COAL), new Rock(2, Ore.RUNITE)),
HEROES_GUILD_EAST_TOP(new WorldPoint(2940, 9884, 0), new Rock(5, Ore.COAL)),
HEROES_GUILD_EAST_BOTTOM(new WorldPoint(2940, 9884, 0), new Rock(3, Ore.COAL), new Rock(2, Ore.RUNITE)),
HEROES_GUILD_EAST_TOP(new WorldPoint(2939, 9898, 0), new Rock(5, Ore.COAL)),
HEROES_GUILD_WEST_BOTTOM(new WorldPoint(2921, 9904, 0), new Rock(3, Ore.COAL)),
HEROES_GUILD_WEST_TOP(new WorldPoint(2914, 9916, 0), new Rock(2, Ore.MITHRIL), new Rock(2, Ore.ADAMANTITE)),
HOSIDIUS_MINE(new WorldPoint(1777, 3489, 0),
Expand Down
2 changes: 1 addition & 1 deletion runelite-client/src/main/java/net/runelite/client/util/RuntimeTypeAdapterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
* Both the type field name ({@code "type"}) and the type labels ({@code
* "Rectangle"}) are configurable.
*
* <h3>Registering Types</h3>
* <h2>Registering Types</h2>
* Create a {@code RuntimeTypeAdapterFactory} by passing the base type and type field
* name to the {@link #of} factory method. If you don't supply an explicit type
* field name, {@code "type"} will be used. <pre> {@code
Expand Down
Loading
Loading