voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-10 05:21:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #808 from Xertis/main

Browse source 
Made on_inventory_interact + update hud
This commit is contained in:
MihailRis 2026-03-16 19:26:08 +03:00 • committed by GitHub
commit 1f7696e972
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 134 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/graphics/ui/elements/InventoryView.cpp
View file

@ -350,45 +350,68 @@ bool SlotView::isHighlighted() const {
void SlotView::performLeftClick(ItemStack& stack, ItemStack& grabbed) {
const auto& input = gui.getInput();
const int mode = PRIMARY;
int action;
if (layout.taking && input.pressed(Keycode::LEFT_SHIFT)) {
action = SHARE;
if (layout.shareFunc) {
layout.shareFunc(layout.index, stack);
}
if (layout.updateFunc) {
layout.updateFunc(layout.index, stack);
}
scripting::on_inventory_interact(inventoryId, layout.index, mode, action);
return;
}
if (!layout.itemSource && stack.accepts(grabbed) && layout.placing) {
action = PUT;
stack.move(grabbed, *content->getIndices());
} else {
if (layout.itemSource) {
if (grabbed.isEmpty()) {
action = TAKE;
grabbed.set(stack);
} else {
action = PUT;
grabbed.clear();
}
} else if (grabbed.isEmpty()) {
if (layout.taking) {
action = TAKE;
std::swap(grabbed, stack);
}
} else if (layout.taking && layout.placing) {
action = PUT;
std::swap(grabbed, stack);
}
}
scripting::on_inventory_interact(inventoryId, layout.index, mode, action);
}
void SlotView::performRightClick(ItemStack& stack, ItemStack& grabbed) {
const auto& input = gui.getInput();
const int mode = SECONDARY;
int action = PUT;
if (layout.rightClick) {
layout.rightClick(inventoryId, stack);
if (layout.updateFunc) {
layout.updateFunc(layout.index, stack);
}
scripting::on_inventory_interact(inventoryId, layout.index, mode, PUT);
return;
}
if (layout.itemSource) return;
if (layout.itemSource) {
scripting::on_inventory_interact(inventoryId, layout.index, mode, TAKE);
return;
}
if (grabbed.isEmpty()) {
if (!stack.isEmpty() && layout.taking) {
action = TAKE;
grabbed.set(std::move(stack));
int halfremain = stack.getCount() / 2;
grabbed.setCount(stack.getCount() - halfremain);
@ -399,13 +422,19 @@ void SlotView::performRightClick(ItemStack& stack, ItemStack& grabbed) {
stack = ItemStack(0, 0);
}
}
scripting::on_inventory_interact(inventoryId, layout.index, mode, action);
return;
}
auto& stackDef = content->getIndices()->items.require(stack.getItemId());
if (!layout.placing) {
scripting::on_inventory_interact(inventoryId, layout.index, mode, PUT);
return;
}
auto& stackDef = content->getIndices()->items.require(stack.getItemId());
if (stack.isEmpty()) {
action = PUT;
itemcount_t count = grabbed.getCount();
stack.set(std::move(grabbed));
stack.setCount(1);
@ -414,11 +443,13 @@ void SlotView::performRightClick(ItemStack& stack, ItemStack& grabbed) {
} else {
grabbed = ItemStack(stack.getItemId(), count - 1);
}
} else if (stack.accepts(grabbed) &&
stack.getCount() < stackDef.stackSize) {
} else if (stack.accepts(grabbed) && stack.getCount() < stackDef.stackSize) {
action = PUT;
stack.setCount(stack.getCount() + 1);
grabbed.setCount(grabbed.getCount() - 1);
}
scripting::on_inventory_interact(inventoryId, layout.index, mode, action);
}
void SlotView::clicked(Mousecode button) {
@ -436,6 +467,7 @@ void SlotView::clicked(Mousecode button) {
} else if (button == Mousecode::BUTTON_2) {
performRightClick(stack, grabbed);
}
if (layout.updateFunc) {
layout.updateFunc(layout.index, stack);
}

11
src/graphics/ui/elements/InventoryView.hpp
View file

@ -56,6 +56,17 @@ namespace gui {
ItemStack stack {};
std::wstring countStr;
} cache;
enum InteractionMode {
PRIMARY = 0,
SECONDARY = 1
};
enum InteractionAction {
PUT = 0,
TAKE = 1,
SHARE = 2,
};
const Content* content = nullptr;
SlotLayout layout;