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

Change quickmove slot priority to consider hotbar slots last, to match vanilla behavior

Browse Source
This commit is contained in:
DBotThePony 2025-03-17 23:15:54 +07:00
parent d48dbf3ec9
commit 8f40717ff6
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt
View File

@ -176,7 +176,7 @@ abstract class MatteryMenu(
fun intInput(allowSpectators: Boolean = false, handler: (Int) -> Unit) = PlayerInput(StreamCodecs.INT, allowSpectators, handler) fun intInput(allowSpectators: Boolean = false, handler: (Int) -> Unit) = PlayerInput(StreamCodecs.INT, allowSpectators, handler)
/** /**
* hotbar + inventory + Exopack (in this order) * inventory + Exopack + hotbar (in this order)
*/ */
val playerInventorySlots: List<InventorySlot> = Collections.unmodifiableList(_playerInventorySlots) val playerInventorySlots: List<InventorySlot> = Collections.unmodifiableList(_playerInventorySlots)
@ -282,7 +282,7 @@ abstract class MatteryMenu(
val slot = InventorySlot(mattery.combinedInventory, i) val slot = InventorySlot(mattery.combinedInventory, i)
_playerInventorySlots.add(slot) // _playerInventorySlots.add(slot)
if (i <= 8) if (i <= 8)
_playerHotbarSlots.add(slot) _playerHotbarSlots.add(slot)
@ -294,6 +294,9 @@ abstract class MatteryMenu(
addSlot(slot) addSlot(slot)
} }
_playerInventorySlots.addAll(_playerCombinedInventorySlots)
_playerInventorySlots.addAll(_playerHotbarSlots)
if (mattery.hasExopack) { if (mattery.hasExopack) {
_exopackChargeSlots.add(BatteryMenuSlot(mattery.exopackEnergy.parent, 0, direction = FlowDirection.OUTPUT).also { mapQuickMoveToExternal(it); mapQuickMoveToInventory(it); addSlot(it) }) _exopackChargeSlots.add(BatteryMenuSlot(mattery.exopackEnergy.parent, 0, direction = FlowDirection.OUTPUT).also { mapQuickMoveToExternal(it); mapQuickMoveToInventory(it); addSlot(it) })