From 7ce30ffd8183c2c04deed226d021bd5c49dff9dc Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 30 Jul 2023 11:06:08 +0700 Subject: [PATCH] Add beforeBroadcast protected open method to mattery menus --- src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt | 6 ++++++ .../ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) 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 3fd0165cd..db3244d76 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt @@ -404,7 +404,13 @@ abstract class MatteryMenu @JvmOverloads protected constructor( private var broadcastOnce = false + protected open fun beforeBroadcast() { + + } + protected fun matteryBroadcast() { + beforeBroadcast() + val payload = mSynchronizer.collectNetworkPayload() if (payload != null) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt index 7898683ff..6d98b6857 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt @@ -52,7 +52,9 @@ class EnergyCounterMenu @JvmOverloads constructor( // TODO: Graph and proper networking for it private var ticksPassed = 0 - override fun broadcastChanges() { + override fun beforeBroadcast() { + super.beforeBroadcast() + if (tile is EnergyCounterBlockEntity) { passed = tile.passed average = tile.calcAverage(20) @@ -67,8 +69,6 @@ class EnergyCounterMenu @JvmOverloads constructor( maxIO = tile.ioLimit?.toBigDecmial() ?: -BigDecimal.ONE } - - super.broadcastChanges() } companion object {