AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-08-03 03:06:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow searching by tag in the creative inventory (#1700)

Browse Source 
fixes #1659

---------

Co-authored-by: IntegratedQuantum <43880493+IntegratedQuantum@users.noreply.github.com>
This commit is contained in:
codemob 2025-07-23 15:22:50 -04:00 committed by GitHub
parent 8a0eeaa9ae
commit 468f959c54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/windows/creative_inventory.zig
View File

@ -54,6 +54,15 @@ pub fn onClose() void {
main.globalAllocator.free(searchString);
}
fn hasMatchingTag(tags: []const main.Tag, target: []const u8) bool {
for(tags) |tag| {
if(std.mem.containsAtLeast(u8, tag.getName(), 1, target)) {
return true;
}
}
return false;
}
fn initContent() void {
const root = VerticalList.init(.{padding, padding}, 300, 0);
{
@ -73,9 +82,18 @@ fn initContent() void {
const list = VerticalList.init(.{0, padding}, 144, 0);
items = .init(main.globalAllocator);
var itemIterator = main.items.iterator();
while(itemIterator.next()) |item| {
if(searchString.len != 0 and !std.mem.containsAtLeast(u8, item.id(), 1, searchString)) continue;
items.append(Item{.baseItem = item.*});
if(searchString.len > 1 and searchString[0] == '.') {
const tag = searchString[1..];
while(itemIterator.next()) |item| {
if(hasMatchingTag(item.tags(), tag) or (item.block() != null and hasMatchingTag((main.blocks.Block{.typ = item.block().?, .data = undefined}).blockTags(), tag))) {
items.append(Item{.baseItem = item.*});
}
}
} else {
while(itemIterator.next()) |item| {
if(searchString.len != 0 and !std.mem.containsAtLeast(u8, item.id(), 1, searchString)) continue;
items.append(Item{.baseItem = item.*});
}
}
std.mem.sort(Item, items.items, {}, lessThan);