diff --git a/cache/pom.xml b/cache/pom.xml
index 2d092c44aef..e0a9693db1f 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.12.6
+ 1.12.7
cache
diff --git a/pom.xml b/pom.xml
index 2292e4d53bc..4faca1a8dd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
net.runelite
runelite-parent
- 1.12.6
+ 1.12.7
pom
RuneLite
diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
index a07ff252b95..afcadf71246 100644
--- a/runelite-api/pom.xml
+++ b/runelite-api/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.12.6
+ 1.12.7
runelite-api
diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java
index fec6004142b..1fc458cf93a 100644
--- a/runelite-api/src/main/java/net/runelite/api/ItemID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java
@@ -15116,17 +15116,17 @@ public final class ItemID
public static final int FETID_KEY = 31744;
public static final int CAPTURED_WIND_MOTE = 31745;
public static final int GURTOBS_FABRIC_ROLL = 31746;
- public static final int NIFTY_HAT = 31748;
- public static final int NIFTY_JACKET = 31750;
- public static final int NIFTY_TROUSERS = 31752;
- public static final int NIFTY_SHOES = 31754;
+ public static final int SWAMP_CRUISERS_HAT = 31748;
+ public static final int SWAMP_CRUISERS_JACKET = 31750;
+ public static final int SWAMP_CRUISERS_TROUSERS = 31752;
+ public static final int SWAMP_CRUISERS_SHOES = 31754;
public static final int SERRATED_KEY = 31756;
public static final int HEART_OF_ITHELL = 31757;
public static final int GWYNAS_FABRIC_ROLL = 31758;
- public static final int SLEEK_HAT = 31760;
- public static final int SLEEK_JACKET = 31762;
- public static final int SLEEK_TROUSERS = 31764;
- public static final int SLEEK_SHOES = 31766;
+ public static final int CRYSTAL_GLIDERS_HAT = 31760;
+ public static final int CRYSTAL_GLIDERS_JACKET = 31762;
+ public static final int CRYSTAL_GLIDERS_TROUSERS = 31764;
+ public static final int CRYSTAL_GLIDERS_SHOES = 31766;
public static final int SUNKEN_RUM = 31768;
public static final int TINY_PEARL = 31770;
public static final int SMALL_PEARL = 31773;
@@ -15352,8 +15352,8 @@ public final class ItemID
public static final int TEAK_MAST_AND_LINEN_SAILS = 32167;
public static final int TEAK_MAST_AND_LINEN_SAILS_32168 = 32168;
public static final int MAHOGANY_MAST_AND_CANVAS_SAILS = 32169;
- public static final int MAHOGANY_MAST_AND_LINEN_SAILS = 32170;
- public static final int MAHOGANY_MAST_AND_LINEN_SAILS_32171 = 32171;
+ public static final int MAHOGANY_MAST_AND_CANVAS_SAILS_32170 = 32170;
+ public static final int MAHOGANY_MAST_AND_CANVAS_SAILS_32171 = 32171;
public static final int CAMPHOR_MAST_AND_CANVAS_SAILS = 32172;
public static final int CAMPHOR_MAST_AND_LINEN_SAILS = 32173;
public static final int CAMPHOR_MAST_AND_LINEN_SAILS_32174 = 32174;
@@ -16018,5 +16018,8 @@ public final class ItemID
public static final int IRONWOOD_LOGS = 32907;
public static final int ROSEWOOD_LOGS = 32910;
public static final int JAR_OF_FEATHERS = 32921;
+ public static final int STEEL_NAILS_32923 = 32923;
+ public static final int CRATE_OF_ARROWTIPS_32924 = 32924;
+ public static final int CRATE_OF_CLOTHES_32925 = 32925;
/* This file is automatically generated. Do not edit. */
}
\ No newline at end of file
diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java
index cc2c7944ccf..552c945410e 100644
--- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java
@@ -30266,6 +30266,7 @@ public final class NullObjectID
public static final int NULL_58523 = 58523;
public static final int NULL_58524 = 58524;
public static final int NULL_58526 = 58526;
+ public static final int NULL_58527 = 58527;
public static final int NULL_58528 = 58528;
public static final int NULL_58529 = 58529;
public static final int NULL_58530 = 58530;
diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java
index 9814fbcbeba..ba1734f4b2e 100644
--- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java
@@ -28508,6 +28508,7 @@ public final class ObjectID
public static final int ROCKS_58922 = 58922;
public static final int NICKEL_ROCKS = 58923;
public static final int ROCKS_58924 = 58924;
+ public static final int CABINET_58925 = 58925;
public static final int SCOREBOARD_58926 = 58926;
public static final int SCOREBOARD_58927 = 58927;
public static final int SCOREBOARD_58928 = 58928;
@@ -28717,6 +28718,7 @@ public final class ObjectID
public static final int SAILS_59549 = 59549;
public static final int SAILS_59550 = 59550;
public static final int SAILS_59551 = 59551;
+ public static final int CREVICE_59552 = 59552;
public static final int SAILS_59553 = 59553;
public static final int HELM = 59555;
public static final int HELM_59556 = 59556;
diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java b/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java
index 747de726020..68799bcb63b 100644
--- a/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java
+++ b/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java
@@ -1957,9 +1957,9 @@ public static final class Row
public static final int CLUEHELPER_HOTCOLD_MASTER_VARLAMORE_SUNSET = 3488;
public static final int CLUEHELPER_HOTCOLD_MASTER_VARLAMORE_BAZAAR = 3489;
public static final int CLUEHELPER_HOTCOLD_MASTER_VARLAMORE_ALDARIN_THEATRE = 3689;
+ public static final int CLUEHELPER_HOTCOLD_MASTER_SAIL_BUCCANEERS_HAVEN = 4963;
public static final int CLUEHELPER_HOTCOLD_MASTER_VARLAMORE_RAINFOREST_CENTRE = 5182;
public static final int CLUEHELPER_HOTCOLD_MASTER_SAIL_GREAT_CONCH = 7051;
- public static final int CLUEHELPER_HOTCOLD_MASTER_SAIL_ISLE_OF_SERPENTS = 7052;
public static final int CLUEHELPER_HOTCOLD_MASTER_SAIL_DRUMSTICK_ISLE = 7053;
}
}
@@ -3078,6 +3078,7 @@ public static final class Row
public static final int CLUEHELPER_TARGET_COORD_0_26_50_30_47 = 3810;
public static final int CLUEHELPER_TARGET_COORD_0_25_51_10_38 = 3811;
public static final int CLUEHELPER_TARGET_COORD_1_25_83_40_54 = 3936;
+ public static final int CLUEHELPER_TARGET_COORD_0_32_57_30_17 = 4964;
public static final int CLUEHELPER_TARGET_COORD_VARLAMORE_RAINFOREST_CENTRE = 5172;
public static final int CLUEHELPER_TARGET_COORD_0_20_51_41_59 = 5173;
public static final int CLUEHELPER_TARGET_COORD_0_58_60_52_60 = 6152;
@@ -3089,7 +3090,6 @@ public static final class Row
public static final int CLUEHELPER_TARGET_COORD_0_32_49_33_48 = 7064;
public static final int CLUEHELPER_TARGET_COORD_0_30_63_26_42 = 7065;
public static final int CLUEHELPER_TARGET_COORD_0_50_36_49_45 = 7066;
- public static final int CLUEHELPER_TARGET_COORD_0_29_37_0_47 = 7067;
public static final int CLUEHELPER_TARGET_COORD_0_33_55_27_42 = 7068;
public static final int CLUEHELPER_TARGET_COORD_0_32_40_21_48 = 7069;
}
@@ -6562,6 +6562,21 @@ public static final class Row
}
}
+ public static final class DynamicBuildersDemoSets
+ {
+ public static final int ID = 76;
+
+ /**
+ * (struct, integer, integer, string, boolean)
+ */
+ public static final int COL_BUTTON_STYLES = 0;
+
+ public static final class Row
+ {
+ public static final int DYNAMIC_BUILDERS_DEMO = 4965;
+ }
+ }
+
public static final class PrepotDeviceLoadoutUi
{
public static final int ID = 77;
@@ -14898,6 +14913,8 @@ public static final class PortTask
public static final class Row
{
+ public static final int PORT_TASK_RELLEKKA_COURIER_19 = 4966;
+ public static final int PORT_TASK_RELLEKKA_COURIER_20 = 4967;
public static final int PORT_TASK_PORT_SARIM_COURIER_0 = 8664;
public static final int PORT_TASK_PORT_SARIM_COURIER_1 = 8665;
public static final int PORT_TASK_PORT_SARIM_COURIER_2 = 8666;
diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java b/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java
index 99faf930178..d5081f7b2a4 100644
--- a/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java
+++ b/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java
@@ -949,6 +949,7 @@ public final class InterfaceID
public static final int PORT_TASK_INFO = 942;
public static final int SAILING_BOAT_CARGOHOLD = 943;
public static final int SAILING_BOAT_CARGOHOLD_SIDE = 944;
+ public static final int REUSABLE_FLOATER = 945;
public static final class _100GuideEggsOverlay
{
@@ -30778,5 +30779,10 @@ public static final class SailingBoatCargoholdSide
public static final int TEXT = 0x03b0_0007;
public static final int DISMISS = 0x03b0_0008;
}
+
+ public static final class ReusableFloater
+ {
+ public static final int UNIVERSE = 0x03b1_0000;
+ }
/* This file is automatically generated. Do not edit. */
}
diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java b/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java
index e54d576744f..e9eae18c44a 100644
--- a/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java
+++ b/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java
@@ -81519,22 +81519,22 @@ public final class ItemID
public static final int GURTOBS_FABRIC_ROLL = 31746;
/**
- * Nifty hat
+ * Swamp cruiser's hat
*/
public static final int JUBBLY_JIVE_COSMETIC_HEAD = 31748;
/**
- * Nifty jacket
+ * Swamp cruiser's jacket
*/
public static final int JUBBLY_JIVE_COSMETIC_CHEST = 31750;
/**
- * Nifty trousers
+ * Swamp cruiser's trousers
*/
public static final int JUBBLY_JIVE_COSMETIC_LEGS = 31752;
/**
- * Nifty shoes
+ * Swamp cruiser's shoes
*/
public static final int JUBBLY_JIVE_COSMETIC_FEET = 31754;
@@ -81554,22 +81554,22 @@ public final class ItemID
public static final int GWYNAS_FABRIC_ROLL = 31758;
/**
- * Sleek hat
+ * Crystal glider's hat
*/
public static final int GWENITH_GLIDE_COSMETIC_HEAD = 31760;
/**
- * Sleek jacket
+ * Crystal glider's jacket
*/
public static final int GWENITH_GLIDE_COSMETIC_CHEST = 31762;
/**
- * Sleek trousers
+ * Crystal glider's trousers
*/
public static final int GWENITH_GLIDE_COSMETIC_LEGS = 31764;
/**
- * Sleek shoes
+ * Crystal glider's shoes
*/
public static final int GWENITH_GLIDE_COSMETIC_FEET = 31766;
@@ -82708,12 +82708,12 @@ public final class ItemID
public static final int SAILING_SKILLGUIDE_MAST_MAHOGANY = 32169;
/**
- * Mahogany mast and linen sails
+ * Mahogany mast and canvas sails
*/
public static final int SAILING_SKILLGUIDE_MAST_MAHOGANY_SKIFF = 32170;
/**
- * Mahogany mast and linen sails
+ * Mahogany mast and canvas sails
*/
public static final int SAILING_SKILLGUIDE_MAST_MAHOGANY_SLOOP = 32171;
@@ -86051,6 +86051,21 @@ public final class ItemID
*/
public static final int JAR_OF_FEATHERS = 32921;
+ /**
+ * Steel nails
+ */
+ public static final int ANY_NAILS = 32923;
+
+ /**
+ * Crate of arrowtips
+ */
+ public static final int CARGO_CRATE_ARROWTIPS_RELLEKKA = 32924;
+
+ /**
+ * Crate of clothes
+ */
+ public static final int CARGO_CRATE_CLOTHES_VOID_KNIGHTS_OUTPOST = 32925;
+
public static final class Cert
{
public static final int TWPART1 = 7;
diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java b/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java
index 6c1f7b8c6e8..20dd16d4305 100644
--- a/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java
+++ b/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java
@@ -71723,6 +71723,7 @@ class ObjectID1
*/
public static final int TOA_ZEBAK_BUBBLES_BLUE = 58525;
public static final int BGSOUND_SAILING_OCEAN_WATER_LOOP_01 = 58526;
+ public static final int CASTLEARROWSLIT_OFFSET = 58527;
public static final int BGSOUND_SAILING_COOKING_LOOP_2 = 58528;
public static final int BGSOUND_SAILING_NORTHERN_OCEAN_WIND_LOOP = 58529;
public static final int BGSOUND_SAILING_CLOCK = 58530;
@@ -73137,6 +73138,11 @@ class ObjectID1
*/
public static final int NICKELROCK1_EMPTY = 58924;
+ /**
+ * Cabinet
+ */
+ public static final int CABINET_OFFSET1 = 58925;
+
/**
* Scoreboard
*/
@@ -73881,7 +73887,7 @@ class ObjectID1
public static final int SAILING_CHARTING_GENERIC_GLIDER_KHARAZI_STRAIT = 59308;
/**
- * Tiny briny shrimp
+ * <col=ffff00>Tiny briny shrimp</col>
*/
public static final int SAILING_CHARTING_GENERIC_SEA_MONKEYS = 59309;
@@ -74056,7 +74062,7 @@ class ObjectID1
public static final int SAILING_CHARTING_GENERIC_SAND_PIT = 59343;
/**
- * Suspicious eyes
+ * <col=ffff00>Suspicious eyes</col>
*/
public static final int SAILING_CHARTING_GENERIC_CRAB_EYES = 59344;
@@ -74151,12 +74157,12 @@ class ObjectID1
public static final int SAILING_CHARTING_GENERIC_ATOLL_DICTIONARY = 59362;
/**
- * Lurking Shadow
+ * <col=ffff00>Lurking Shadow</col>
*/
public static final int SAILING_CHARTING_GENERIC_SCARY_SHADOW = 59363;
/**
- * Horde of tiny sea creatures
+ * <col=ffff00>Horde of tiny sea creatures</col>
*/
public static final int SAILING_CHARTING_GENERIC_SEA_SAPPHIRES = 59364;
@@ -74599,6 +74605,11 @@ class ObjectID1
*/
public static final int SAILING_BOAT_SAILS_COLOSSAL_REGULAR = 59551;
+ /**
+ * Crevice
+ */
+ public static final int GRIMSTONE_CAVE_WALL_UPPER_CREVICE = 59552;
+
/**
* Sails
*/
diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/VarClientID.java b/runelite-api/src/main/java/net/runelite/api/gameval/VarClientID.java
index 0fe1e0e9c9b..0ac3857db57 100644
--- a/runelite-api/src/main/java/net/runelite/api/gameval/VarClientID.java
+++ b/runelite-api/src/main/java/net/runelite/api/gameval/VarClientID.java
@@ -1347,5 +1347,6 @@ public final class VarClientID
public static final int CAMERA_ZOOM_BIG_MIN = 1340;
public static final int CAMERA_ZOOM_BIG_MAX = 1341;
public static final int SAILING_LAST_BOAT_HP = 1342;
+ public static final int SETTINGS_DEV_EXAMPLE_INT = 1343;
/* This file is automatically generated. Do not edit. */
}
diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java b/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java
index 581b2ce6c83..9a94ad6475f 100644
--- a/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java
+++ b/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java
@@ -13841,5 +13841,8 @@ public final class VarbitID
public static final int SAILING_CREW_GHOST_JENKINS_VISIBILITY_CRANDOR = 19610;
public static final int SETTINGS_IRONMAN_CARGO_WARNING_TEMP = 19612;
public static final int SAILING_CREW_GHOST_JENKINS_VISIBILITY_CONTROL = 19613;
+ public static final int SETTINGS_CARGO_HOLD_PRIVACY = 19614;
+ public static final int SAILING_LIKELY_BOTTER_IDENTIFIED = 19615;
+ public static final int BOAT_REPAIR_COST_WARNING_DISMISSED = 19616;
/* This file is automatically generated. Do not edit. */
}
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index f51497766a6..bc2b8b3f5be 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.12.6
+ 1.12.7
client
@@ -41,7 +41,7 @@
nogit
false
false
- 2.0.56
+ 2.0.58
nogit
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
index b22c12f0efd..fee9d2dc770 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
@@ -159,10 +159,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
private GpuFloatBuffer uniformBuffer;
- private int cameraX, cameraY, cameraZ;
private int cameraYaw, cameraPitch;
- private int minLevel, level, maxLevel;
- public Set hideRoofIds;
private VAOList vaoO;
private VAOList vaoA;
@@ -176,6 +173,10 @@ static class SceneContext
final int sizeX, sizeZ;
Zone[][] zones;
+ private int cameraX, cameraY, cameraZ;
+ private int minLevel, level, maxLevel;
+ private Set hideRoofIds;
+
SceneContext(int sizeX, int sizeZ)
{
this.sizeX = sizeX;
@@ -786,18 +787,22 @@ public void preSceneDraw(Scene scene,
float cameraX, float cameraY, float cameraZ, float cameraPitch, float cameraYaw,
int minLevel, int level, int maxLevel, Set hideRoofIds)
{
- this.cameraX = (int) cameraX;
- this.cameraY = (int) cameraY;
- this.cameraZ = (int) cameraZ;
- this.cameraYaw = client.getCameraYaw();
- this.cameraPitch = client.getCameraPitch();
- this.minLevel = minLevel;
- this.level = level;
- this.maxLevel = maxLevel;
- this.hideRoofIds = hideRoofIds;
+ SceneContext ctx = context(scene);
+ if (ctx != null)
+ {
+ ctx.cameraX = (int) cameraX;
+ ctx.cameraY = (int) cameraY;
+ ctx.cameraZ = (int) cameraZ;
+ ctx.minLevel = minLevel;
+ ctx.level = level;
+ ctx.maxLevel = maxLevel;
+ ctx.hideRoofIds = hideRoofIds;
+ }
if (scene.getWorldViewId() == WorldView.TOPLEVEL)
{
+ this.cameraYaw = client.getCameraYaw();
+ this.cameraPitch = client.getCameraPitch();
preSceneDrawToplevel(scene, cameraX, cameraY, cameraZ, cameraPitch, cameraYaw);
}
else
@@ -1033,7 +1038,7 @@ public void drawZoneOpaque(Projection entityProjection, Scene scene, int zx, int
}
int offset = scene.getWorldViewId() == -1 ? (SCENE_OFFSET >> 3) : 0;
- z.renderOpaque(zx - offset, zz - offset, minLevel, level, maxLevel, hideRoofIds);
+ z.renderOpaque(zx - offset, zz - offset, ctx.minLevel, ctx.level, ctx.maxLevel, ctx.hideRoofIds);
checkGLErrors();
}
@@ -1061,17 +1066,17 @@ public void drawZoneAlpha(Projection entityProjection, Scene scene, int level, i
}
int offset = scene.getWorldViewId() == -1 ? (SCENE_OFFSET >> 3) : 0;
- int dx = cameraX - ((zx - offset) << 10);
- int dz = cameraZ - ((zz - offset) << 10);
+ int dx = ctx.cameraX - ((zx - offset) << 10);
+ int dz = ctx.cameraZ - ((zz - offset) << 10);
boolean close = dx * dx + dz * dz < ALPHA_ZSORT_CLOSE * ALPHA_ZSORT_CLOSE;
if (level == 0)
{
- z.alphaSort(zx - offset, zz - offset, cameraX, cameraY, cameraZ);
- z.multizoneLocs(scene, zx - offset, zz - offset, cameraX, cameraZ, ctx.zones);
+ z.alphaSort(zx - offset, zz - offset, ctx.cameraX, ctx.cameraY, ctx.cameraZ);
+ z.multizoneLocs(scene, zx - offset, zz - offset, ctx.cameraX, ctx.cameraZ, ctx.zones);
}
- z.renderAlpha(zx - offset, zz - offset, cameraYaw, cameraPitch, minLevel, this.level, maxLevel, level, hideRoofIds, !close);
+ z.renderAlpha(zx - offset, zz - offset, cameraYaw, cameraPitch, ctx.minLevel, ctx.level, ctx.maxLevel, level, ctx.hideRoofIds, !close);
checkGLErrors();
}
@@ -1185,7 +1190,7 @@ public void drawDynamic(Projection worldProjection, Scene scene, TileObject tile
// level is checked prior to this callback being run, in order to cull clickboxes, but
// tileObject.getPlane()>maxLevel if visbelow is set - lower the object to the max level
- int plane = Math.min(maxLevel, tileObject.getPlane());
+ int plane = Math.min(ctx.maxLevel, tileObject.getPlane());
// renderable modelheight is typically not set here because DynamicObject doesn't compute it on the returned model
zone.addTempAlphaModel(a.vao, start, end, plane, x & 1023, y, z & 1023);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/breakhandler/breakhandlerv2/BreakHandlerV2Script.java b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/breakhandler/breakhandlerv2/BreakHandlerV2Script.java
index 613d3a618f4..92eae0a281b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/breakhandler/breakhandlerv2/BreakHandlerV2Script.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/breakhandler/breakhandlerv2/BreakHandlerV2Script.java
@@ -75,7 +75,7 @@ public BreakHandlerV2Script() {
*/
public boolean run(BreakHandlerV2Config config) {
this.config = config;
- BreakHandlerV2State.setState(BreakHandlerV2State.WAITING_FOR_BREAK);
+ BreakHandlerV2State.setState(BreakHandlerV2State.LOGIN_REQUESTED);
// Initialize next break time immediately to prevent null values in overlay
scheduleNextBreak();
@@ -85,8 +85,7 @@ public boolean run(BreakHandlerV2Config config) {
originalWindowTitle = ClientUI.getFrame().getTitle();
mainScheduledFuture = scheduledExecutorService.scheduleWithFixedDelay(() -> {
try {
- if (!super.run()) return;
-
+ if (!super.run() && !config.autoLogin() && BreakHandlerV2State.getCurrentState() != BreakHandlerV2State.LOGIN_REQUESTED) return;
// Detect unexpected logout while waiting for break
@@ -403,9 +402,9 @@ private void handleLoggingIn() {
return;
}
- // Check for timeout (60 seconds)
+ // Check for timeout (10 seconds)
if (loginAttemptTime != null &&
- Instant.now().isAfter(loginAttemptTime.plusSeconds(60))) {
+ Instant.now().isAfter(loginAttemptTime.plusSeconds(10))) {
log.warn("[BreakHandlerV2] Login timeout, retrying");
transitionToState(BreakHandlerV2State.LOGIN_REQUESTED);
}
diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json
index 9041037e8b6..1272d49f1b3 100644
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -1620,6 +1620,10 @@
1536,
1537
],
+ "steel nails": [
+ 1539,
+ 32923
+ ],
"antidragon shield": [
1540,
8282,
@@ -12989,7 +12993,8 @@
32167,
32168
],
- "mahogany mast and linen sails": [
+ "mahogany mast and canvas sails": [
+ 32169,
32170,
32171
],
@@ -13195,7 +13200,8 @@
32519,
32613,
32693,
- 32764
+ 32764,
+ 32924
],
"crate of bananas": [
32449,
@@ -13566,6 +13572,10 @@
32705,
32793
],
+ "crate of clothes": [
+ 32711,
+ 32925
+ ],
"crate of battleaxes": [
32722,
32766
diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml
index 3de649cc1da..23470d1f39e 100644
--- a/runelite-jshell/pom.xml
+++ b/runelite-jshell/pom.xml
@@ -30,7 +30,7 @@
net.runelite
runelite-parent
- 1.12.6
+ 1.12.7
jshell
diff --git a/runelite-maven-plugin/pom.xml b/runelite-maven-plugin/pom.xml
index f941b9d804f..13115af3fe6 100644
--- a/runelite-maven-plugin/pom.xml
+++ b/runelite-maven-plugin/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.12.6
+ 1.12.7
runelite-maven-plugin