lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webmap: begin refactoring state classes...

Browse source
This commit is contained in:
Adam 2022-05-24 18:07:13 +02:00
parent 9278172412
commit aa4de3fb14
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/App.kt
View file

@ -1,5 +1,8 @@
package dev.adamko.kafkatorio.webmap package dev.adamko.kafkatorio.webmap
import dev.adamko.kafkatorio.webmap.state.FactorioGameState
import dev.adamko.kafkatorio.webmap.state.FactorioUpdate
import dev.adamko.kafkatorio.webmap.state.createFactorioReduxStore
import io.kvision.Application import io.kvision.Application
import io.kvision.BootstrapCssModule import io.kvision.BootstrapCssModule
import io.kvision.BootstrapIconsModule import io.kvision.BootstrapIconsModule

4
modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/state.kt → modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/state/state.kt
View file

@ -1,4 +1,4 @@
package dev.adamko.kafkatorio.webmap package dev.adamko.kafkatorio.webmap.state
import dev.adamko.kafkatorio.schema.common.Colour import dev.adamko.kafkatorio.schema.common.Colour
import dev.adamko.kafkatorio.schema.common.MapEntityPosition import dev.adamko.kafkatorio.schema.common.MapEntityPosition
@ -7,6 +7,8 @@ import dev.adamko.kafkatorio.schema.common.SurfaceIndex
import dev.adamko.kafkatorio.schema.common.Tick import dev.adamko.kafkatorio.schema.common.Tick
import dev.adamko.kafkatorio.schema.common.toHexString import dev.adamko.kafkatorio.schema.common.toHexString
import dev.adamko.kafkatorio.schema.packets.PlayerUpdate import dev.adamko.kafkatorio.schema.packets.PlayerUpdate
import dev.adamko.kafkatorio.webmap.FactorioMap
import dev.adamko.kafkatorio.webmap.latLng
import io.kvision.maps.Maps.Companion.L import io.kvision.maps.Maps.Companion.L
import io.kvision.maps.externals.leaflet.geo.LatLng import io.kvision.maps.externals.leaflet.geo.LatLng
import io.kvision.maps.externals.leaflet.layer.LayerGroup import io.kvision.maps.externals.leaflet.layer.LayerGroup

5
modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/websockets.kt
View file

@ -9,8 +9,9 @@ import dev.adamko.kafkatorio.schema.packets.MapChunkUpdate
import dev.adamko.kafkatorio.schema.packets.PlayerUpdate import dev.adamko.kafkatorio.schema.packets.PlayerUpdate
import dev.adamko.kafkatorio.schema.packets.PrototypesUpdate import dev.adamko.kafkatorio.schema.packets.PrototypesUpdate
import dev.adamko.kafkatorio.schema.packets.SurfaceUpdate import dev.adamko.kafkatorio.schema.packets.SurfaceUpdate
import dev.adamko.kafkatorio.webmap.state.FactorioGameState
import dev.adamko.kafkatorio.webmap.state.FactorioUpdate
import io.kvision.redux.ReduxStore import io.kvision.redux.ReduxStore
import kotlinx.serialization.decodeFromString
import org.w3c.dom.MessageEvent import org.w3c.dom.MessageEvent
import org.w3c.dom.WebSocket import org.w3c.dom.WebSocket
@ -36,7 +37,7 @@ class WebsocketService(
println(data.replace('\n', ' ')) println(data.replace('\n', ' '))
val packet: KafkatorioPacket = jsonMapper.decodeFromString(data) val packet = jsonMapper.decodeFromString(KafkatorioPacket.serializer(), data)
when (val packetData = packet.data) { when (val packetData = packet.data) {