Merge branch 'main' of https://gitea.codersquack.nl/NeoFlock/NeoComputers

2026-04-22 17:57:09 +02:00
parent a14d3a2b73 c8da0aba68
commit faa1be7175
25 changed files with 574 additions and 113 deletions
--- a/src/main/kotlin/org/neoflock/neocomputers/block/CaseBlock.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/block/CaseBlock.kt
@@ -2,28 +2,89 @@ package org.neoflock.neocomputers.block;

 import dev.architectury.registry.menu.MenuRegistry
 import net.minecraft.core.BlockPos
-import net.minecraft.network.chat.Component
+import net.minecraft.core.Direction
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.InteractionHand
+import net.minecraft.sounds.SoundEvent
+import net.minecraft.sounds.SoundEvents
+import net.minecraft.sounds.SoundSource
+import net.minecraft.util.RandomSource
+import net.minecraft.world.Containers
 import net.minecraft.world.InteractionResult
-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.BlockGetter
 import net.minecraft.world.level.Level
+import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.EntityBlock
-import net.minecraft.world.level.block.entity.BlockEntity
+import net.minecraft.world.level.block.SoundType
 import net.minecraft.world.level.block.state.BlockState
+import net.minecraft.world.level.block.state.StateDefinition
+import net.minecraft.world.level.block.state.properties.BooleanProperty
 import net.minecraft.world.phys.BlockHitResult
 import org.neoflock.neocomputers.NeoComputers
+import org.neoflock.neocomputers.block.CombustionGeneratorBlock.Companion.COMBUSTGEN_ACTIVE
 import org.neoflock.neocomputers.entity.BlockEntities
-import org.neoflock.neocomputers.entity.ScreenEntity
-import org.neoflock.neocomputers.gui.menu.Menus
-import org.neoflock.neocomputers.gui.menu.ScreenMenu
-import org.neoflock.neocomputers.network.Networking
+import org.neoflock.neocomputers.entity.CaseBlockEntity
+import org.neoflock.neocomputers.entity.MachineEntity
+import org.neoflock.neocomputers.sounds.Sounds
+
+class CaseBlock() : NodeBlock(Properties.of().sound(SoundType.METAL).lightLevel(CaseBlock::getLuminance)) { // placeholder stuff
+    companion object {
+        val COMPUTER_RUNNING = BooleanProperty.create("running")!!
+
+        fun getLuminance(blockState: BlockState): Int {
+            return if(blockState.getValue(COMPUTER_RUNNING)) 3 else 0
+        }
+    }
+
+    override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState) = CaseBlockEntity(blockPos, blockState)
+
+    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block?, BlockState?>) {
+        builder.add(COMPUTER_RUNNING)
+    }
+
+    fun getMachine(level: BlockGetter, blockPos: BlockPos): CaseBlockEntity {
+        return level.getBlockEntity(blockPos) as CaseBlockEntity
+    }
+
+    override fun getSignal(
+        blockState: BlockState,
+        blockGetter: BlockGetter,
+        blockPos: BlockPos,
+        direction: Direction
+    ): Int {
+        return getMachine(blockGetter, blockPos).redstoneOut[dirToIdx(direction.opposite)]
+    }
+
+    override fun onPlace(
+        blockState: BlockState,
+        level: Level,
+        blockPos: BlockPos,
+        blockState2: BlockState,
+        bl: Boolean
+    ) {
+        if(!level.isClientSide) {
+            level.updateNeighborsAt(blockPos, this)
+            getMachine(level, blockPos).refetchAllRedstone()
+        }
+        super.onPlace(blockState, level, blockPos, blockState2, bl)
+    }
+
+    override fun neighborChanged(
+        blockState: BlockState,
+        level: Level,
+        blockPos: BlockPos,
+        block: Block,
+        blockPos2: BlockPos,
+        bl: Boolean
+    ) {
+        super.neighborChanged(blockState, level, blockPos, block, blockPos2, bl)
+        if(!level.isClientSide) {
+            val dir = Direction.getNearest(blockPos2.center.subtract(blockPos.center))
+            getMachine(level, blockPos).refetchRedstone(dir)
+        }
+    }

