From 6e0e0a44f2623065e74a8fc05353bc140af16035 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 27 Feb 2022 14:28:50 +0700 Subject: [PATCH] Fix mekanism joules extraction --- .../kotlin/ru/dbotthepony/mc/otm/compat/mekanism/Power.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/Power.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/Power.kt index 23efaa924..cc32cc465 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/Power.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/Power.kt @@ -44,7 +44,7 @@ class MekanismEnergyWrapper(private val power: IStrictEnergyHandler) : IMatteryE false -> Action.EXECUTE } - return howMuch - power.extractEnergy((howMuch * mekanismJoulesFromFE).toFloatingLong(), action).toImpreciseFraction() * mekanismJoulesToFE + return power.extractEnergy((howMuch * mekanismJoulesFromFE).toFloatingLong(), action).toImpreciseFraction() * mekanismJoulesToFE } override fun extractEnergyInner(howMuch: ImpreciseFraction, simulate: Boolean): ImpreciseFraction { @@ -124,8 +124,7 @@ class MatteryToMekanismEnergyWrapper(private val power: IMatteryEnergyStorage) : } override fun extractEnergy(container: Int, howMuch: FloatingLong, action: Action): FloatingLong { - val copy = howMuch.copy() - return copy.minusEqual((power.extractEnergyOuter(howMuch.toImpreciseFraction() * mekanismJoulesToFE, action.simulate()) * mekanismJoulesFromFE).toFloatingLong()) + return (power.extractEnergyOuter(howMuch.toImpreciseFraction() * mekanismJoulesToFE, action.simulate()) * mekanismJoulesFromFE).toFloatingLong() } }