From 0d3dc3a5fd4afd1fe7214f8896beedfa847e1c52 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 3 Jul 2022 23:34:33 +0700 Subject: [PATCH] move index to property --- .../dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt index 6f807c304..d30a4a091 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt @@ -51,8 +51,9 @@ class ItemMonitorScreen(menu: ItemMonitorMenu, inventory: Inventory, title: Comp for (i in 0 until ITEM_GRID_WIDTH * ITEM_GRID_HEIGHT) { object : AbstractSlotPanel(this@ItemMonitorScreen, gridPanel) { + private val index get() = i + viewScrollBar.getScroll(equalDownDivision(menu.view.itemCount, ITEM_GRID_WIDTH)) * ITEM_GRID_WIDTH + override fun getItemStack(): ItemStack { - val index = i + viewScrollBar.getScroll(equalDownDivision(menu.view.itemCount, ITEM_GRID_WIDTH)) * ITEM_GRID_WIDTH return menu.view.sortedView.getOrNull(index)?.stack?.item ?: ItemStack.EMPTY } @@ -61,7 +62,6 @@ class ItemMonitorScreen(menu: ItemMonitorMenu, inventory: Inventory, title: Comp } override fun mouseClickedInner(mouse_x: Double, mouse_y: Double, mouse_click_type: Int): Boolean { - val index = i + viewScrollBar.getScroll(equalDownDivision(menu.view.itemCount, ITEM_GRID_WIDTH)) * ITEM_GRID_WIDTH menu.view.mouseClick(index, mouse_click_type) return true } @@ -69,7 +69,6 @@ class ItemMonitorScreen(menu: ItemMonitorMenu, inventory: Inventory, title: Comp override fun innerRender(stack: PoseStack, mouse_x: Float, mouse_y: Float, flag: Float) { renderSlotBackground(stack, mouse_x, mouse_y, flag) - val index = i + viewScrollBar.getScroll(equalDownDivision(menu.view.itemCount, ITEM_GRID_WIDTH)) * ITEM_GRID_WIDTH val itemstack = menu.view.sortedView.getOrNull(index)?.stack ?: ITEM_STORAGE.empty renderRegular(stack, itemstack.stack, "") @@ -96,7 +95,6 @@ class ItemMonitorScreen(menu: ItemMonitorMenu, inventory: Inventory, title: Comp override fun getItemStackTooltip(stack: ItemStack): List { return super.getItemStackTooltip(stack).also { it as MutableList - val index = i + viewScrollBar.getScroll(equalDownDivision(menu.view.itemCount, ITEM_GRID_WIDTH)) * ITEM_GRID_WIDTH val realStack = menu.view.sortedView.getOrNull(index)!!.stack it.add(TranslatableComponent("otm.gui.stored_amount", realStack.count.formatReadableNumber()).withStyle(ChatFormatting.DARK_GRAY)) }