From f0777570ae7f1dd7c95617ec60b30a22f75d21a0 Mon Sep 17 00:00:00 2001 From: iqballerr Date: Thu, 15 Jan 2026 12:15:59 -0800 Subject: [PATCH] Update CargoHoldTier.java Runelite updated some of the sailing constants --- .../osrs/sailing/model/CargoHoldTier.java | 63 ++++++++++++------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/duckblade/osrs/sailing/model/CargoHoldTier.java b/src/main/java/com/duckblade/osrs/sailing/model/CargoHoldTier.java index d0026b3b..305061d9 100644 --- a/src/main/java/com/duckblade/osrs/sailing/model/CargoHoldTier.java +++ b/src/main/java/com/duckblade/osrs/sailing/model/CargoHoldTier.java @@ -14,11 +14,14 @@ public enum CargoHoldTier WOOD( new int[]{ ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_RAFT, - ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_RAFT_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_RAFT_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_RAFT_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_2X5, - ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_2X5_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_2X5_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_2X5_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_LARGE, - ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_LARGE_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_LARGE_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_REGULAR_LARGE_NO_CARGO }, new int[]{ 20, @@ -30,11 +33,14 @@ public enum CargoHoldTier OAK( new int[]{ ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_RAFT, - ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_RAFT_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_RAFT_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_RAFT_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_2X5, - ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_2X5_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_2X5_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_2X5_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_LARGE, - ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_LARGE_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_LARGE_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_OAK_LARGE_NO_CARGO }, new int[]{ 30, @@ -46,11 +52,14 @@ public enum CargoHoldTier TEAK( new int[]{ ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_RAFT, - ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_RAFT_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_RAFT_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_RAFT_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_2X5, - ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_2X5_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_2X5_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_2X5_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_LARGE, - ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_LARGE_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_LARGE_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_TEAK_LARGE_NO_CARGO, }, new int[]{ 45, @@ -62,11 +71,14 @@ public enum CargoHoldTier MAHOGANY( new int[]{ ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_RAFT, - ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_RAFT_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_RAFT_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_RAFT_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_2X5, - ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_2X5_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_2X5_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_2X5_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_LARGE, - ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_LARGE_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_LARGE_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_MAHOGANY_LARGE_NO_CARGO, }, new int[]{ 60, @@ -78,11 +90,14 @@ public enum CargoHoldTier CAMPHOR( new int[]{ ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_RAFT, - ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_RAFT_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_RAFT_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_RAFT_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_2X5, - ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_2X5_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_2X5_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_2X5_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_LARGE, - ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_LARGE_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_LARGE_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_CAMPHOR_LARGE_NO_CARGO, }, new int[]{ 80, @@ -94,11 +109,14 @@ public enum CargoHoldTier IRONWOOD( new int[]{ ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_RAFT, - ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_RAFT_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_RAFT_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_RAFT_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_2X5, - ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_2X5_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_2X5_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_2X5_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_LARGE, - ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_LARGE_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_LARGE_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_IRONWOOD_LARGE_NO_CARGO, }, new int[]{ 105, @@ -110,11 +128,14 @@ public enum CargoHoldTier ROSEWOOD( new int[]{ ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_RAFT, - ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_RAFT_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_RAFT_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_RAFT_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_2X5, - ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_2X5_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_2X5_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_2X5_NO_CARGO, ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_LARGE, - ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_LARGE_OPEN, + ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_LARGE_CARGO, + ObjectID.SAILING_BOAT_CARGO_HOLD_ROSEWOOD_LARGE_NO_CARGO, }, new int[]{ 120,