From 254faa7a6472ca58e5cb086f43a2f38138e68858 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 13 Oct 2022 14:25:43 +0700 Subject: [PATCH] Move isOnCooldown to AndroidActiveFeature --- .../kotlin/ru/dbotthepony/mc/otm/android/AndroidActiveFeature.kt | 1 + .../ru/dbotthepony/mc/otm/android/AndroidSwitchableFeature.kt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidActiveFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidActiveFeature.kt index 3c808dcee..3ebcae47c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidActiveFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidActiveFeature.kt @@ -12,6 +12,7 @@ abstract class AndroidActiveFeature(type: AndroidFeatureType<*>, android: Matter abstract fun activate(isClient: Boolean): Boolean open val previewRenderStage: RenderLevelStageEvent.Stage get() = RenderLevelStageEvent.Stage.AFTER_TRANSLUCENT_BLOCKS + open val isOnCooldown: Boolean get() = false /** * Called on client inside world render context to render previews of ability activation diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidSwitchableFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidSwitchableFeature.kt index 1336d2703..ea8a5b3eb 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidSwitchableFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidSwitchableFeature.kt @@ -22,7 +22,6 @@ abstract class AndroidSwitchableFeature(type: AndroidFeatureType<*>, android: Ma open val allowToSwitchByPlayer: Boolean get() = true open val allowToSwitchByPlayerWhileSpectator: Boolean get() = true - open val isOnCooldown: Boolean get() = false // TODO: PoseStack is stripped from server dist // but it doesn't seem to cause issues?