DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Update matter bottler code

Browse Source
This commit is contained in:
DBotThePony 2022-01-26 13:11:42 +07:00
parent cd9f18ef94
commit edccc75e01
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.kt
View File

@ -188,11 +188,9 @@ class BlockEntityMatterBottler(p_155229_: BlockPos, p_155230_: BlockState) :
} }
fun getWorkProgress(): Float { fun getWorkProgress(): Float {
if (lastWorkStack == null) { val lastWorkStack = lastWorkStack ?: return 0f
return 0f val initialCapacity = initialCapacity ?: return 0f
} val resolver = lastWorkStack.getCapability(MatteryCapability.MATTER).resolve()
val resolver = lastWorkStack!!.getCapability(MatteryCapability.MATTER).resolve()
if (resolver.isEmpty) { if (resolver.isEmpty) {
return 0f return 0f
@ -201,18 +199,18 @@ class BlockEntityMatterBottler(p_155229_: BlockPos, p_155230_: BlockState) :
val cap = resolver.get() val cap = resolver.get()
if (this.workFlow) { if (this.workFlow) {
if (cap.maxStoredMatter - initialCapacity!! <= ImpreciseFraction.ZERO) { if (cap.maxStoredMatter - initialCapacity <= ImpreciseFraction.ZERO) {
return 0f 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 0f
} }
return (ImpreciseFraction.ONE - cap.storedMatter / initialCapacity!!).toFloat() return (ImpreciseFraction.ONE - cap.storedMatter / initialCapacity).toFloat()
} }
override fun setRemoved() { override fun setRemoved() {