Cleanup client resource manager so it is now read only view of the server state. Lighten up networking layer for syncing the storage state, this should improve speed and reduce bugs

Author: remmintan

build.gradle

@@ -30,7 +30,7 @@ sourceSets {
         compileClasspath += main.compileClasspath + core.output + networking.output
     }
     building {
-        compileClasspath += main.compileClasspath + core.output + gui.output
+        compileClasspath += main.compileClasspath + core.output + gui.output + networking.output
     }
     selections {
         compileClasspath += main.compileClasspath + core.output + building.output + networking.output

src/building/java/net/remmintan/mods/minefortress/blocks/building/BuildingHireHandler.kt

@@ -1,10 +1,7 @@
 package net.remmintan.mods.minefortress.blocks.building
 
 import net.minecraft.nbt.NbtCompound
-import net.minecraft.nbt.NbtList
-import net.remmintan.mods.minefortress.core.dtos.ItemInfo
 import net.remmintan.mods.minefortress.core.dtos.professions.HireProgressInfo
-import net.remmintan.mods.minefortress.core.dtos.professions.ProfessionHireInfo
 import net.remmintan.mods.minefortress.core.interfaces.blueprints.ProfessionType
 import net.remmintan.mods.minefortress.core.interfaces.buildings.IBuildingHireHandler
 import net.remmintan.mods.minefortress.core.interfaces.buildings.IServerBuildingsManager
@@ -20,8 +17,8 @@ class BuildingHireHandler : IBuildingHireHandler {
     private var buildingsManager: IServerBuildingsManager? = null
     private var resourceManger: IServerResourceManager? = null
     private var resourceHelper: IServerResourceHelper? = null
+    private var professionIds: List<String> = emptyList()
 
-    private var professions: List<ProfessionHireInfo> = emptyList()
     private var hireQueues = mutableMapOf<String, Queue<HireRequest>>()
     private var hireProgresses = mutableMapOf<String, HireProgressInfo>()
 
@@ -39,18 +36,7 @@ class BuildingHireHandler : IBuildingHireHandler {
         this.buildingsManager = buildingsManager
         this.resourceManger = resourceManager
         this.resourceHelper = resourceHelper
-
-        professions = professionManager
-            .getProfessionsByType(professionType)
-            .filter { buildingsManager.hasRequiredBuilding(it.requirementType, it.requirementLevel, 0) }
-            .map {
-                ProfessionHireInfo(
-                    it.id,
-                    it.title,
-                    it.icon,
-                    it.itemsRequirement.map { r -> ItemInfo(r.item, r.count) }
-                )
-            }
+        this.professionIds = professionManager.getProfessionsByType(professionType).map { it.id }
     }
 
     fun tick() {
@@ -85,7 +71,9 @@ class BuildingHireHandler : IBuildingHireHandler {
         }
     }
 
-    override fun getProfessions(): List<ProfessionHireInfo> = professions
+    override fun getProfessionIds(): List<String> {
+        return professionIds
+    }
 
     override fun getHireProgress(professionId: String): HireProgressInfo {
         if (buildingsManager == null) {
@@ -127,10 +115,6 @@ class BuildingHireHandler : IBuildingHireHandler {
         val rootTag = NbtCompound()
 
         // professions
-        val profList = NbtList().apply {
-            professions.forEach { add(it.toNbt()) }
-        }
-
         val queuesTag = NbtCompound()
         hireQueues.forEach { (professionId, queue) ->
             val queueTag = NbtCompound()
@@ -143,21 +127,18 @@ class BuildingHireHandler : IBuildingHireHandler {
         }
 
         val progressesTag = NbtCompound()
-        professions.map { it.professionId }.forEach {
+        professionIds.forEach {
             val hireProgress = getHireProgress(it)
             progressesTag.put(it, hireProgress.toNbt())
         }
 
-        rootTag.put("professions", profList)
         rootTag.put("queues", queuesTag)
         rootTag.put("progresses", progressesTag)
 
         return rootTag
     }
 
     fun updateFromNbt(tag: NbtCompound) {
-        val professions = tag.getList("professions", 10).map { ProfessionHireInfo.fromNbt(it as NbtCompound) }
-        this.professions = professions
 
         val queuesTag = tag.getCompound("queues")
         queuesTag.keys.forEach { professionId ->

src/building/java/net/remmintan/mods/minefortress/blocks/building/FortressBuildingBlockEntity.kt

@@ -17,6 +17,7 @@ import net.minecraft.registry.tag.BlockTags
 import net.minecraft.screen.NamedScreenHandlerFactory
 import net.minecraft.screen.PropertyDelegate
 import net.minecraft.screen.ScreenHandler
+import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.server.world.ServerWorld
 import net.minecraft.text.Text
 import net.minecraft.util.math.BlockPos
@@ -25,13 +26,19 @@ import net.minecraft.world.World
 import net.remmintan.mods.minefortress.blocks.FortressBlocks
 import net.remmintan.mods.minefortress.core.dtos.buildings.BarColor
 import net.remmintan.mods.minefortress.core.dtos.buildings.BlueprintMetadata
+import net.remmintan.mods.minefortress.core.dtos.buildings.BuildingScreenInfo
 import net.remmintan.mods.minefortress.core.dtos.buildings.HudBar
+import net.remmintan.mods.minefortress.core.dtos.professions.ProfessionCost
+import net.remmintan.mods.minefortress.core.dtos.professions.ProfessionHireInfo
 import net.remmintan.mods.minefortress.core.interfaces.automation.area.IAutomationArea
 import net.remmintan.mods.minefortress.core.interfaces.blueprints.ProfessionType
 import net.remmintan.mods.minefortress.core.interfaces.buildings.IFortressBuilding
 import net.remmintan.mods.minefortress.core.utils.ClientModUtils
+import net.remmintan.mods.minefortress.core.utils.ServerModUtils
 import net.remmintan.mods.minefortress.core.utils.getManagersProvider
 import net.remmintan.mods.minefortress.gui.building.BuildingScreenHandler
+import net.remmintan.mods.minefortress.networking.helpers.FortressServerNetworkHelper
+import net.remmintan.mods.minefortress.networking.s2c.S2CSyncBuildingScreenInfo
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.util.*
@@ -103,7 +110,6 @@ class FortressBuildingBlockEntity(pos: BlockPos?, state: BlockState?) :
 
                 if (world is ServerWorld) {
                     val provider = world.server.getManagersProvider(fortressPos!!)
-                    checkNotNull(provider)
 
                     it.init(
                         professionType,
@@ -177,10 +183,8 @@ class FortressBuildingBlockEntity(pos: BlockPos?, state: BlockState?) :
 
 
         val hireProgress = hireHandler
-            .getProfessions()
-            .map {
-                hireHandler.getHireProgress(it.professionId)
-            }
+            .getProfessionIds()
+            .map { hireHandler.getHireProgress(it) }
             .filter { it.queueLength > 0 }
             .minByOrNull { it.queueLength }
             ?.progress
@@ -199,10 +203,40 @@ class FortressBuildingBlockEntity(pos: BlockPos?, state: BlockState?) :
         return list
     }
 
+    override fun constructAndSendBuildingScreenInfo(player: ServerPlayerEntity) {
+        val managersProvider = ServerModUtils.getManagersProvider(player).orElseThrow()
+
+        val professionsManager = managersProvider.professionsManager
+        val buildingsManager = managersProvider.buildingsManager
+        val resourceHelper = managersProvider.resourceHelper
+
+        val professions = professionsManager
+            .getProfessionsByType(metadata.requirement.type)
+            .filter { buildingsManager.hasRequiredBuilding(it.requirementType, it.requirementLevel, 0) }
+            .map {
+                ProfessionHireInfo(
+                    it.id,
+                    it.title,
+                    it.icon,
+                    it.itemsRequirement.map { r ->
+                        ProfessionCost(
+                            r.item,
+                            r.count,
+                            resourceHelper.getCountIncludingSimilar(item = r.item)
+                        )
+                    }
+                )
+            }
+
+        val buildingScreenInfo = BuildingScreenInfo(professions)
+        val packet = S2CSyncBuildingScreenInfo(buildingScreenInfo)
+        FortressServerNetworkHelper.send(player, S2CSyncBuildingScreenInfo.CHANNEL, packet)
+    }
+
     override fun createMenu(syncId: Int, playerInventory: PlayerInventory?, player: PlayerEntity?): ScreenHandler {
         val propertyDelegate = object : PropertyDelegate {
             override fun get(index: Int): Int {
-                return when(index) {
+                return when (index) {
                     0 -> pos.x
                     1 -> pos.y
                     2 -> pos.z

src/core/java/net/remmintan/mods/minefortress/core/dtos/EnoughResourceState.kt

@@ -0,0 +1,9 @@
+package net.remmintan.mods.minefortress.core.dtos
+
+enum class EnoughResourceState {
+
+    ENOUGH,
+    NOT_ENOUGH,
+    PENDING
+
+}

src/core/java/net/remmintan/mods/minefortress/core/dtos/buildings/BuildingScreenInfo.kt

@@ -0,0 +1,24 @@
+package net.remmintan.mods.minefortress.core.dtos.buildings
+
+import net.minecraft.network.PacketByteBuf
+import net.remmintan.mods.minefortress.core.dtos.professions.ProfessionHireInfo
+
+data class BuildingScreenInfo(
+    val professions: List<ProfessionHireInfo>
+) {
+    fun writeToPacketByteBuf(buf: PacketByteBuf) {
+        buf.writeCollection(professions) { b, it -> it.writeToPacketByteBuf(b) }
+    }
+
+    companion object {
+
+        fun readFromPacketByteBuf(buf: PacketByteBuf): BuildingScreenInfo {
+            val professions = buf.readCollection({ mutableListOf<ProfessionHireInfo>() }) {
+                ProfessionHireInfo.readFromPacketByteBuf(it)
+            }
+
+            return BuildingScreenInfo(professions)
+        }
+
+    }
+}

src/core/java/net/remmintan/mods/minefortress/core/dtos/professions/ProfessionCost.kt

@@ -0,0 +1,28 @@
+package net.remmintan.mods.minefortress.core.dtos.professions
+
+import net.minecraft.item.Item
+import net.minecraft.network.PacketByteBuf
+
+data class ProfessionCost(val item: Item, val requiredAmount: Int, val totalAmount: Long) {
+
+    val enoughItems: Boolean = totalAmount >= requiredAmount
+
+    fun writeToPacketByteBuf(buf: PacketByteBuf) {
+        buf.writeInt(Item.getRawId(item))
+        buf.writeInt(requiredAmount)
+        buf.writeLong(totalAmount)
+    }
+
+    companion object {
+
+        fun readFromPacketByteBuf(buf: PacketByteBuf): ProfessionCost {
+            val item = Item.byRawId(buf.readInt())
+            val requiredAmount = buf.readInt()
+            val totalAmount = buf.readLong()
+
+            return ProfessionCost(item, requiredAmount, totalAmount)
+        }
+
+    }
+
+}

src/core/java/net/remmintan/mods/minefortress/core/dtos/professions/ProfessionHireInfo.kt

@@ -1,33 +1,31 @@
 package net.remmintan.mods.minefortress.core.dtos.professions
 
 import net.minecraft.item.ItemStack
-import net.minecraft.nbt.NbtCompound
-import net.minecraft.nbt.NbtList
-import net.remmintan.mods.minefortress.core.dtos.ItemInfo
+import net.minecraft.network.PacketByteBuf
 
 data class ProfessionHireInfo(
     val professionId: String,
     val professionName: String,
     val professionItem: ItemStack,
-    val professionCost: List<ItemInfo>
+    val professionCost: List<ProfessionCost>
 ) {
-    fun toNbt(): NbtCompound {
-        val nbt = NbtCompound()
-        nbt.putString("professionId", professionId)
-        nbt.putString("professionName", professionName)
-        nbt.put("professionItem", professionItem.writeNbt(NbtCompound()))
-        nbt.put("professionCost", NbtList().apply { professionCost.forEach { add(it.toNbt()) } })
-        return nbt
+    fun writeToPacketByteBuf(buf: PacketByteBuf) {
+        buf.writeString(professionId)
+        buf.writeString(professionName)
+        buf.writeItemStack(professionItem)
+        buf.writeCollection(professionCost) { b, it -> it.writeToPacketByteBuf(b) }
     }
 
     companion object {
-        fun fromNbt(nbt: NbtCompound): ProfessionHireInfo {
-            return ProfessionHireInfo(
-                nbt.getString("professionId"),
-                nbt.getString("professionName"),
-                ItemStack.fromNbt(nbt.getCompound("professionItem")),
-                nbt.getList("professionCost", 10).map { ItemInfo.fromNbt(it as NbtCompound) }
-            )
+        fun readFromPacketByteBuf(buf: PacketByteBuf): ProfessionHireInfo {
+            val professionId = buf.readString()
+            val professionName = buf.readString()
+            val professionItem = buf.readItemStack()
+            val professionCosts =
+                buf.readCollection({ mutableListOf<ProfessionCost>() }) { ProfessionCost.readFromPacketByteBuf(it) }
+                    .toList()
+
+            return ProfessionHireInfo(professionId, professionName, professionItem, professionCosts)
         }
     }
 }

src/core/java/net/remmintan/mods/minefortress/core/interfaces/buildings/IBuildingHireHandler.kt

@@ -1,10 +1,9 @@
 package net.remmintan.mods.minefortress.core.interfaces.buildings
 
 import net.remmintan.mods.minefortress.core.dtos.professions.HireProgressInfo
-import net.remmintan.mods.minefortress.core.dtos.professions.ProfessionHireInfo
 
 interface IBuildingHireHandler {
     fun hire(professionId: String)
-    fun getProfessions(): List<ProfessionHireInfo>
+    fun getProfessionIds(): List<String>
     fun getHireProgress(professionId: String): HireProgressInfo
 }

src/core/java/net/remmintan/mods/minefortress/core/interfaces/buildings/IClientBuildingScreenInfoService.kt

@@ -0,0 +1,15 @@
+package net.remmintan.mods.minefortress.core.interfaces.buildings
+
+import net.minecraft.client.MinecraftClient
+import net.minecraft.util.math.BlockPos
+import net.remmintan.mods.minefortress.core.dtos.buildings.BuildingScreenInfo
+import net.remmintan.mods.minefortress.core.dtos.professions.ProfessionHireInfo
+
+interface IClientBuildingScreenInfoService {
+
+    fun requestUpdate(buildingPos: BlockPos)
+    fun syncState(info: BuildingScreenInfo)
+    fun getProfessions(): List<ProfessionHireInfo>
+    fun tick(client: MinecraftClient)
+
+}

src/core/java/net/remmintan/mods/minefortress/core/interfaces/buildings/IFortressBuilding.java

@@ -4,6 +4,7 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.entity.mob.HostileEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.math.BlockBox;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.Heightmap;
@@ -88,4 +89,6 @@ default boolean isPartOfTheBuilding(BlockPos pos) {
     IBuildingHireHandler getHireHandler();
 
     List<HudBar> getBars();
+
+    void constructAndSendBuildingScreenInfo(ServerPlayerEntity player);
 }