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

Use networked field directly as backing fluid field

Browse Source
This commit is contained in:
DBotThePony 2024-01-09 12:01:38 +07:00
parent 7e5ea3be8d
commit a5c1d7fbf8
Signed by: DBot
GPG Key ID: DCC23B5715498507
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/FluidTankBlock.kt
View File

@ -62,7 +62,7 @@ class FluidTankBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), Entity
val tile = level?.getExistingBlockEntity(pos) ?: lightLevel val tile = level?.getExistingBlockEntity(pos) ?: lightLevel
if (tile is FluidTankBlockEntity) { if (tile is FluidTankBlockEntity) {
val fluid = tile.synchronizedFluid val fluid = tile.fluid.fluid
if (!fluid.isEmpty) { if (!fluid.isEmpty) {
val newLevel = fluid.fluid.fluidType.getLightLevel(fluid) val newLevel = fluid.fluid.fluidType.getLightLevel(fluid)

14
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt
View File

@ -27,12 +27,15 @@ import ru.dbotthepony.mc.otm.menu.decorative.FluidTankMenu
import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.registry.MBlockEntities
class FluidTankBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryDeviceBlockEntity(MBlockEntities.FLUID_TANK, blockPos, blockState) { class FluidTankBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryDeviceBlockEntity(MBlockEntities.FLUID_TANK, blockPos, blockState) {
val fluid = BlockMatteryFluidHandler(::onChanged, ItemsConfig::FLUID_TANK_CAPACITY) val fluid = BlockMatteryFluidHandler(ItemsConfig::FLUID_TANK_CAPACITY, synchronizer.Field(FluidStack.EMPTY, FluidStackValueCodec, setter = { value, access, remote ->
var synchronizedFluid by synchronizer.Field(FluidStack.EMPTY, FluidStackValueCodec, setter = { value, access, remote ->
access.write(value) access.write(value)
level?.lightEngine?.checkBlock(blockPos) level?.lightEngine?.checkBlock(blockPos)
})
if (!remote) {
markDirtyFast()
}
}))
val fillInput = MatteryContainer(::markDirtyFast, 1).also(::addDroppableContainer) val fillInput = MatteryContainer(::markDirtyFast, 1).also(::addDroppableContainer)
val drainInput = MatteryContainer(::markDirtyFast, 1).also(::addDroppableContainer) val drainInput = MatteryContainer(::markDirtyFast, 1).also(::addDroppableContainer)
@ -73,11 +76,6 @@ class FluidTankBlockEntity(blockPos: BlockPos, blockState: BlockState) : Mattery
savetables.stateful(::output) savetables.stateful(::output)
} }
private fun onChanged(new: FluidStack, old: FluidStack) {
synchronizedFluid = new.copy()
markDirtyFast()
}
private fun drainItem() { private fun drainItem() {
val item = drainInput[0] val item = drainInput[0]

10
src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/BlockMatteryFluidHandler.kt
View File

@ -7,18 +7,14 @@ import net.minecraftforge.common.util.INBTSerializable
import net.minecraftforge.fluids.FluidStack import net.minecraftforge.fluids.FluidStack
import ru.dbotthepony.mc.otm.core.nbt.set import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.core.tagNotNull import ru.dbotthepony.mc.otm.core.tagNotNull
import ru.dbotthepony.mc.otm.network.synchronizer.IMutableField
import java.util.function.IntSupplier import java.util.function.IntSupplier
/** /**
* Fluid handler for blocks * Fluid handler for blocks
*/ */
class BlockMatteryFluidHandler(val onChanged: (new: FluidStack, old: FluidStack) -> Unit, private val _capacity: IntSupplier) : AbstractMatteryFluidHandler(), INBTSerializable<CompoundTag?> { open class BlockMatteryFluidHandler(private val _capacity: IntSupplier, field: IMutableField<FluidStack>) : AbstractMatteryFluidHandler(), INBTSerializable<CompoundTag?> {
override var fluid: FluidStack = FluidStack.EMPTY override var fluid by field
set(value) {
val old = field
field = value
onChanged(value, old)
}
override val capacity: Int override val capacity: Int
get() = _capacity.asInt get() = _capacity.asInt

2
src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/FluidTankRenderer.kt
View File

@ -32,7 +32,7 @@ class FluidTankRenderer(private val context: BlockEntityRendererProvider.Context
packedLight: Int, packedLight: Int,
packedOverlay: Int packedOverlay: Int
) { ) {
renderFluidInTank(tile.fluid, tile.synchronizedFluid, poseStack, bufferSource, packedLight, packedOverlay) renderFluidInTank(tile.fluid, tile.fluid.fluid, poseStack, bufferSource, packedLight, packedOverlay)
} }
object FluidTankItemRenderer : BlockEntityWithoutLevelRenderer(minecraft.blockEntityRenderDispatcher, minecraft.entityModels) { object FluidTankItemRenderer : BlockEntityWithoutLevelRenderer(minecraft.blockEntityRenderDispatcher, minecraft.entityModels) {