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,10 +244,13 @@ class BatteryBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : Matte
resolverEnergyExtractor.invalidate() resolverEnergyExtractor.invalidate()
resolverEnergy.invalidate() resolverEnergy.invalidate()
resolverItemHandler.invalidate() resolverItemHandler.invalidate()
if (isMekanismLoaded) {
mekanismResolverEnergyReceiver.invalidate() mekanismResolverEnergyReceiver.invalidate()
mekanismResolverEnergyExtractor.invalidate() mekanismResolverEnergyExtractor.invalidate()
mekanismResolverEnergy.invalidate() mekanismResolverEnergy.invalidate()
} }
}
override fun reviveCaps() { override fun reviveCaps() {
super.reviveCaps() super.reviveCaps()
@ -257,10 +260,12 @@ class BatteryBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : Matte
resolverEnergy = LazyOptional.of { energy } resolverEnergy = LazyOptional.of { energy }
resolverItemHandler = LazyOptional.of { itemHandler } resolverItemHandler = LazyOptional.of { itemHandler }
if (isMekanismLoaded) {
mekanismResolverEnergyReceiver = LazyOptional.of { Mattery2MekanismEnergyWrapper(energyReceiver) } mekanismResolverEnergyReceiver = LazyOptional.of { Mattery2MekanismEnergyWrapper(energyReceiver) }
mekanismResolverEnergyExtractor = LazyOptional.of { Mattery2MekanismEnergyWrapper(energyExtractor) } mekanismResolverEnergyExtractor = LazyOptional.of { Mattery2MekanismEnergyWrapper(energyExtractor) }
mekanismResolverEnergy = LazyOptional.of { Mattery2MekanismEnergyWrapper(energy) } mekanismResolverEnergy = LazyOptional.of { Mattery2MekanismEnergyWrapper(energy) }
} }
}
override fun setLevel(p_155231_: Level) { override fun setLevel(p_155231_: Level) {
super.setLevel(p_155231_) super.setLevel(p_155231_)