Merge remote-tracking branch 'origin/master'

This commit is contained in:
GearShocky 2022-12-02 03:32:09 +06:00
commit 9fce3e2242

View File

@ -244,9 +244,12 @@ class BatteryBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : Matte
resolverEnergyExtractor.invalidate()
resolverEnergy.invalidate()
resolverItemHandler.invalidate()
mekanismResolverEnergyReceiver.invalidate()
mekanismResolverEnergyExtractor.invalidate()
mekanismResolverEnergy.invalidate()
if (isMekanismLoaded) {
mekanismResolverEnergyReceiver.invalidate()
mekanismResolverEnergyExtractor.invalidate()
mekanismResolverEnergy.invalidate()
}
}
override fun reviveCaps() {
@ -257,9 +260,11 @@ class BatteryBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : Matte
resolverEnergy = LazyOptional.of { energy }
resolverItemHandler = LazyOptional.of { itemHandler }
mekanismResolverEnergyReceiver = LazyOptional.of { Mattery2MekanismEnergyWrapper(energyReceiver) }
mekanismResolverEnergyExtractor = LazyOptional.of { Mattery2MekanismEnergyWrapper(energyExtractor) }
mekanismResolverEnergy = LazyOptional.of { Mattery2MekanismEnergyWrapper(energy) }
if (isMekanismLoaded) {
mekanismResolverEnergyReceiver = LazyOptional.of { Mattery2MekanismEnergyWrapper(energyReceiver) }
mekanismResolverEnergyExtractor = LazyOptional.of { Mattery2MekanismEnergyWrapper(energyExtractor) }
mekanismResolverEnergy = LazyOptional.of { Mattery2MekanismEnergyWrapper(energy) }
}
}
override fun setLevel(p_155231_: Level) {