diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt index 0c3179bd0..37131c37e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt @@ -176,7 +176,7 @@ abstract class MatteryMenu( 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 = Collections.unmodifiableList(_playerInventorySlots) @@ -282,7 +282,7 @@ abstract class MatteryMenu( val slot = InventorySlot(mattery.combinedInventory, i) - _playerInventorySlots.add(slot) + // _playerInventorySlots.add(slot) if (i <= 8) _playerHotbarSlots.add(slot) @@ -294,6 +294,9 @@ abstract class MatteryMenu( addSlot(slot) } + _playerInventorySlots.addAll(_playerCombinedInventorySlots) + _playerInventorySlots.addAll(_playerHotbarSlots) + if (mattery.hasExopack) { _exopackChargeSlots.add(BatteryMenuSlot(mattery.exopackEnergy.parent, 0, direction = FlowDirection.OUTPUT).also { mapQuickMoveToExternal(it); mapQuickMoveToInventory(it); addSlot(it) })