Skip to content

DepositToAny slice for the destination #2469

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
IntegratedQuantum merged 10 commits into from
Jan 11, 2026
Merged

DepositToAny slice for the destination #2469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
739e2e6
DepositToAny now accepts a slice of destinations
Wunka Jan 7, 2026
add8af4
switch to array alloc instead of list
Wunka Jan 7, 2026
fbd21a0
format
Wunka Jan 7, 2026
c8204c6
change from allocated to owned
Wunka Jan 8, 2026
b3a1dee
change priority system
Wunka Jan 8, 2026
f15167a
finalize
Wunka Jan 8, 2026
dfb73e6
destinations is always allocated
Wunka Jan 9, 2026
ea634f9
init, usize and inline
Wunka Jan 9, 2026
0787846
forgot to remove
Wunka Jan 9, 2026
b4a7023
small changes
Wunka Jan 10, 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
89 changes: 68 additions & 21 deletions src/Inventory.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1670,16 +1670,30 @@ pub const Command = struct { // MARK: Command
};

const DepositToAny = struct { // MARK: DepositToAny
dest: Inventory,
destinations: []const Inventory,
source: InventoryAndSlot,
amount: u16,

pub fn init(destinations: []const Inventory, source: InventoryAndSlot, amount: u16) DepositToAny {
return .{
.destinations = main.globalAllocator.dupe(Inventory, destinations),
.source = source,
.amount = amount,
};
}

fn finalize(self: DepositToAny, _: Side, _: *utils.BinaryReader) !void {
main.globalAllocator.free(self.destinations);
}

fn run(self: DepositToAny, ctx: Context) error{serverFailure}!void {
if(self.dest.type == .creative) return;
if(self.dest.type == .crafting) return;
if(self.dest.type == .workbench) return;
for(self.destinations) |dest| {
if(dest.type == .creative) return;
if(dest.type == .crafting) return;
if(dest.type == .workbench) return;
}
if(self.source.inv.type == .crafting) {
ctx.cmd.tryCraftingTo(ctx.allocator, self.dest, self.source, ctx.side, ctx.user);
ctx.cmd.tryCraftingTo(ctx.allocator, self.destinations[0], self.source, ctx.side, ctx.user);
return;
}
const sourceStack = self.source.ref();
Expand All @@ -1688,41 +1702,74 @@ pub const Command = struct { // MARK: Command

var remainingAmount = self.amount;
var selectedEmptySlot: ?u32 = null;
for(self.dest._items, 0..) |*destStack, destSlot| {
if(destStack.item == .null and selectedEmptySlot == null) {
selectedEmptySlot = @intCast(destSlot);
var selectedEmptyInv: ?Inventory = null;
outer: for(self.destinations) |dest| {
var emptySlot: ?u32 = null;
var hasItem = false;
for(dest._items, 0..) |*destStack, destSlot| {
if(destStack.item == .null and emptySlot == null) {
emptySlot = @intCast(destSlot);
if(selectedEmptySlot == null) {
selectedEmptySlot = emptySlot;
selectedEmptyInv = dest;
}
}
if(std.meta.eql(destStack.item, sourceStack.item)) {
hasItem = true;
const amount = @min(sourceStack.item.stackSize() - destStack.amount, remainingAmount);
if(amount == 0) continue;
ctx.execute(.{.move = .{
.dest = .{.inv = dest, .slot = @intCast(destSlot)},
.source = self.source,
.amount = amount,
}});
remainingAmount -= amount;
if(remainingAmount == 0) break :outer;
}
}
if(std.meta.eql(destStack.item, sourceStack.item)) {
const amount = @min(sourceStack.item.stackSize() - destStack.amount, remainingAmount);
if(amount == 0) continue;
if(emptySlot != null and hasItem) {
ctx.execute(.{.move = .{
.dest = .{.inv = self.dest, .slot = @intCast(destSlot)},
.dest = .{.inv = dest, .slot = emptySlot.?},
.source = self.source,
.amount = amount,
.amount = remainingAmount,
}});
remainingAmount -= amount;
if(remainingAmount == 0) break;
remainingAmount = 0;
break :outer;
}
}
if(remainingAmount > 0 and selectedEmptySlot != null) {
ctx.execute(.{.move = .{
.dest = .{.inv = self.dest, .slot = selectedEmptySlot.?},
.dest = .{.inv = selectedEmptyInv.?, .slot = selectedEmptySlot.?},
.source = self.source,
.amount = remainingAmount,
}});
}
}

fn serialize(self: DepositToAny, writer: *utils.BinaryWriter) void {
writer.writeEnum(InventoryId, self.dest.id);
writer.writeVarInt(usize, self.destinations.len);
for(self.destinations) |dest| {
writer.writeEnum(InventoryId, dest.id);
}
self.source.write(writer);
writer.writeInt(u16, self.amount);
}

fn deserialize(reader: *utils.BinaryReader, side: Side, user: ?*main.server.User) !DepositToAny {
const destId = try reader.readEnum(InventoryId);
const destinationsSize = try reader.readVarInt(usize);
if(destinationsSize == 0) return error.Invalid;
if(destinationsSize*@sizeOf(InventoryId) >= reader.remaining.len) return error.Invalid;

const destinations = main.globalAllocator.alloc(Inventory, destinationsSize);
errdefer main.globalAllocator.free(destinations);

for(destinations) |*dest| {
const invId = try reader.readEnum(InventoryId);
dest.* = Sync.getInventory(invId, side, user) orelse return error.InventoryNotFound;
}

return .{
.dest = Sync.getInventory(destId, side, user) orelse return error.InventoryNotFound,
.destinations = destinations[0..],
.source = try InventoryAndSlot.read(reader, side, user),
.amount = try reader.readInt(u16),
};
Expand Down Expand Up @@ -2178,8 +2225,8 @@ pub fn depositOrDrop(dest: Inventory, source: Inventory) void {
Sync.ClientSide.executeCommand(.{.depositOrDrop = .{.dest = dest, .source = source, .dropLocation = undefined}});
}

pub fn depositToAny(source: Inventory, sourceSlot: u32, dest: Inventory, amount: u16) void {
Sync.ClientSide.executeCommand(.{.depositToAny = .{.dest = dest, .source = .{.inv = source, .slot = sourceSlot}, .amount = amount}});
pub fn depositToAny(source: Inventory, sourceSlot: u32, destinations: []const Inventory, amount: u16) void {
Sync.ClientSide.executeCommand(.{.depositToAny = .init(destinations, .{.inv = source, .slot = sourceSlot}, amount)});
}

pub fn dropStack(source: Inventory, sourceSlot: u32) void {
Expand Down
6 changes: 3 additions & 3 deletions src/gui/gui.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ pub const inventory = struct { // MARK: inventory
nextCraftingAction = nextCraftingAction.addDuration(craftingCooldown);
craftingCooldown.nanoseconds -= @divTrunc((craftingCooldown.nanoseconds -% minCraftingCooldown.nanoseconds)*craftingCooldown.nanoseconds, std.time.ns_per_s);
if(mainGuiButton.modsOnPress.shift) {
itemSlot.inventory.depositToAny(itemSlot.itemSlot, main.game.Player.inventory, itemSlot.inventory.getAmount(itemSlot.itemSlot));
itemSlot.inventory.depositToAny(itemSlot.itemSlot, &.{main.game.Player.inventory}, itemSlot.inventory.getAmount(itemSlot.itemSlot));
} else {
itemSlot.inventory.depositOrSwap(itemSlot.itemSlot, carried);
}
Expand All @@ -683,12 +683,12 @@ pub const inventory = struct { // MARK: inventory
var iterator = std.mem.reverseIterator(openWindows.items);
while(iterator.next()) |window| {
if(window.shiftClickableInventory) |inv| {
itemSlot.inventory.depositToAny(itemSlot.itemSlot, inv, itemSlot.inventory.getAmount(itemSlot.itemSlot));
itemSlot.inventory.depositToAny(itemSlot.itemSlot, &.{inv}, itemSlot.inventory.getAmount(itemSlot.itemSlot));
break;
}
}
} else {
itemSlot.inventory.depositToAny(itemSlot.itemSlot, main.game.Player.inventory, itemSlot.inventory.getAmount(itemSlot.itemSlot));
itemSlot.inventory.depositToAny(itemSlot.itemSlot, &.{main.game.Player.inventory}, itemSlot.inventory.getAmount(itemSlot.itemSlot));
}
return;
}
Expand Down