Enable inventory scrollbar when having exopack installed, and not having at least 1 extra slot in it

This commit is contained in:
DBotThePony 2023-08-21 00:27:32 +07:00
parent dd91bd2f17
commit 15b718f28a
Signed by: DBot
GPG Key ID: DCC23B5715498507

View File

@ -209,12 +209,9 @@ abstract class MatteryScreen<T : MatteryMenu>(menu: T, inventory: Inventory, tit
if (menu.playerInventorySlots.isNotEmpty() && menu.autoCreateInventoryFrame) {
val deviceControls: DeviceControls<MatteryScreen<*>>
if (menu.playerCombinedInventorySlots.size <= 27) {
if (menu.player.matteryPlayer?.hasExopack != true) {
inventoryFrame = FramePanel<MatteryScreen<*>>(this, null, 0f, 0f, INVENTORY_FRAME_WIDTH, INVENTORY_FRAME_HEIGHT, inventory.displayName).also(this::addPanel)
inventoryFrame!!.makeHelpButton().addSlotFiltersHelp().also {
if (menu.player.matteryPlayer?.hasExopack == true)
it.tooltips.add(TranslatableComponent("otm.gui.help.slot_charging"))
}
inventoryFrame!!.makeHelpButton().addSlotFiltersHelp()
deviceControls = DeviceControls(this, inventoryFrame!!)
@ -247,8 +244,7 @@ abstract class MatteryScreen<T : MatteryMenu>(menu: T, inventory: Inventory, tit
} else {
inventoryFrame = FramePanel<MatteryScreen<*>>(this, null, 0f, 0f, INVENTORY_FRAME_WIDTH_EXTENDED, BASE_INVENTORY_FRAME_HEIGHT + AbstractSlotPanel.SIZE * inventoryRows, inventory.displayName).also(this::addPanel)
inventoryFrame!!.makeHelpButton().addSlotFiltersHelp().also {
if (menu.player.matteryPlayer?.hasExopack == true)
it.tooltips.add(TranslatableComponent("otm.gui.help.slot_charging"))
it.tooltips.add(TranslatableComponent("otm.gui.help.slot_charging"))
}
deviceControls = DeviceControls(this, inventoryFrame!!)