From edccc75e0189d295b9cc3025a371714d284fe551 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Wed, 26 Jan 2022 13:11:42 +0700 Subject: [PATCH] Update matter bottler code --- .../otm/block/entity/BlockEntityMatterBottler.kt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.kt index ce8766f11..0d8ad8e01 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.kt @@ -188,11 +188,9 @@ class BlockEntityMatterBottler(p_155229_: BlockPos, p_155230_: BlockState) : } fun getWorkProgress(): Float { - if (lastWorkStack == null) { - return 0f - } - - val resolver = lastWorkStack!!.getCapability(MatteryCapability.MATTER).resolve() + val lastWorkStack = lastWorkStack ?: return 0f + val initialCapacity = initialCapacity ?: return 0f + val resolver = lastWorkStack.getCapability(MatteryCapability.MATTER).resolve() if (resolver.isEmpty) { return 0f @@ -201,18 +199,18 @@ class BlockEntityMatterBottler(p_155229_: BlockPos, p_155230_: BlockState) : val cap = resolver.get() if (this.workFlow) { - if (cap.maxStoredMatter - initialCapacity!! <= ImpreciseFraction.ZERO) { + if (cap.maxStoredMatter - initialCapacity <= ImpreciseFraction.ZERO) { return 0f } - return ((cap.storedMatter - initialCapacity!!) / (cap.maxStoredMatter - initialCapacity!!)).toFloat() + return ((cap.storedMatter - initialCapacity) / (cap.maxStoredMatter - initialCapacity)).toFloat() } - if (initialCapacity!! <= ImpreciseFraction.ZERO) { + if (initialCapacity <= ImpreciseFraction.ZERO) { return 0f } - return (ImpreciseFraction.ONE - cap.storedMatter / initialCapacity!!).toFloat() + return (ImpreciseFraction.ONE - cap.storedMatter / initialCapacity).toFloat() } override fun setRemoved() {