Skip to content

Fix Cargo Hold Assignment in Boarding UI #229

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

Open
BBeeaarr wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix Cargo Hold Assignment in Boarding UI #229

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a36e312
refactor and fix issue
BBeeaarr Mar 3, 2026
4211d88
clean
BBeeaarr Mar 3, 2026
cea0c5b
clean
BBeeaarr Mar 3, 2026
9adf3e3
use builder
BBeeaarr Mar 3, 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
41 changes: 28 additions & 13 deletions src/main/java/com/duckblade/osrs/sailing/features/facilities/CargoHoldTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.google.common.collect.HashMultiset;
import com.google.common.collect.ImmutableMultiset;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Multiset;
import com.google.common.collect.Multisets;
import java.awt.Color;
Expand Down Expand Up @@ -80,13 +81,13 @@ public class CargoHoldTracker
"Woooo wooo wooooo woooo."
);

private static final Set<Integer> CARGO_INVENTORY_IDS = ImmutableSet.of(
InventoryID.SAILING_BOAT_1_CARGOHOLD,
InventoryID.SAILING_BOAT_2_CARGOHOLD,
InventoryID.SAILING_BOAT_3_CARGOHOLD,
InventoryID.SAILING_BOAT_4_CARGOHOLD,
InventoryID.SAILING_BOAT_5_CARGOHOLD
);
private static final Map<Integer, Integer> CARGOHOLD_ID_TO_BOAT_SLOT = ImmutableMap.<Integer, Integer>builder()
.put(InventoryID.SAILING_BOAT_1_CARGOHOLD, 1)
.put(InventoryID.SAILING_BOAT_2_CARGOHOLD, 2)
.put(InventoryID.SAILING_BOAT_3_CARGOHOLD, 3)
.put(InventoryID.SAILING_BOAT_4_CARGOHOLD, 4)
.put(InventoryID.SAILING_BOAT_5_CARGOHOLD, 5)
.build();

private static final char CONFIG_DELIMITER_PAIRS = ';';
private static final char CONFIG_DELIMITER_KV = ':';
Expand Down Expand Up @@ -249,15 +250,17 @@ public void onItemContainerChanged(ItemContainerChanged e)
return;
}

if (!CARGO_INVENTORY_IDS.contains(e.getContainerId() & 0x4FFF))
if (!CARGOHOLD_ID_TO_BOAT_SLOT.containsKey(e.getContainerId() & 0x4FFF)) //& 0x4FFF converts the `tradable` inventoryID into a true inventory ID
{
return;
}

sawItemContainerUpdate = true;

ItemContainer containerInv = e.getItemContainer();
Multiset<Integer> trackedInv = cargoHold();
int boatSlot = CARGOHOLD_ID_TO_BOAT_SLOT.get(e.getContainerId() & 0x4FFF);
Multiset<Integer> trackedInv = cargoHold(boatSlot);
log.debug("read cargo hold inventory for boat {} from event PRE CHANGE {}",boatSlot, trackedInv);
trackedInv.clear();
for (Item item : containerInv.getItems())
{
Expand All @@ -271,11 +274,11 @@ public void onItemContainerChanged(ItemContainerChanged e)
continue;
}

add(item.getId(), item.getQuantity());
add(item.getId(), item.getQuantity(), boatSlot);
}

log.debug("read cargo hold inventory from event {}", trackedInv);
writeToConfig();
log.debug("written cargo hold to boat {} from event {}", boatSlot, trackedInv);
writeToConfig(boatSlot);
}

@Subscribe
Expand Down Expand Up @@ -376,7 +379,7 @@ private Multiset<Integer> cargoHold(int boatSlot)

private int currentBoatSlot()
{
return client.getVarbitValue(VarbitID.SAILING_LAST_PERSONAL_BOAT_BOARDED) - 1;
return client.getVarbitValue(VarbitID.SAILING_LAST_PERSONAL_BOAT_BOARDED);
}

private int usedCapacity()
Expand Down Expand Up @@ -430,6 +433,18 @@ private void add(int item, int count)
}
}

private void add(int item, int count, int boatSlot)
{
if (isStackable(item))
{
cargoHold(boatSlot).setCount(item, 1);
}
else
{
cargoHold(boatSlot).add(item, count);
}
}

private void set(int item, int count)
{
if (isStackable(item))
Expand Down