synchronization and persistant state

2026-04-18 11:53:18 +02:00
parent 834a9c7ed8
commit a4533e03bb
12 changed files with 320 additions and 98 deletions
--- a/src/main/kotlin/org/neoflock/neocomputers/entity/BlockEntities.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/entity/BlockEntities.kt
@@ -40,32 +40,32 @@ class BullshitFix: DataFixType<Unit>() {
 object BlockEntities {
    val BLOCKENTITIES: DeferredRegister<BlockEntityType<*>> = DeferredRegister.create(NeoComputers.MODID, Registries.BLOCK_ENTITY_TYPE);

-    val SCREEN_ENTITY: RegistrySupplier<BlockEntityType<ScreenEntity>> = BLOCKENTITIES.register("screen_entity") {
+    val SCREEN_ENTITY: RegistrySupplier<BlockEntityType<ScreenEntity>> = BLOCKENTITIES.register("screen") {
        BlockEntityType(
            ::ScreenEntity, mutableSetOf(Blocks.SCREEN_BLOCK.get()), BullshitFix()
        )
    }
-    val CAPACITOR_ENTITY: RegistrySupplier<BlockEntityType<CapacitorEntityTier1>> = BLOCKENTITIES.register("capacitor_entity") {
+    val CAPACITOR_ENTITY: RegistrySupplier<BlockEntityType<CapacitorEntityTier1>> = BLOCKENTITIES.register("capacitor") {
        BlockEntityType(
            ::CapacitorEntityTier1, mutableSetOf(Blocks.CAPACITOR_BLOCK.get()), BullshitFix()
        )
    }
-    val CAPACITOR2_ENTITY: RegistrySupplier<BlockEntityType<CapacitorEntityTier2>> = BLOCKENTITIES.register("capacitor_entity2") {
+    val CAPACITOR2_ENTITY: RegistrySupplier<BlockEntityType<CapacitorEntityTier2>> = BLOCKENTITIES.register("capacitor2") {
        BlockEntityType(
            ::CapacitorEntityTier2, mutableSetOf(Blocks.CAPACITOR_BLOCK2.get()), BullshitFix()
        )
    }
-    val CAPACITOR3_ENTITY: RegistrySupplier<BlockEntityType<CapacitorEntityTier3>> = BLOCKENTITIES.register("capacitor_entity3") {
+    val CAPACITOR3_ENTITY: RegistrySupplier<BlockEntityType<CapacitorEntityTier3>> = BLOCKENTITIES.register("capacitor3") {
        BlockEntityType(
            ::CapacitorEntityTier3, mutableSetOf(Blocks.CAPACITOR_BLOCK3.get()), BullshitFix()
        )
    }
-    val SOLARGEN_ENTITY: RegistrySupplier<BlockEntityType<SolarGeneratorBlockEntity>> = BLOCKENTITIES.register("solargen_entity") {
+    val SOLARGEN_ENTITY: RegistrySupplier<BlockEntityType<SolarGeneratorBlockEntity>> = BLOCKENTITIES.register("solargen") {
        BlockEntityType(
            ::SolarGeneratorBlockEntity, mutableSetOf(Blocks.SOLARGEN_BLOCK.get()), BullshitFix()
        )
    }
-    val COMBUSTGEN_ENTITY: RegistrySupplier<BlockEntityType<CombustionGeneratorBlockEntity>> = BLOCKENTITIES.register("combustgen_entity") {
+    val COMBUSTGEN_ENTITY: RegistrySupplier<BlockEntityType<CombustionGeneratorBlockEntity>> = BLOCKENTITIES.register("combustgen") {
        BlockEntityType(
            ::CombustionGeneratorBlockEntity, mutableSetOf(Blocks.COMBUSTGEN_BLOCK.get()), BullshitFix()
        )
--- a/src/main/kotlin/org/neoflock/neocomputers/entity/CombustionGeneratorBlockEntity.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/entity/CombustionGeneratorBlockEntity.kt
@@ -1,14 +1,24 @@
 package org.neoflock.neocomputers.entity

 import net.minecraft.core.BlockPos
+import net.minecraft.core.HolderLookup
 import net.minecraft.core.NonNullList
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.network.FriendlyByteBuf
+import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.chat.Component
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.sounds.SoundEvents
+import net.minecraft.sounds.SoundSource
 import net.minecraft.world.MenuProvider
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.inventory.AbstractContainerMenu
 import net.minecraft.world.item.ItemStack
+import net.minecraft.world.level.Level
+import net.minecraft.world.level.block.FurnaceBlock
 import net.minecraft.world.level.block.state.BlockState
+import org.neoflock.neocomputers.block.CombustionGeneratorBlock
 import org.neoflock.neocomputers.block.NodeBlockEntity
 import org.neoflock.neocomputers.gui.menu.CombustionGeneratorMenu
 import org.neoflock.neocomputers.network.Networking
@@ -20,25 +30,11 @@ import kotlin.math.min
 class CombustionGeneratorBlockEntity(blockPos: BlockPos, blockState: BlockState) : NodeBlockEntity(BlockEntities.COMBUSTGEN_ENTITY.get(), blockPos, blockState), GenericContainer, MenuProvider {
    val energyPerTick: Long = 50

-    var energy: Long = 0
-    val maxEnergy: Long = 100000
    var burningTimeRemaining: Int = 0

    override val node = object : Networking.Node() {
-        override fun getPowerRole() = PowerRole.GENERATOR
-        override fun getEnergy() = energy
-        override fun getEnergyCapacity() = maxEnergy
-        override fun withdrawEnergy(amount: Long): Long {
-            val taken = min(amount, energy)
-            energy -= taken
-            return taken
-        }
-
-        override fun giveEnergy(amount: Long): Long {
-            val given = min(amount, maxEnergy - energy)
-            energy += given
-            return given
-        }
+        override var powerRole = PowerRole.GENERATOR
+        override var energyCapacity: Long = 100000
    }

    val stacks: NonNullList<ItemStack> = NonNullList<ItemStack>.withSize(1, ItemStack.EMPTY)
@@ -53,8 +49,8 @@ class CombustionGeneratorBlockEntity(blockPos: BlockPos, blockState: BlockState)
        return !this.isRemoved
    }

-    override fun tickNode() {
-        super.tickNode()
+    override fun tickNode(level: Level) {
+        super.tickNode(level)
        // TODO: give us a block state tag for active

        // keep combusting and shi
@@ -66,17 +62,38 @@ class CombustionGeneratorBlockEntity(blockPos: BlockPos, blockState: BlockState)
        }

        // no point
-        if(node.getEnergy() >= node.getEnergyCapacity()) return;
+        if(node.energy >= node.energyCapacity) return;

        // :fire:
        val fuel = stacks[0]
        if(fuel.isEmpty) return

        burningTimeRemaining = ContainerUtils.getBurningTime(fuel) ?: 0
+        setChanged()
        fuel.count--
    }

    override fun getDisplayName(): Component? = Component.translatable("block.neocomputers.combustgen")

    override fun createMenu(i: Int, inventory: Inventory, player: Player) = CombustionGeneratorMenu(i, inventory, this)
+
+    override fun setChanged() {
+        super.setChanged()
+        level?.setBlockAndUpdate(blockPos, blockState.setValue(CombustionGeneratorBlock.ACTIVE, burningTimeRemaining > 0))
+    }
+
+    override fun encodeScreenData(player: ServerPlayer, packet: FriendlyByteBuf) {
+        packet.writeLong(node.energy)
+        packet.writeLong(node.energyCapacity)
+    }
+
+    override fun loadAdditional(compoundTag: CompoundTag, provider: HolderLookup.Provider) {
+        node.energy = min(node.energyCapacity, compoundTag.getLong("energy"))
+        burningTimeRemaining = compoundTag.getInt("burningTimeRemaining")
+    }
+
+    override fun saveAdditional(compoundTag: CompoundTag, provider: HolderLookup.Provider) {
+        compoundTag.putLong("energy", node.energy)
+        compoundTag.putInt("burningTimeRemaining", burningTimeRemaining)
+    }
 }
--- a/src/main/kotlin/org/neoflock/neocomputers/entity/SolarGeneratorBlockEntity.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/entity/SolarGeneratorBlockEntity.kt
@@ -1,38 +1,35 @@
 package org.neoflock.neocomputers.entity

 import net.minecraft.core.BlockPos
+import net.minecraft.core.HolderLookup
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.state.BlockState
 import org.neoflock.neocomputers.block.NodeBlockEntity
 import org.neoflock.neocomputers.network.Networking
 import org.neoflock.neocomputers.network.PowerRole
-import kotlin.math.min

 class SolarGeneratorBlockEntity(blockPos: BlockPos, blockState: BlockState) : NodeBlockEntity(BlockEntities.SOLARGEN_ENTITY.get(), blockPos, blockState) {
    val energyPerTick: Long = 50
-    var energyStored: Long = 0
-    val capacity: Long = 50000

    override val node = object : Networking.Node() {
-        override fun getPowerRole(): PowerRole = PowerRole.GENERATOR
-        override fun getEnergy(): Long = energyStored
-        override fun getEnergyCapacity(): Long = capacity
-        override fun giveEnergy(amount: Long): Long {
-            val taken = min(amount, capacity - energyStored)
-            energyStored += taken
-            return taken
-        }
-        override fun withdrawEnergy(amount: Long): Long {
-            val taken = min(amount, energyStored)
-            energyStored -= taken
-            return taken
-        }
+        override var powerRole: PowerRole = PowerRole.GENERATOR
+        override var energyCapacity: Long = 50000
    }

-    override fun tickNode() {
-        super.tickNode()
+    override fun tickNode(level: Level) {
+        super.tickNode(level)
        val l = level ?: return
        if(l.isDay) {
            node.giveEnergy(energyPerTick)
        }
    }
+
+    override fun loadAdditional(compoundTag: CompoundTag, provider: HolderLookup.Provider) {
+        node.energy = compoundTag.getLong("energy")
+    }
+
+    override fun saveAdditional(compoundTag: CompoundTag, provider: HolderLookup.Provider) {
+        compoundTag.putLong("energy", node.energy)
+    }
 }