-class CaseBlock() : BaseBlock() { // placeholder stuff
    override fun useWithoutItem(
        blockState: BlockState,
        level: Level,
@@ -32,13 +93,21 @@ class CaseBlock() : BaseBlock() { // placeholder stuff
        blockHitResult: BlockHitResult
    ): InteractionResult {
        if(!level.isClientSide) {
-            MenuRegistry.openMenu(player as ServerPlayer, object : MenuProvider {
-                override fun getDisplayName(): Component = Component.literal("Computer")
-                override fun createMenu(i: Int, inventory: Inventory, player: Player): AbstractContainerMenu {
-                    return Menus.CASE_MENU.get().create(i, inventory);
-                }
-            })
+            val ent = level.getBlockEntity(blockPos, BlockEntities.CASE_ENTITY.get()).get()
+            MenuRegistry.openMenu(player as ServerPlayer, ent)
+            NodeSynchronizer.registerPlayerScreen(player, ent)
        }
        return InteractionResult.SUCCESS
    }
+
+    override fun onRemove(
+        blockState: BlockState,
+        level: Level,
+        blockPos: BlockPos,
+        blockState2: BlockState,
+        bl: Boolean
+    ) {
+        Containers.dropContentsOnDestroy(blockState, blockState2, level, blockPos)
+        super.onRemove(blockState, level, blockPos, blockState2, bl)
+    }
 }
--- a/src/main/kotlin/org/neoflock/neocomputers/block/Generators.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/block/Generators.kt
@@ -13,6 +13,7 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.EntityBlock
+import net.minecraft.world.level.block.FurnaceBlock
 import net.minecraft.world.level.block.SoundType
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.state.BlockState
@@ -30,15 +31,15 @@ class SolarGeneratorBlock : NodeBlock(), EntityBlock {
 // TODO: make it glow when burning
 class CombustionGeneratorBlock : NodeBlock, EntityBlock {
    companion object {
-        val ACTIVE = BooleanProperty.create("active")
+        val COMBUSTGEN_ACTIVE = BooleanProperty.create("active")

        fun getLuminance(blockState: BlockState): Int {
-            return if(blockState.getValue(ACTIVE)) 5 else 0
+            return if(blockState.getValue(COMBUSTGEN_ACTIVE)) 5 else 0
        }
    }

    constructor(): super(Properties.of().sound(SoundType.STONE).lightLevel(CombustionGeneratorBlock::getLuminance)) {
-        registerDefaultState(defaultBlockState().setValue(ACTIVE, false))
+        registerDefaultState(defaultBlockState().setValue(COMBUSTGEN_ACTIVE, false))
    }

    override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity = CombustionGeneratorBlockEntity(blockPos, blockState).initNetworking()
@@ -60,12 +61,12 @@ class CombustionGeneratorBlock : NodeBlock, EntityBlock {
    }

    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block?, BlockState?>) {
-        builder.add(ACTIVE)
+        builder.add(COMBUSTGEN_ACTIVE)
    }

    override fun animateTick(blockState: BlockState, level: Level, blockPos: BlockPos, randomSource: RandomSource) {
-        if(blockState.getValue(ACTIVE)) {
-            if(randomSource.nextDouble() < 0.1) level.playSound(null, blockPos, SoundEvents.FURNACE_FIRE_CRACKLE, SoundSource.AMBIENT)
+        if(blockState.getValue(COMBUSTGEN_ACTIVE)) {
+            if(randomSource.nextDouble() < 0.1) level.playLocalSound(blockPos, SoundEvents.FURNACE_FIRE_CRACKLE, SoundSource.AMBIENT, 1F, 1F, false)

            val x = blockPos.x.toDouble()
            val y = blockPos.y.toDouble()
--- a/src/main/kotlin/org/neoflock/neocomputers/block/NodeBlock.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/block/NodeBlock.kt
@@ -68,6 +68,27 @@ object NodeSynchronizer {
        override fun type() = TYPE
    }

+    class ScreenDataPayload(var entityTypeWireID: String, var buffer: FriendlyByteBuf): CustomPacketPayload {
+        companion object {
+            val SCREEN_SYNC_ID = ResourceLocation.fromNamespaceAndPath(NeoComputers.MODID, "screen_data")
+            val TYPE = CustomPacketPayload.Type<ScreenDataPayload>(SCREEN_SYNC_ID)
+            val CODEC = object : StreamCodec<RegistryFriendlyByteBuf, ScreenDataPayload> {
+                override fun decode(buf: RegistryFriendlyByteBuf): ScreenDataPayload {
+                    val id = buf.readByteArray().decodeToString()
+                    val buffer = FriendlyByteBuf(buf.copy(buf.readerIndex(), buf.readableBytes()))
+                    return ScreenDataPayload(id, buffer)
+                }
+
+                override fun encode(buf: RegistryFriendlyByteBuf, payload: ScreenDataPayload) {
+                    buf.writeByteArray(payload.entityTypeWireID.encodeToByteArray())
+                    buf.writeBytes(payload.buffer)
+                }
+            }
+        }
+
+        override fun type() = TYPE
+    }
+
    val screenMap = mutableMapOf<ServerPlayer, NodeBlockEntity>()

    fun playerScreenClosed(player: ServerPlayer) {
@@ -87,6 +108,10 @@ object NodeSynchronizer {
            NetworkManager.sendToPlayer(player, ScreenPayload(nodeTypeToWireID(ent.type), buf))
        }
    }
+
+    fun sendScreenInteraction(friendlyByteBuf: FriendlyByteBuf) {
+        NetworkManager.sendToServer(ScreenDataPayload("", friendlyByteBuf))
+    }
 }

 abstract class NodeBlockEntity(blockEntityType: BlockEntityType<*>, blockPos: BlockPos, blockState: BlockState) : BlockEntity(blockEntityType, blockPos, blockState) {
@@ -119,6 +144,8 @@ abstract class NodeBlockEntity(blockEntityType: BlockEntityType<*>, blockPos: Bl
    // Encodes data meant for the associated screen of a player
    open fun encodeScreenData(player: ServerPlayer, packet: FriendlyByteBuf) {}

+    open fun processScreenInteraction(player: ServerPlayer, packet: FriendlyByteBuf) {}
+
    private var stateIsDirty = true

    open fun getNeighbourEntities(): List<BlockEntity> {