From c887025a6c492662bee91b27541f259c67678d70 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 22 Jul 2023 12:05:41 +0700 Subject: [PATCH] Fix when Mattery energy is exposed as Mekanism energy it ignore energy flow direction Just like Mekanism for a long time ignored throughput limits when something charge its items through Forge Energy --- .../kotlin/ru/dbotthepony/mc/otm/compat/mekanism/Power.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 451a4070b..583df483c 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 @@ -170,11 +170,11 @@ class Mattery2MekanismEnergyWrapper(private val power: IMatteryEnergyStorage) : override fun insertEnergy(container: Int, howMuch: FloatingLong, action: Action): FloatingLong { val copy = howMuch.copy() - return copy.minusEqual((power.receiveEnergy(howMuch.toDecimal() * Mekanism2MatteryEnergyWrapper.mekanism2MtJ, action.simulate()) * mtj2Mekanism).toFloatingLong()) + return copy.minusEqual((power.receiveEnergyChecked(howMuch.toDecimal() * Mekanism2MatteryEnergyWrapper.mekanism2MtJ, action.simulate()) * mtj2Mekanism).toFloatingLong()) } override fun extractEnergy(container: Int, howMuch: FloatingLong, action: Action): FloatingLong { - return (power.extractEnergy(howMuch.toDecimal() * Mekanism2MatteryEnergyWrapper.mekanism2MtJ, action.simulate()) * mtj2Mekanism).toFloatingLong() + return (power.extractEnergyChecked(howMuch.toDecimal() * Mekanism2MatteryEnergyWrapper.mekanism2MtJ, action.simulate()) * mtj2Mekanism).toFloatingLong() } }