AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-11 16:36:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

inventory: fix wrong setting new item on click

Browse Source
This commit is contained in:
Bixilon 2022-02-25 00:15:01 +01:00
parent e2a91512be
commit c6e9d69044
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/bixilon/minosoft/data/inventory/click/SimpleContainerAction.kt
View File

@ -45,12 +45,12 @@ class SimpleContainerAction(
floatingItem.lock() floatingItem.lock()
val target = container.slots[slot] val target = container.slots[slot]
try { try {
if (count == ContainerCounts.ALL) {
floatingItem.item._count = 0
} else {
floatingItem.item._count-- // don't use decrease, item + container is already locked
}
if (slot == null) { if (slot == null) {
if (count == ContainerCounts.ALL) {
floatingItem.item._count = 0
} else {
floatingItem.item._count-- // don't use decrease, item + container is already locked
}
return connection.sendPacket(ContainerClickC2SP(containerId, container.serverRevision, null, 0, count.ordinal, container.createAction(this), mapOf(), null)) return connection.sendPacket(ContainerClickC2SP(containerId, container.serverRevision, null, 0, count.ordinal, container.createAction(this), mapOf(), null))
} }
@ -65,7 +65,7 @@ class SimpleContainerAction(
} }
// swap // swap
container.floatingItem = target container.floatingItem = target
container.slots[slot] = floatingItem container._set(slot, floatingItem)
connection.sendPacket(ContainerClickC2SP(containerId, container.serverRevision, slot, 0, count.ordinal, container.createAction(this), mapOf(slot to target), target)) connection.sendPacket(ContainerClickC2SP(containerId, container.serverRevision, slot, 0, count.ordinal, container.createAction(this), mapOf(slot to target), target))
} finally { } finally {
floatingItem.commit() floatingItem.commit()

2
src/main/java/de/bixilon/minosoft/data/registries/other/containers/Container.kt
View File

@ -113,7 +113,7 @@ open class Container(
revision++ revision++
} }
private fun _set(slotId: Int, itemStack: ItemStack?): Boolean { fun _set(slotId: Int, itemStack: ItemStack?): Boolean {
val previous = slots[slotId] val previous = slots[slotId]
if (itemStack == null) { if (itemStack == null) {
if (previous == null) { if (previous == null) {

12
src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt
View File

@ -67,8 +67,8 @@ class ItemElement(
} }
override fun onMouseEnter(position: Vec2i, absolute: Vec2i): Boolean { override fun onMouseEnter(position: Vec2i, absolute: Vec2i): Boolean {
renderWindow.window.cursorShape = CursorShapes.HAND
val stack = stack ?: return true val stack = stack ?: return true
renderWindow.window.cursorShape = CursorShapes.HAND
popper = ItemInfoPopper(guiRenderer, absolute, stack).apply { show() } popper = ItemInfoPopper(guiRenderer, absolute, stack).apply { show() }
hovered = true hovered = true
cacheUpToDate = false cacheUpToDate = false
@ -132,14 +132,10 @@ class ItemElement(
return true return true
} }
val container = itemsElement.container val container = itemsElement.container
val controlDown = guiRenderer.isKeyDown(ModifierKeys.CONTROL) if (key != KeyCodes.KEY_Q) { // ToDo: Make it configurable
val shiftDown = guiRenderer.isKeyDown(ModifierKeys.SHIFT) return true
// ToDo
when (key) {
KeyCodes.KEY_Q -> {
container.invokeAction(DropContainerAction(slotId, controlDown))
}
} }
container.invokeAction(DropContainerAction(slotId, guiRenderer.isKeyDown(ModifierKeys.CONTROL)))
return true return true
} }