Skip to content

tryCrafting now accepts slice #2483

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
Wunka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tryCrafting now accepts slice #2483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 23 additions & 17 deletions src/Inventory.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,11 +1103,15 @@ pub const Command = struct { // MARK: Command
};
}

fn tryCraftingTo(self: *Command, allocator: NeverFailingAllocator, dest: Inventory, source: InventoryAndSlot, side: Side, user: ?*main.server.User) void { // MARK: tryCraftingTo()
fn tryCraftingTo(self: *Command, allocator: NeverFailingAllocator, destinations: []const Inventory, source: InventoryAndSlot, side: Side, user: ?*main.server.User) void { // MARK: tryCraftingTo()
std.debug.assert(source.inv.type == .crafting);
std.debug.assert(dest.type == .normal);
var destinationsCanHold = false;
for(destinations) |dest| {
std.debug.assert(dest.type == .normal);
if(dest.canHold(source.ref().*)) destinationsCanHold = true;
}
if(!destinationsCanHold) return;
if(source.slot != source.inv._items.len - 1) return;
if(!dest.canHold(source.ref().*)) return;
if(source.ref().item == .null) return; // Can happen if the we didn't receive the inventory information from the server yet.

const playerInventory: Inventory = switch(side) {
Expand Down Expand Up @@ -1160,16 +1164,18 @@ pub const Command = struct { // MARK: Command
}

var remainingAmount: u16 = source.ref().amount;
for(dest._items, 0..) |*destStack, destSlot| {
if(std.meta.eql(destStack.item, source.ref().item) or destStack.item == .null) {
const amount = @min(source.ref().item.stackSize() - destStack.amount, remainingAmount);
self.executeBaseOperation(allocator, .{.create = .{
.dest = .{.inv = dest, .slot = @intCast(destSlot)},
.amount = amount,
.item = source.ref().item,
}}, side);
remainingAmount -= amount;
if(remainingAmount == 0) break;
outer: for(destinations) |dest| {
for(dest._items, 0..) |*destStack, destSlot| {
if(std.meta.eql(destStack.item, source.ref().item) or destStack.item == .null) {
const amount = @min(source.ref().item.stackSize() - destStack.amount, remainingAmount);
self.executeBaseOperation(allocator, .{.create = .{
.dest = .{.inv = dest, .slot = @intCast(destSlot)},
.amount = amount,
.item = source.ref().item,
}}, side);
remainingAmount -= amount;
if(remainingAmount == 0) break :outer;
}
}
}
std.debug.assert(remainingAmount == 0);
Expand Down Expand Up @@ -1323,7 +1329,7 @@ pub const Command = struct { // MARK: Command
return;
}
if(self.dest.inv.type == .crafting) {
ctx.cmd.tryCraftingTo(ctx.allocator, self.source.inv, self.dest, ctx.side, ctx.user);
ctx.cmd.tryCraftingTo(ctx.allocator, &.{self.source.inv}, self.dest, ctx.side, ctx.user);
return;
}
if(self.dest.inv.type == .workbench and self.dest.slot != 25 and self.dest.inv.type.workbench.slotInfos()[self.dest.slot].disabled) return;
Expand Down Expand Up @@ -1444,7 +1450,7 @@ pub const Command = struct { // MARK: Command
return;
}
if(self.source.inv.type == .crafting) {
ctx.cmd.tryCraftingTo(ctx.allocator, self.dest.inv, self.source, ctx.side, ctx.user);
ctx.cmd.tryCraftingTo(ctx.allocator, &.{self.dest.inv}, self.source, ctx.side, ctx.user);
return;
}
if(self.source.inv.type == .workbench and self.source.slot != 25 and self.source.inv.type.workbench.slotInfos()[self.source.slot].disabled) return;
Expand Down Expand Up @@ -1512,7 +1518,7 @@ pub const Command = struct { // MARK: Command
.source = undefined,
.callbacks = .{},
};
ctx.cmd.tryCraftingTo(ctx.allocator, temp, self.source, ctx.side, ctx.user);
ctx.cmd.tryCraftingTo(ctx.allocator, &.{temp}, self.source, ctx.side, ctx.user);
std.debug.assert(ctx.cmd.baseOperations.pop().create.dest.inv._items.ptr == temp._items.ptr); // Remove the extra step from undo list (we cannot undo dropped items)
if(_items[0].item != .null) {
if(ctx.side == .server) {
Expand Down Expand Up @@ -1693,7 +1699,7 @@ pub const Command = struct { // MARK: Command
if(dest.type == .workbench) return;
}
if(self.source.inv.type == .crafting) {
ctx.cmd.tryCraftingTo(ctx.allocator, self.destinations[0], self.source, ctx.side, ctx.user);
ctx.cmd.tryCraftingTo(ctx.allocator, self.destinations, self.source, ctx.side, ctx.user);
return;
}
const sourceStack = self.source.ref();
Expand Down