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

Ignore slot filters when taking from chests

Browse Source
This commit is contained in:
DBotThePony 2025-03-19 10:57:24 +07:00
parent 36f6a12395
commit bd4622fc0d
Signed by: DBot
GPG Key ID: DCC23B5715498507
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/ru/dbotthepony/mc/otm/compat/vanilla/MatteryChestMenu.kt
View File

@ -24,7 +24,7 @@ class MatteryChestMenu(
} }
override val quickMoveToStorage = QuickMoveInput.create(this, playerCombinedInventorySlots, containerSlots) override val quickMoveToStorage = QuickMoveInput.create(this, playerCombinedInventorySlots, containerSlots)
override val quickMoveFromStorage = QuickMoveInput.create(this, containerSlots, playerInventorySlots) override val quickMoveFromStorage = QuickMoveInput.create(this, containerSlots, playerInventorySlots, false)
companion object { companion object {
@JvmStatic @JvmStatic

2
src/main/kotlin/ru/dbotthepony/mc/otm/compat/vanilla/MatteryShulkerBoxMenu.kt
View File

@ -26,7 +26,7 @@ class MatteryShulkerBoxMenu(
} }
override val quickMoveToStorage = QuickMoveInput.create(this, playerCombinedInventorySlots, containerSlots) override val quickMoveToStorage = QuickMoveInput.create(this, playerCombinedInventorySlots, containerSlots)
override val quickMoveFromStorage = QuickMoveInput.create(this, containerSlots, playerInventorySlots) override val quickMoveFromStorage = QuickMoveInput.create(this, containerSlots, playerInventorySlots, false)
class Slot(container: Container, slot: Int) : MatteryMenuSlot(container, slot) { class Slot(container: Container, slot: Int) : MatteryMenuSlot(container, slot) {
override fun mayPlace(stack: ItemStack): Boolean { override fun mayPlace(stack: ItemStack): Boolean {

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

@ -15,15 +15,15 @@ import ru.dbotthepony.mc.otm.core.util.ItemStackKey
import ru.dbotthepony.mc.otm.core.util.asKey import ru.dbotthepony.mc.otm.core.util.asKey
import ru.dbotthepony.mc.otm.core.util.asKeyOrNull import ru.dbotthepony.mc.otm.core.util.asKeyOrNull
class QuickMoveInput(private val menu: MatteryMenu, val from: Collection<Slot>, val to: Collection<Slot>, val mode: Mode) { class QuickMoveInput(private val menu: MatteryMenu, val from: Collection<Slot>, val to: Collection<Slot>, val mode: Mode, val dontTouchFilteredSlots: Boolean = true) {
enum class Mode(val iconFromStorage: AbstractMatterySprite, val iconToStorage: AbstractMatterySprite) { enum class Mode(val iconFromStorage: AbstractMatterySprite, val iconToStorage: AbstractMatterySprite) {
RESTOCK( RESTOCK(
Widgets18.RESTOCK_FROM_STORAGE, Widgets18.RESTOCK_FROM_STORAGE,
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, dontTouchFilteredSlots: Boolean) {
if (from.isEmpty() || to.isEmpty()) return if (from.isEmpty() || to.isEmpty()) return
val (_, itemsFrom) = computeSlotLists(from, true) val (_, itemsFrom) = computeSlotLists(from, dontTouchFilteredSlots)
val (_, itemsTo) = computeSlotLists(to, false) val (_, itemsTo) = computeSlotLists(to, false)
val intersect = if (itemsFrom.size < itemsTo.size) itemsFrom.keys.filter { it in itemsTo.keys } else itemsTo.keys.filter { it in itemsFrom.keys } val intersect = if (itemsFrom.size < itemsTo.size) itemsFrom.keys.filter { it in itemsTo.keys } else itemsTo.keys.filter { it in itemsFrom.keys }
@ -39,9 +39,9 @@ class QuickMoveInput(private val menu: MatteryMenu, val from: Collection<Slot>,
Widgets18.RESTOCK_WITH_MOVE_FROM_STORAGE, Widgets18.RESTOCK_WITH_MOVE_FROM_STORAGE,
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, dontTouchFilteredSlots: Boolean) {
if (from.isEmpty() || to.isEmpty()) return if (from.isEmpty() || to.isEmpty()) return
val (_, itemsFrom) = computeSlotLists(from, true) val (_, itemsFrom) = computeSlotLists(from, dontTouchFilteredSlots)
val (emptyTo, itemsTo) = computeSlotLists(to, false) val (emptyTo, itemsTo) = computeSlotLists(to, false)
val intersect = if (itemsFrom.size < itemsTo.size) itemsFrom.keys.filter { it in itemsTo.keys } else itemsTo.keys.filter { it in itemsFrom.keys } val intersect = if (itemsFrom.size < itemsTo.size) itemsFrom.keys.filter { it in itemsTo.keys } else itemsTo.keys.filter { it in itemsFrom.keys }
@ -61,20 +61,20 @@ class QuickMoveInput(private val menu: MatteryMenu, val from: Collection<Slot>,
Widgets18.MOVE_EVERYTHING_FROM_STORAGE, Widgets18.MOVE_EVERYTHING_FROM_STORAGE,
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, dontTouchFilteredSlots: Boolean) {
if (from.isEmpty() || to.isEmpty()) return if (from.isEmpty() || to.isEmpty()) return
val toSorted = prioritySortSlots(to) val toSorted = prioritySortSlots(to)
from.forEach { from.forEach {
val slot = it.containerSlotOrNull() val slot = it.containerSlotOrNull()
if (slot !is IFilteredContainerSlot || !slot.hasFilter) if (!dontTouchFilteredSlots || slot !is IFilteredContainerSlot || !slot.hasFilter)
moveItemStackTo(player, it, toSorted, sort = false) moveItemStackTo(player, it, toSorted, sort = false)
} }
} }
}; };
abstract fun move(from: Collection<Slot>, to: Collection<Slot>, player: Player) abstract fun move(from: Collection<Slot>, to: Collection<Slot>, player: Player, dontTouchFilteredSlots: Boolean = true)
val textFromStorage: Component get() { val textFromStorage: Component get() {
return TranslatableComponent("otm.gui.quickmove_from.${name.lowercase()}") return TranslatableComponent("otm.gui.quickmove_from.${name.lowercase()}")
@ -92,12 +92,12 @@ class QuickMoveInput(private val menu: MatteryMenu, val from: Collection<Slot>,
} }
private fun handle() { private fun handle() {
mode.move(from, to, menu.player) mode.move(from, to, menu.player, dontTouchFilteredSlots)
} }
companion object { companion object {
fun create(menu: MatteryMenu, from: Collection<Slot>, to: Collection<Slot>): Map<Mode, QuickMoveInput> { fun create(menu: MatteryMenu, from: Collection<Slot>, to: Collection<Slot>, dontTouchFilteredSlots: Boolean = true): Map<Mode, QuickMoveInput> {
return Mode.entries.associateWith { QuickMoveInput(menu, from, to, it) } return Mode.entries.associateWith { QuickMoveInput(menu, from, to, it, dontTouchFilteredSlots) }
} }
private fun computeSlotLists(slots: Collection<Slot>, skipFilteredSlots: Boolean): Pair<MutableList<Slot>, MutableMap<ItemStackKey, MutableList<Slot>>> { private fun computeSlotLists(slots: Collection<Slot>, skipFilteredSlots: Boolean): Pair<MutableList<Slot>, MutableMap<ItemStackKey, MutableList<Slot>>> {

2
src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/CargoCrateMenu.kt
View File

@ -22,7 +22,7 @@ class CargoCrateMenu(
val sort = SortInput(this, actualContainer, playerSortSettings) val sort = SortInput(this, actualContainer, playerSortSettings)
val quickMoveToStorage = QuickMoveInput.create(this, playerCombinedInventorySlots, storageSlots) val quickMoveToStorage = QuickMoveInput.create(this, playerCombinedInventorySlots, storageSlots)
val quickMoveFromStorage = QuickMoveInput.create(this, storageSlots, playerInventorySlots) val quickMoveFromStorage = QuickMoveInput.create(this, storageSlots, playerInventorySlots, false)
init { init {
if (trackedPlayerOpen) { if (trackedPlayerOpen) {

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

@ -480,7 +480,7 @@ class QuickStackPacket(
if (fromExopack) if (fromExopack)
mode.move(player.matteryPlayer.exoPackMenu.playerCombinedInventorySlots, cap.getSlotsFor(player), player) mode.move(player.matteryPlayer.exoPackMenu.playerCombinedInventorySlots, cap.getSlotsFor(player), player)
else else
mode.move(cap.getSlotsFor(player), player.matteryPlayer.exoPackMenu.playerInventorySlots, player) mode.move(cap.getSlotsFor(player), player.matteryPlayer.exoPackMenu.playerInventorySlots, player, false)
} }
} }
} }