Sort button attempt 2

src/Inventory.zig

@@ -7,6 +7,7 @@ const Item = main.items.Item;
 const ItemStack = main.items.ItemStack;
 const ProceduralItem = main.items.ProceduralItem;
 const utils = main.utils;
+const Tag = main.Tag;
 const BinaryWriter = utils.BinaryWriter;
 const BinaryReader = utils.BinaryReader;
 const NeverFailingAllocator = main.heap.NeverFailingAllocator;
@@ -538,6 +539,71 @@ pub const ClientInventory = struct { // MARK: ClientInventory
 		main.sync.client.executeCommand(.{.craftProceduralItem = .init(destinations, workbenchInv)});
 	}
 
+	pub const SortOptions = struct {
+		ignoredSlotCount: usize,
+	};
+
+	pub fn sortItems(source: ClientInventory, options: SortOptions) void {
+		compressItems(source, options);
+		const InventorySize: usize = source.super.size() - options.ignoredSlotCount;
+		var sortList = main.ListManaged(usize).init(main.stackAllocator);
+		defer sortList.deinit();
+		var intermediaryList = main.ListManaged(usize).init(main.stackAllocator);
+		defer intermediaryList.deinit();
+		for (0..InventorySize) |i| {
+			sortList.append(i + options.ignoredSlotCount);
+			intermediaryList.append(i + options.ignoredSlotCount);
+		}
+		const ctx: SortContext = .{.inv = source, .sortlist = sortList};
+		std.sort.insertion(usize, sortList.items, ctx, SortContext.lessThan);
+		for (0..InventorySize) |i| {
+			if (sortList.items[i] == intermediaryList.items[i]) continue;
+			var previousIndex: usize = i;
+			var checkedIndex = sortList.items[i] - options.ignoredSlotCount;
+			while (checkedIndex != i) {
+				main.sync.client.executeCommand(.{.depositOrSwap = .{
+					.dest = .{.inv = source.super, .slot = @intCast(previousIndex + options.ignoredSlotCount)},
+					.source = .{.inv = source.super, .slot = @intCast(checkedIndex + options.ignoredSlotCount)},
+				}});
+				std.mem.swap(usize, &intermediaryList.items[previousIndex], &intermediaryList.items[checkedIndex]);
+				previousIndex = checkedIndex;
+				checkedIndex = sortList.items[checkedIndex] - options.ignoredSlotCount;
+			}
+		}
+	}
+
+	pub fn compressItems(source: ClientInventory, options: SortOptions) void {
+		for (source.super._items, 0..) |invStack, slot| {
+			if (invStack.item == .null) continue;
+			if (slot < options.ignoredSlotCount) continue;
+			for (source.super._items, 0..) |checkedInvStack, checkedSlot| {
+				if (checkedInvStack.item == .null) continue;
+				if (checkedSlot < slot) continue;
+				if (checkedSlot < options.ignoredSlotCount) continue;
+				if (std.meta.eql(invStack.item, checkedInvStack.item)) {
+					main.sync.client.executeCommand(.{.deposit = .{.dest = .{.inv = source.super, .slot = @intCast(checkedSlot)}, .source = .{.inv = source.super, .slot = @intCast(slot)}, .amount = checkedInvStack.item.stackSize()}});
+				}
+			}
+		}
+	}
+
+	const SortContext = struct {
+		inv: ClientInventory,
+		sortlist: main.ListManaged(usize),
+
+		pub fn lessThan(ctx: @This(), a: usize, b: usize) bool {
+			const itemA: Item = ctx.inv.getItem(a);
+			const itemB: Item = ctx.inv.getItem(b);
+
+			if (itemA == .null) return false;
+			if (itemB == .null) return true;
+			if ((itemA != .proceduralItem) and (itemB == .proceduralItem)) return false;
+			if ((itemA == .proceduralItem) and (itemB != .proceduralItem)) return true;
+
+			return std.mem.lessThan(u8, itemA.id().?, itemB.id().?);
+		}
+	};
+
 	pub fn placeBlock(self: ClientInventory, slot: u32) void {
 		std.debug.assert(self.type == .serverShared);
 		main.renderer.MeshSelection.placeBlock(self, slot);

src/assets.zig

@@ -14,6 +14,7 @@ const NeverFailingAllocator = main.heap.NeverFailingAllocator;
 const NeverFailingArenaAllocator = main.heap.NeverFailingArenaAllocator;
 const List = main.List;
 const files = main.files;
+const Tag = main.Tag;
 
 var common: Assets = undefined;
 

src/blocks.zig

@@ -173,7 +173,7 @@ pub fn register(_: []const u8, id: []const u8, zon: ZonElement) u16 {
 	const rotation_tags = _mode[size].getBlockTags();
 	const block_tags = Tag.loadTagsFromZon(main.stackAllocator, zon.getChild("tags"));
 	defer main.stackAllocator.free(block_tags);
-	_tags[size] = std.mem.concat(main.worldArena.allocator, Tag, &.{rotation_tags, block_tags}) catch unreachable;
+	_tags[size] = std.mem.concat(main.worldArena.allocator, Tag, &.{block_tags, rotation_tags}) catch unreachable;
 
 	if (_tags[size].len == 0) std.log.err("Block {s} is missing 'tags' field", .{id});
 	for (_tags[size]) |tag| {

src/gui/components/Button.zig

@@ -57,6 +57,7 @@ size: Vec2f,
 disabled: bool = false,
 pressed: bool = false,
 hovered: bool = false,
+hideBackground: bool = false,
 onAction: main.callbacks.SimpleCallback,
 child: GuiComponent,
 
@@ -88,6 +89,7 @@ pub fn globalDeinit() void {
 const Options = struct {
 	onAction: main.callbacks.SimpleCallback = .{},
 	disabled: bool = false,
+	hideBackground: bool = false,
 };
 
 pub fn initText(pos: Vec2f, width: f32, text: []const u8, options: Options) *Button {
@@ -99,7 +101,9 @@ pub fn initText(pos: Vec2f, width: f32, text: []const u8, options: Options) *But
 		.onAction = options.onAction,
 		.child = label.toComponent(),
 		.disabled = options.disabled,
+		.hideBackground = options.hideBackground,
 	};
+	if (self.hideBackground) self.child.mutSize().* = self.size;
 	return self;
 }
 
@@ -112,7 +116,9 @@ pub fn initIcon(pos: Vec2f, iconSize: Vec2f, iconTexture: Texture, options: Opti
 		.onAction = options.onAction,
 		.child = icon.toComponent(),
 		.disabled = options.disabled,
+		.hideBackground = options.hideBackground,
 	};
+	if (self.hideBackground) self.child.mutSize().* = self.size;
 	return self;
 }
 
@@ -145,6 +151,16 @@ pub fn mainButtonReleased(self: *Button, mousePosition: Vec2f) void {
 }
 
 pub fn render(self: *Button, mousePosition: Vec2f) void {
+	if (!self.hideBackground) renderBackground(self, mousePosition);
+
+	const oldColor = draw.setColor(if (self.disabled) 0xff808080 else 0xffffffff);
+	defer draw.restoreColor(oldColor);
+	const textPos = self.pos + self.size/@as(Vec2f, @splat(2.0)) - self.child.size()/@as(Vec2f, @splat(2.0));
+	self.child.mutPos().* = textPos;
+	self.child.render(mousePosition - self.pos);
+}
+
+fn renderBackground(self: *Button, mousePosition: Vec2f) void {
 	const textures = blk: {
 		if (self.disabled) break :blk disabledTextures;
 		if (self.pressed) break :blk pressedTextures;
@@ -164,10 +180,4 @@ pub fn render(self: *Button, mousePosition: Vec2f) void {
 
 	textures.outlineTexture.bindTo(0);
 	graphics.draw.bound9SliceImage(self.pos, self.size, textures.outlineTextureSize, cornerSize, 2);
-
-	const oldColor = draw.setColor(if (self.disabled) 0xff808080 else 0xffffffff);
-	defer draw.restoreColor(oldColor);
-	const textPos = self.pos + self.size/@as(Vec2f, @splat(2.0)) - self.child.size()/@as(Vec2f, @splat(2.0));
-	self.child.mutPos().* = textPos;
-	self.child.render(mousePosition - self.pos);
 }

src/gui/windows/chest.zig

@@ -29,7 +29,14 @@ pub var window = GuiWindow{
 const padding: f32 = 8;
 var itemSlots: main.List(*ItemSlot) = .empty;
 
+var sortIcon: Texture = undefined;
+
+pub fn init() void {
+	sortIcon = Texture.initFromFile("assets/cubyz/ui/inventory/sort_icon.png");
+}
+
 pub fn deinit() void {
+	sortIcon.deinit();
 	itemSlots.clearAndFree(main.globalAllocator);
 }
 
@@ -39,7 +46,15 @@ pub fn setInventory(selectedInventory: main.items.Inventory.ClientInventory) voi
 	openInventory = selectedInventory;
 }
 
+fn sortItems() void {
+	const target = openInventory;
+	target.sortItems(.{.ignoredSlotCount = 0});
+}
+
 pub fn onOpen() void {
+	window.titleBar = HorizontalList.init();
+	window.titleBar.?.add(Button.initIcon(.{0, 0}, .{9, 9}, sortIcon, .{.onAction = .init(sortItems), .hideBackground = true}));
+
 	const list = VerticalList.init(.{padding, padding + 16}, 300, 0);
 
 	for (0..2) |y| {
@@ -67,4 +82,5 @@ pub fn onClose() void {
 		comp.deinit();
 		window.rootComponent = null;
 	}
+	window.titleBar.?.deinit();
 }

src/gui/windows/inventory.zig

@@ -30,18 +30,29 @@ pub var window = GuiWindow{
 const padding: f32 = 8;
 
 var craftingIcon: Texture = undefined;
+var sortIcon: Texture = undefined;
 
 pub fn init() void {
 	craftingIcon = Texture.initFromFile("assets/cubyz/ui/inventory/crafting_icon.png");
+	sortIcon = Texture.initFromFile("assets/cubyz/ui/inventory/sort_icon.png");
 }
 
 pub fn deinit() void {
 	craftingIcon.deinit();
+	sortIcon.deinit();
 }
 
 var itemSlots: [20]*ItemSlot = undefined;
 
+fn sortItems() void {
+	const target = Player.inventory;
+	target.sortItems(.{.ignoredSlotCount = 12});
+}
+
 pub fn onOpen() void {
+	window.titleBar = HorizontalList.init();
+	window.titleBar.?.add(Button.initIcon(.{0, 0}, .{9, 9}, sortIcon, .{.onAction = .init(sortItems), .hideBackground = true}));
+
 	const list = VerticalList.init(.{padding, padding + 16}, 300, 0);
 	// Some miscellanious slots and buttons:
 	// TODO: armor slots, backpack slot + stack-based backpack inventory, other items maybe?
@@ -73,4 +84,5 @@ pub fn onClose() void {
 	if (window.rootComponent) |*comp| {
 		comp.deinit();
 	}
+	window.titleBar.?.deinit();
 }