DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Fix quick move to nearby chests treating every chest equally

Browse Source 
and possibly creating situation where items of one type of one of chests go into empty slots of different (unrelated) chest(s)
This commit is contained in:
DBotThePony 2025-03-18 22:55:17 +07:00
parent 06a621d370
commit 36f6a12395
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/ru/dbotthepony/mc/otm/menu/QuickMoveInput.kt
View File

@ -22,6 +22,7 @@ class QuickMoveInput(private val menu: MatteryMenu, val from: Collection<Slot>,
Widgets18.RESTOCK_TO_STORAGE Widgets18.RESTOCK_TO_STORAGE
) { ) {
override fun move(from: Collection<Slot>, to: Collection<Slot>, player: Player) { override fun move(from: Collection<Slot>, to: Collection<Slot>, player: Player) {
if (from.isEmpty() || to.isEmpty()) return
val (_, itemsFrom) = computeSlotLists(from, true) val (_, itemsFrom) = computeSlotLists(from, true)
val (_, itemsTo) = computeSlotLists(to, false) val (_, itemsTo) = computeSlotLists(to, false)
@ -39,6 +40,7 @@ class QuickMoveInput(private val menu: MatteryMenu, val from: Collection<Slot>,
Widgets18.RESTOCK_WITH_MOVE_TO_STORAGE Widgets18.RESTOCK_WITH_MOVE_TO_STORAGE
) { ) {
override fun move(from: Collection<Slot>, to: Collection<Slot>, player: Player) { override fun move(from: Collection<Slot>, to: Collection<Slot>, player: Player) {
if (from.isEmpty() || to.isEmpty()) return
val (_, itemsFrom) = computeSlotLists(from, true) val (_, itemsFrom) = computeSlotLists(from, true)
val (emptyTo, itemsTo) = computeSlotLists(to, false) val (emptyTo, itemsTo) = computeSlotLists(to, false)
@ -60,6 +62,7 @@ class QuickMoveInput(private val menu: MatteryMenu, val from: Collection<Slot>,
Widgets18.MOVE_EVERYTHING_TO_STORAGE Widgets18.MOVE_EVERYTHING_TO_STORAGE
) { ) {
override fun move(from: Collection<Slot>, to: Collection<Slot>, player: Player) { override fun move(from: Collection<Slot>, to: Collection<Slot>, player: Player) {
if (from.isEmpty() || to.isEmpty()) return
val toSorted = prioritySortSlots(to) val toSorted = prioritySortSlots(to)
from.forEach { from.forEach {

14
src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerPackets.kt
View File

@ -470,8 +470,6 @@ class QuickStackPacket(
val ignoreBlockstates = HashSet<BlockState>() val ignoreBlockstates = HashSet<BlockState>()
findCaps.forEach { (b, _) -> ignoreBlockstates.add(b.blockState) } findCaps.forEach { (b, _) -> ignoreBlockstates.add(b.blockState) }
val slots = ArrayList<Slot>()
for ((blockEntity, cap) in findCaps) { for ((blockEntity, cap) in findCaps) {
// don't interact through walls // don't interact through walls
val trace = player.serverLevel().isBlockInLine(ClipBlockStateContext(eyes, Vector.atCenterOf(blockEntity.blockPos)) { val trace = player.serverLevel().isBlockInLine(ClipBlockStateContext(eyes, Vector.atCenterOf(blockEntity.blockPos)) {
@ -479,16 +477,12 @@ class QuickStackPacket(
}) })
if (trace.blockPos == blockEntity.blockPos) { if (trace.blockPos == blockEntity.blockPos) {
slots.addAll(cap.getSlotsFor(player))
}
}
if (slots.isEmpty()) return
if (fromExopack) if (fromExopack)
mode.move(player.matteryPlayer.exoPackMenu.playerCombinedInventorySlots, slots, player) mode.move(player.matteryPlayer.exoPackMenu.playerCombinedInventorySlots, cap.getSlotsFor(player), player)
else else
mode.move(slots, player.matteryPlayer.exoPackMenu.playerInventorySlots, player) mode.move(cap.getSlotsFor(player), player.matteryPlayer.exoPackMenu.playerInventorySlots, player)
}
}
} }
override fun type(): CustomPacketPayload.Type<out CustomPacketPayload> { override fun type(): CustomPacketPayload.Type<out CustomPacketPayload> {