From bf00ab5ea87131f86b91ecd1c6130c8063ad7bcb Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 10 Oct 2022 10:29:46 +0700 Subject: [PATCH] Add missing mekanism capability wrapper for quantum battery --- .../kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt index bed1d5f74..cd7ef386c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt @@ -24,6 +24,7 @@ import net.minecraftforge.registries.ForgeRegistries import net.minecraftforge.registries.ForgeRegistry import ru.dbotthepony.mc.otm.* import ru.dbotthepony.mc.otm.capability.* +import ru.dbotthepony.mc.otm.compat.mekanism.Mattery2MekanismEnergyWrapper import ru.dbotthepony.mc.otm.core.itemStackIterator import ru.dbotthepony.mc.otm.core.nonEmpty import ru.dbotthepony.mc.otm.core.* @@ -75,11 +76,15 @@ class QuantumBatteryItem : Item { private inner class Power(private val stack: ItemStack) : IMatteryEnergyStorage, ICapabilityProvider { private val resolver = LazyOptional.of { this } + private val resolverMekanism = if (isMekanismLoaded) LazyOptional.of { Mattery2MekanismEnergyWrapper(this) } else null + var data = Data() override fun getCapability(cap: Capability, side: Direction?): LazyOptional { if (cap == ForgeCapabilities.ENERGY || cap == MatteryCapability.ENERGY) { return resolver.cast() + } else if (cap == MatteryCapability.MEKANISM_ENERGY) { + return resolverMekanism?.cast() ?: LazyOptional.empty() } return LazyOptional.empty()