From 564622e6fa0aec7f8fd3c3c06a6935e583845192 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 12 Aug 2024 22:23:58 +0700 Subject: [PATCH] null assert player --- .../panels/button/BooleanRectangleButtonPanel.kt | 2 +- .../mc/otm/client/screen/panels/button/Buttons.kt | 10 +++++----- .../client/screen/panels/button/CheckBoxInputPanel.kt | 2 +- .../screen/panels/button/EnumRectangleButtonPanel.kt | 2 +- .../screen/panels/input/NetworkedStringInputPanel.kt | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/BooleanRectangleButtonPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/BooleanRectangleButtonPanel.kt index 64f0a7217..48383f668 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/BooleanRectangleButtonPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/BooleanRectangleButtonPanel.kt @@ -72,7 +72,7 @@ abstract class BooleanRectangleButtonPanel( override var isDisabled: Boolean get() { if (prop is IPlayerInputWithFeedback) { - return !prop.test(minecraft.player) + return !prop.test(minecraft.player!!) } else { return super.isDisabled } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt index f2dcf4bab..46201392c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt @@ -60,7 +60,7 @@ private fun > makeRedstoneSettingButton( prop = control, ) { override var isDisabled: Boolean - get() = !control.test(minecraft.player) + get() = !control.test(minecraft.player!!) set(value) {} init { @@ -83,11 +83,11 @@ private class PullPushButton, T : Enum>( val pushProp: BooleanInputWithFeedback ) : LargeEnumRectangleButtonPanel(screen, parent, x = x, y = y, enum = enum, prop = prop, defaultValue = defaultValue) { init { - if (pullProp.test(minecraft.player)) { + if (pullProp.test(minecraft.player!!)) { tooltips.add(TranslatableComponent("otm.gui.sides.pull_help").withStyle(ChatFormatting.GRAY)) } - if (pushProp.test(minecraft.player)) { + if (pushProp.test(minecraft.player!!)) { tooltips.add(TranslatableComponent("otm.gui.sides.push_help").withStyle(ChatFormatting.GRAY)) } } @@ -106,11 +106,11 @@ private class PullPushButton, T : Enum>( override fun onClick(mouseButton: Int) { if (mouseButton != InputConstants.MOUSE_BUTTON_MIDDLE && minecraft.window.isShiftDown) { - if (pullProp.test(minecraft.player)) { + if (pullProp.test(minecraft.player!!)) { pullProp.switchValue() } } else if (mouseButton != InputConstants.MOUSE_BUTTON_MIDDLE && minecraft.window.isCtrlDown) { - if (pushProp.test(minecraft.player)) { + if (pushProp.test(minecraft.player!!)) { pushProp.switchValue() } } else { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/CheckBoxInputPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/CheckBoxInputPanel.kt index 899242293..fe0559eb5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/CheckBoxInputPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/CheckBoxInputPanel.kt @@ -15,6 +15,6 @@ open class CheckBoxInputPanel( height: Float = REGULAR_DIMENSIONS ) : CheckBoxPanel(screen, parent, x, y, width, height, isChecked = widget) { override var isDisabled: Boolean - get() = !widget.test(minecraft.player) + get() = !widget.test(minecraft.player!!) set(value) {} } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumRectangleButtonPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumRectangleButtonPanel.kt index c4d7aa32b..9cc623ea4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumRectangleButtonPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumRectangleButtonPanel.kt @@ -37,7 +37,7 @@ abstract class EnumRectangleButtonPanel>( override var isDisabled: Boolean get() { if (prop is IPlayerInputWithFeedback) { - return !prop.test(minecraft.player) + return !prop.test(minecraft.player!!) } else { return super.isDisabled } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/NetworkedStringInputPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/NetworkedStringInputPanel.kt index c5ad5d7d8..96c7cebff 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/NetworkedStringInputPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/NetworkedStringInputPanel.kt @@ -17,13 +17,13 @@ open class NetworkedStringInputPanel( height: Float = 11f, ) : TextInputPanel(screen, parent, x, y, width, height) { override var isActive: Boolean - get() = backend.test(minecraft.player) + get() = backend.test(minecraft.player!!) set(value) {} override fun onFocusChanged() { super.onFocusChanged() - if (isFocusedThis && !backend.test(minecraft.player)) { + if (isFocusedThis && !backend.test(minecraft.player!!)) { killFocus() } }