From 54ba7e94c6e444f5bbb438832d4b9814db7fb653 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 4 Jan 2024 19:59:57 +0700 Subject: [PATCH] Cursor type for android research tree --- .../mc/otm/client/screen/tech/AndroidStationScreen.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt index 989e501af..3bac104b9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt @@ -15,6 +15,7 @@ import ru.dbotthepony.mc.otm.android.AndroidResearchManager import ru.dbotthepony.mc.otm.android.AndroidResearchType import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability import ru.dbotthepony.mc.otm.capability.MatteryCapability +import ru.dbotthepony.mc.otm.client.CursorType import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.playGuiClickSound @@ -284,6 +285,9 @@ private class AndroidResearchButton( } } + override val cursorType: CursorType + get() = if (node.isAnyBlockerResearchedIndirect && !(parent?.screen as AndroidStationScreen).menu.player.isCreative) CursorType.NOT_ALLOWED else if (node.canResearch && !node.isResearched) CursorType.HAND else CursorType.ARROW + override fun innerRender(graphics: MGUIGraphics, mouseX: Float, mouseY: Float, partialTick: Float) { val hovered = screen.hoveredResearch @@ -394,12 +398,13 @@ private class AndroidResearchButton( MatteryPlayerNetworkChannel.sendToServer(AndroidResearchRequestPacket(node.type)) } ) + + playGuiClickSound() } else { MatteryPlayerNetworkChannel.sendToServer(AndroidResearchRequestPacket(node.type)) + playGuiClickSound() } } - - playGuiClickSound() } return true