DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Add built in LazyOptional to EnergyStorageImpl

Browse Source
This commit is contained in:
DBotThePony 2022-01-30 17:00:13 +07:00
parent f12ccc84e2
commit 6e02402f06
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityChemicalGenerator.kt
View File

@ -41,7 +41,6 @@ class BlockEntityChemicalGenerator(pos: BlockPos, state: BlockState) : BlockEnti
} }
private var valid = true private var valid = true
private var resolver = LazyOptional.of {energy}
@JvmField @JvmField
val energy = GeneratorEnergyStorage(this::setChangedLight, MAX_ENERGY, THROUGHPUT) val energy = GeneratorEnergyStorage(this::setChangedLight, MAX_ENERGY, THROUGHPUT)
@ -53,7 +52,7 @@ class BlockEntityChemicalGenerator(pos: BlockPos, state: BlockState) : BlockEnti
override fun <T> getCapability(cap: Capability<T>, side: Direction?): LazyOptional<T> { override fun <T> getCapability(cap: Capability<T>, side: Direction?): LazyOptional<T> {
if (valid && (cap === MatteryCapability.ENERGY || cap === CapabilityEnergy.ENERGY) && side !== blockState.getValue(BlockMatteryRotatable.FACING)) if (valid && (cap === MatteryCapability.ENERGY || cap === CapabilityEnergy.ENERGY) && side !== blockState.getValue(BlockMatteryRotatable.FACING))
return resolver.cast() return energy.resolver.cast()
if (valid && cap === CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) if (valid && cap === CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
return itemHandler.get().cast() return itemHandler.get().cast()
@ -64,15 +63,15 @@ class BlockEntityChemicalGenerator(pos: BlockPos, state: BlockState) : BlockEnti
override fun invalidateCaps() { override fun invalidateCaps() {
super.invalidateCaps() super.invalidateCaps()
itemHandler.invalidate() itemHandler.invalidate()
energy.invalidate()
valid = false valid = false
resolver.invalidate()
} }
override fun reviveCaps() { override fun reviveCaps() {
super.reviveCaps() super.reviveCaps()
itemHandler.revive() itemHandler.revive()
energy.revive()
valid = true valid = true
resolver = LazyOptional.of {energy}
} }
override fun setLevel(level: Level) { override fun setLevel(level: Level) {

12
src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryMachineEnergyStorage.kt
View File

@ -3,6 +3,7 @@ package ru.dbotthepony.mc.otm.capability
import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.CompoundTag
import net.minecraft.world.level.block.entity.BlockEntity import net.minecraft.world.level.block.entity.BlockEntity
import net.minecraftforge.common.util.INBTSerializable import net.minecraftforge.common.util.INBTSerializable
import net.minecraftforge.common.util.LazyOptional
import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.core.ImpreciseFraction
import ru.dbotthepony.mc.otm.ifHas import ru.dbotthepony.mc.otm.ifHas
import ru.dbotthepony.mc.otm.set import ru.dbotthepony.mc.otm.set
@ -86,6 +87,17 @@ sealed class EnergyStorageImpl constructor(
// nbt.ifHas("max_output") { maxOutput = deserializeNBT(it) } // nbt.ifHas("max_output") { maxOutput = deserializeNBT(it) }
} }
var resolver: LazyOptional<IMatteryEnergyStorage> = LazyOptional.of { this }
private set
fun invalidate() {
resolver.invalidate()
}
fun revive() {
resolver = LazyOptional.of { this }
}
companion object { companion object {
val DEFAULT_MAX_IO = ImpreciseFraction(200) val DEFAULT_MAX_IO = ImpreciseFraction(200)
val DEFAULT_MAX_CAPACITY = ImpreciseFraction(60_000) val DEFAULT_MAX_CAPACITY = ImpreciseFraction(60_000)