- start code clean up by commenting out unused/deprecated code (start moving towards the 'event updates' Kafkatorio packets
- bring back the event Queue, and the command to emit lots of chunks - allow setting the event update timeout directly when debouncing/throttling an update
This commit is contained in:
Adam
parent
1fbe0d87b0
commit
8d36111d9a
11 changed files with 613 additions and 636 deletions
|
|
@ -35,12 +35,12 @@ sealed class FactorioObjectData {
|
|||
// }
|
||||
|
||||
enum class ObjectName {
|
||||
LuaPlayer,
|
||||
LuaEntity,
|
||||
// LuaPlayer,
|
||||
// LuaEntity,
|
||||
LuaSurface,
|
||||
MapChunk,
|
||||
// MapChunk,
|
||||
// LuaTile,
|
||||
LuaTiles,
|
||||
// LuaTiles,
|
||||
ConsoleChatMessage,
|
||||
;
|
||||
|
||||
|
|
@ -69,60 +69,60 @@ object FactorioObjectDataJsonSerializer : JsonContentPolymorphicSerializer<Facto
|
|||
requireNotNull(type) { "Unknown FactorioObjectData $key: $element" }
|
||||
|
||||
return when (type) {
|
||||
FactorioObjectData.ObjectName.LuaPlayer -> PlayerData.serializer()
|
||||
FactorioObjectData.ObjectName.LuaEntity -> EntityData.serializer()
|
||||
// FactorioObjectData.ObjectName.LuaPlayer -> PlayerData.serializer()
|
||||
// FactorioObjectData.ObjectName.LuaEntity -> EntityData.serializer()
|
||||
FactorioObjectData.ObjectName.LuaSurface -> SurfaceData.serializer()
|
||||
FactorioObjectData.ObjectName.MapChunk -> MapChunk.serializer()
|
||||
// FactorioObjectData.ObjectName.MapChunk -> MapChunk.serializer()
|
||||
// FactorioObjectData.ObjectName.LuaTile -> MapTile.serializer()
|
||||
FactorioObjectData.ObjectName.LuaTiles -> MapTiles.serializer()
|
||||
// FactorioObjectData.ObjectName.LuaTiles -> MapTiles.serializer()
|
||||
FactorioObjectData.ObjectName.ConsoleChatMessage -> ConsoleChatMessage.serializer()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/** [`LuaControl`](https://lua-api.factorio.com/latest/LuaControl.html) */
|
||||
interface FactorioLuaControl {
|
||||
val position: MapEntityPosition
|
||||
val surface: SurfaceIndex
|
||||
val force: ForceIndex
|
||||
}
|
||||
///** [`LuaControl`](https://lua-api.factorio.com/latest/LuaControl.html) */
|
||||
//interface FactorioLuaControl {
|
||||
// val position: MapEntityPosition
|
||||
// val surface: SurfaceIndex
|
||||
// val force: ForceIndex
|
||||
//}
|
||||
|
||||
|
||||
@Serializable
|
||||
data class PlayerData(
|
||||
override val force: ForceIndex,
|
||||
override val position: MapEntityPosition,
|
||||
override val surface: SurfaceIndex,
|
||||
@Contextual
|
||||
val associatedCharactersUnitNumbers: List<UnitNumber>,
|
||||
val characterUnitNumber: UnitNumber?,
|
||||
val chatColour: Colour,
|
||||
val colour: Colour,
|
||||
val lastOnline: Tick,
|
||||
val name: String,
|
||||
) : FactorioObjectData(), FactorioLuaControl {
|
||||
@EncodeDefault
|
||||
override val objectName = ObjectName.LuaPlayer
|
||||
}
|
||||
//@Serializable
|
||||
//data class PlayerData(
|
||||
// override val force: ForceIndex,
|
||||
// override val position: MapEntityPosition,
|
||||
// override val surface: SurfaceIndex,
|
||||
// @Contextual
|
||||
// val associatedCharactersUnitNumbers: List<UnitNumber>,
|
||||
// val characterUnitNumber: UnitNumber?,
|
||||
// val chatColour: Colour,
|
||||
// val colour: Colour,
|
||||
// val lastOnline: Tick,
|
||||
// val name: String,
|
||||
//) : FactorioObjectData(), FactorioLuaControl {
|
||||
// @EncodeDefault
|
||||
// override val objectName = ObjectName.LuaPlayer
|
||||
//}
|
||||
|
||||
|
||||
@Serializable
|
||||
data class EntityData(
|
||||
override val force: ForceIndex,
|
||||
override val position: MapEntityPosition,
|
||||
override val surface: SurfaceIndex,
|
||||
val active: Boolean,
|
||||
val health: Double?,
|
||||
val healthRatio: Double?,
|
||||
val name: String,
|
||||
val playerIndex: PlayerIndex? = null,
|
||||
val type: String,
|
||||
val unitNumber: UnitNumber? = null,
|
||||
) : FactorioObjectData(), FactorioLuaControl {
|
||||
@EncodeDefault
|
||||
override val objectName = ObjectName.LuaEntity
|
||||
}
|
||||
//@Serializable
|
||||
//data class EntityData(
|
||||
// override val force: ForceIndex,
|
||||
// override val position: MapEntityPosition,
|
||||
// override val surface: SurfaceIndex,
|
||||
// val active: Boolean,
|
||||
// val health: Double?,
|
||||
// val healthRatio: Double?,
|
||||
// val name: String,
|
||||
// val playerIndex: PlayerIndex? = null,
|
||||
// val type: String,
|
||||
// val unitNumber: UnitNumber? = null,
|
||||
//) : FactorioObjectData(), FactorioLuaControl {
|
||||
// @EncodeDefault
|
||||
// override val objectName = ObjectName.LuaEntity
|
||||
//}
|
||||
|
||||
|
||||
@Serializable
|
||||
|
|
@ -136,16 +136,16 @@ data class SurfaceData(
|
|||
}
|
||||
|
||||
|
||||
/** This isn't a Factorio Lua type, but a helpful collection of Chunk info */
|
||||
@Serializable
|
||||
data class MapChunk(
|
||||
val tiles: MapTiles,
|
||||
val position: MapChunkPosition,
|
||||
val area: MapBoundingBox,
|
||||
) : FactorioObjectData() {
|
||||
@EncodeDefault
|
||||
override val objectName = ObjectName.MapChunk
|
||||
}
|
||||
///** This isn't a Factorio Lua type, but a helpful collection of Chunk info */
|
||||
//@Serializable
|
||||
//data class MapChunk(
|
||||
// val tiles: MapTiles,
|
||||
// val position: MapChunkPosition,
|
||||
// val area: MapBoundingBox,
|
||||
//) : FactorioObjectData() {
|
||||
// @EncodeDefault
|
||||
// override val objectName = ObjectName.MapChunk
|
||||
//}
|
||||
|
||||
|
||||
/** This isn't a Factorio Lua type, but a helpful collection of [MapTile]s */
|
||||
|
|
@ -153,10 +153,12 @@ data class MapChunk(
|
|||
data class MapTiles(
|
||||
val surfaceIndex: SurfaceIndex,
|
||||
val tiles: List<MapTile>,
|
||||
) : FactorioObjectData() {
|
||||
@EncodeDefault
|
||||
override val objectName = ObjectName.LuaTiles
|
||||
}
|
||||
)
|
||||
// : FactorioObjectData()
|
||||
//{
|
||||
// @EncodeDefault
|
||||
// override val objectName = ObjectName.LuaTiles
|
||||
//}
|
||||
|
||||
|
||||
@Serializable
|
||||
|
|
|
|||
|
|
@ -8,335 +8,335 @@ import kotlinx.serialization.encodeToString
|
|||
|
||||
class FactorioEventTest : FunSpec({
|
||||
|
||||
context("Given: json on_player_joined_game") {
|
||||
|
||||
// language=JSON
|
||||
val json = """
|
||||
{
|
||||
"data": {
|
||||
"objectName": "LuaPlayer",
|
||||
"force": 1,
|
||||
"surface": 1,
|
||||
"name": "fredthedeadhead",
|
||||
"characterUnitNumber": 1,
|
||||
"associatedCharactersUnitNumbers": {},
|
||||
"position": {
|
||||
"x": 30.6,
|
||||
"y": 84.1
|
||||
},
|
||||
"colour": {
|
||||
"red": 0.86,
|
||||
"green": 0.5,
|
||||
"blue": 0.12,
|
||||
"alpha": 0.5
|
||||
},
|
||||
"chatColour": {
|
||||
"red": 1,
|
||||
"green": 0.62,
|
||||
"blue": 0.25
|
||||
},
|
||||
"lastOnline": 2287061
|
||||
},
|
||||
"packetType": "EVENT",
|
||||
"eventType": "on_player_joined_game",
|
||||
"modVersion": "0.2.1",
|
||||
"tick": 2287072
|
||||
}
|
||||
""".trimIndent()
|
||||
context("When: decoded") {
|
||||
val actual: KafkatorioPacket = jsonMapperKafkatorio.decodeFromString(json)
|
||||
|
||||
test("Then: parse") {
|
||||
|
||||
val expected = FactorioEvent(
|
||||
data = PlayerData(
|
||||
name = "fredthedeadhead",
|
||||
surface = SurfaceIndex(1u),
|
||||
force = ForceIndex(1u),
|
||||
characterUnitNumber = UnitNumber(1u),
|
||||
associatedCharactersUnitNumbers = emptyList(),
|
||||
position = MapEntityPosition(
|
||||
x = 30.6,
|
||||
y = 84.1,
|
||||
),
|
||||
colour = Colour(
|
||||
red = 0.86f,
|
||||
green = 0.5f,
|
||||
blue = 0.12f,
|
||||
alpha = 0.5f
|
||||
),
|
||||
chatColour = Colour(
|
||||
red = 1f,
|
||||
green = 0.62f,
|
||||
blue = 0.25f,
|
||||
alpha = 1f
|
||||
),
|
||||
lastOnline = Tick(2287061u)
|
||||
),
|
||||
eventType = "on_player_joined_game",
|
||||
modVersion = "0.2.1",
|
||||
tick = Tick(2287072u)
|
||||
)
|
||||
|
||||
actual shouldBe expected
|
||||
|
||||
expected.data.objectName shouldBe FactorioObjectData.ObjectName.LuaPlayer
|
||||
}
|
||||
|
||||
test("Then: expect encode equals json") {
|
||||
val encoded = jsonMapperKafkatorio.encodeToString(actual)
|
||||
encoded.shouldEqualJson(json)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
context("Given: json LuaSurface") {
|
||||
// language=JSON
|
||||
val json = """
|
||||
{
|
||||
"data": {
|
||||
"objectName": "LuaSurface",
|
||||
"name": "nauvis",
|
||||
"index": 1,
|
||||
"daytime": 0.745
|
||||
},
|
||||
"packetType": "EVENT",
|
||||
"eventType": "on_tick",
|
||||
"modVersion": "0.2.1",
|
||||
"tick": 2301240
|
||||
}
|
||||
""".trimIndent()
|
||||
|
||||
context("When: decoded") {
|
||||
val actual: KafkatorioPacket = jsonMapperKafkatorio.decodeFromString(json)
|
||||
|
||||
test("should equal obj") {
|
||||
|
||||
val expected = FactorioEvent(
|
||||
data = SurfaceData(
|
||||
name = "nauvis",
|
||||
index = SurfaceIndex(1u),
|
||||
daytime = 0.745
|
||||
),
|
||||
eventType = "on_tick",
|
||||
modVersion = "0.2.1",
|
||||
tick = Tick(2301240u)
|
||||
)
|
||||
|
||||
actual shouldBe expected
|
||||
|
||||
expected.data.objectName shouldBe FactorioObjectData.ObjectName.LuaSurface
|
||||
}
|
||||
|
||||
test("Then: expect encode equals json") {
|
||||
val encoded = jsonMapperKafkatorio.encodeToString(actual)
|
||||
encoded.shouldEqualJson(json)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
context("Given: LuaEntity on_player_changed_position") {
|
||||
// language=JSON
|
||||
val json = """
|
||||
{
|
||||
"data": {
|
||||
"objectName": "LuaEntity",
|
||||
"name": "character",
|
||||
"type": "character",
|
||||
"active": true,
|
||||
"health": 250,
|
||||
"healthRatio": 1,
|
||||
"surface": 1,
|
||||
"force": 1,
|
||||
"unitNumber": 1,
|
||||
"position": {
|
||||
"x": 37.5,
|
||||
"y": 81.1
|
||||
}
|
||||
},
|
||||
"packetType": "EVENT",
|
||||
"eventType": "on_player_changed_position",
|
||||
"modVersion": "0.2.1",
|
||||
"tick": 2301231
|
||||
}
|
||||
""".trimIndent()
|
||||
context("When: decoded") {
|
||||
val actual: KafkatorioPacket = jsonMapperKafkatorio.decodeFromString(json)
|
||||
|
||||
test("parse") {
|
||||
|
||||
val expected = FactorioEvent(
|
||||
data = EntityData(
|
||||
name = "character",
|
||||
type = "character",
|
||||
active = true,
|
||||
health = 250.0,
|
||||
healthRatio = 1.0,
|
||||
surface = SurfaceIndex(1u),
|
||||
unitNumber = UnitNumber(1u),
|
||||
force = ForceIndex(1u),
|
||||
playerIndex = null,
|
||||
position = MapEntityPosition(
|
||||
x = 37.5,
|
||||
y = 81.1,
|
||||
)
|
||||
),
|
||||
eventType = "on_player_changed_position",
|
||||
modVersion = "0.2.1",
|
||||
tick = Tick(2301231u)
|
||||
)
|
||||
|
||||
actual shouldBe expected
|
||||
|
||||
expected.data.objectName shouldBe FactorioObjectData.ObjectName.LuaEntity
|
||||
}
|
||||
|
||||
test("Then: expect encode equals json") {
|
||||
val encoded = jsonMapperKafkatorio.encodeToString(actual)
|
||||
encoded.shouldEqualJson(json)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
context("Given: LuaTiles on_player_built_tile") {
|
||||
// language=JSON
|
||||
val json = """
|
||||
{
|
||||
"data": {
|
||||
"objectName": "LuaTiles",
|
||||
"surfaceIndex": 1,
|
||||
"tiles": [
|
||||
{
|
||||
"y": 10,
|
||||
"x": -65,
|
||||
"proto": "refined-concrete"
|
||||
},
|
||||
{
|
||||
"y": 11,
|
||||
"x": -65,
|
||||
"proto": "red-earth"
|
||||
},
|
||||
{
|
||||
"y": 10,
|
||||
"x": -64,
|
||||
"proto": "blue-cheese"
|
||||
},
|
||||
{
|
||||
"y": 11,
|
||||
"x": -64,
|
||||
"proto": "refined-concrete"
|
||||
}
|
||||
]
|
||||
},
|
||||
"packetType": "EVENT",
|
||||
"eventType": "on_player_built_tile",
|
||||
"modVersion": "0.2.2",
|
||||
"tick": 2429929
|
||||
}
|
||||
""".trimIndent()
|
||||
context("When: decoded") {
|
||||
val actual: KafkatorioPacket = jsonMapperKafkatorio.decodeFromString(json)
|
||||
|
||||
test("parse") {
|
||||
|
||||
val expected = FactorioEvent(
|
||||
data = MapTiles(
|
||||
surfaceIndex = SurfaceIndex(1u),
|
||||
tiles = listOf(
|
||||
MapTile(
|
||||
proto = PrototypeName("refined-concrete"),
|
||||
x = -65,
|
||||
y = 10,
|
||||
),
|
||||
MapTile(
|
||||
proto = PrototypeName("red-earth"),
|
||||
x = -65,
|
||||
y = 11,
|
||||
),
|
||||
MapTile(
|
||||
proto = PrototypeName("blue-cheese"),
|
||||
x = -64,
|
||||
y = 10,
|
||||
),
|
||||
MapTile(
|
||||
proto = PrototypeName("refined-concrete"),
|
||||
x = -64,
|
||||
y = 11,
|
||||
),
|
||||
)
|
||||
),
|
||||
eventType = "on_player_built_tile",
|
||||
modVersion = "0.2.2",
|
||||
tick = Tick(2429929u)
|
||||
)
|
||||
|
||||
actual shouldBe expected
|
||||
|
||||
expected.data.objectName shouldBe FactorioObjectData.ObjectName.LuaTiles
|
||||
}
|
||||
|
||||
test("Then: expect encode equals json") {
|
||||
val encoded = jsonMapperKafkatorio.encodeToString(actual)
|
||||
encoded.shouldEqualJson(json)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
context("Given: packet FactorioConfigurationUpdate") {
|
||||
// language=JSON
|
||||
val json = """
|
||||
{
|
||||
"modVersion": "0.2.8",
|
||||
"packetType": "CONFIG",
|
||||
"tick": 534,
|
||||
"allMods": [
|
||||
{
|
||||
"modName": "kafkatorio-events",
|
||||
"currentVersion": "0.2.8",
|
||||
"previousVersion": "0.2.7"
|
||||
},
|
||||
{
|
||||
"modName": "base",
|
||||
"currentVersion": "1.1.53"
|
||||
}
|
||||
],
|
||||
"factorioData": {}
|
||||
}
|
||||
""".trimIndent()
|
||||
context("When: decoded") {
|
||||
val actual: FactorioConfigurationUpdate = jsonMapperKafkatorio.decodeFromString(json)
|
||||
|
||||
test("parse") {
|
||||
|
||||
val expected = FactorioConfigurationUpdate(
|
||||
modVersion = "0.2.8",
|
||||
tick = Tick(534u),
|
||||
factorioData = FactorioGameDataUpdate(null, null),
|
||||
allMods = listOf(
|
||||
FactorioModInfo(
|
||||
modName = "kafkatorio-events",
|
||||
currentVersion = "0.2.8",
|
||||
previousVersion = "0.2.7"
|
||||
),
|
||||
FactorioModInfo(
|
||||
modName = "base",
|
||||
currentVersion = "1.1.53",
|
||||
previousVersion = null
|
||||
),
|
||||
)
|
||||
)
|
||||
|
||||
actual shouldBe expected
|
||||
|
||||
expected.packetType shouldBe KafkatorioPacket.PacketType.CONFIG
|
||||
}
|
||||
|
||||
test("Then: expect encode equals json") {
|
||||
val encoded = jsonMapperKafkatorio.encodeToString(actual)
|
||||
encoded.shouldEqualJson(json)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
// context("Given: json on_player_joined_game") {
|
||||
//
|
||||
// // language=JSON
|
||||
// val json = """
|
||||
// {
|
||||
// "data": {
|
||||
// "objectName": "LuaPlayer",
|
||||
// "force": 1,
|
||||
// "surface": 1,
|
||||
// "name": "fredthedeadhead",
|
||||
// "characterUnitNumber": 1,
|
||||
// "associatedCharactersUnitNumbers": {},
|
||||
// "position": {
|
||||
// "x": 30.6,
|
||||
// "y": 84.1
|
||||
// },
|
||||
// "colour": {
|
||||
// "red": 0.86,
|
||||
// "green": 0.5,
|
||||
// "blue": 0.12,
|
||||
// "alpha": 0.5
|
||||
// },
|
||||
// "chatColour": {
|
||||
// "red": 1,
|
||||
// "green": 0.62,
|
||||
// "blue": 0.25
|
||||
// },
|
||||
// "lastOnline": 2287061
|
||||
// },
|
||||
// "packetType": "EVENT",
|
||||
// "eventType": "on_player_joined_game",
|
||||
// "modVersion": "0.2.1",
|
||||
// "tick": 2287072
|
||||
// }
|
||||
// """.trimIndent()
|
||||
// context("When: decoded") {
|
||||
// val actual: KafkatorioPacket = jsonMapperKafkatorio.decodeFromString(json)
|
||||
//
|
||||
// test("Then: parse") {
|
||||
//
|
||||
// val expected = FactorioEvent(
|
||||
// data = PlayerData(
|
||||
// name = "fredthedeadhead",
|
||||
// surface = SurfaceIndex(1u),
|
||||
// force = ForceIndex(1u),
|
||||
// characterUnitNumber = UnitNumber(1u),
|
||||
// associatedCharactersUnitNumbers = emptyList(),
|
||||
// position = MapEntityPosition(
|
||||
// x = 30.6,
|
||||
// y = 84.1,
|
||||
// ),
|
||||
// colour = Colour(
|
||||
// red = 0.86f,
|
||||
// green = 0.5f,
|
||||
// blue = 0.12f,
|
||||
// alpha = 0.5f
|
||||
// ),
|
||||
// chatColour = Colour(
|
||||
// red = 1f,
|
||||
// green = 0.62f,
|
||||
// blue = 0.25f,
|
||||
// alpha = 1f
|
||||
// ),
|
||||
// lastOnline = Tick(2287061u)
|
||||
// ),
|
||||
// eventType = "on_player_joined_game",
|
||||
// modVersion = "0.2.1",
|
||||
// tick = Tick(2287072u)
|
||||
// )
|
||||
//
|
||||
// actual shouldBe expected
|
||||
//
|
||||
// expected.data.objectName shouldBe FactorioObjectData.ObjectName.LuaPlayer
|
||||
// }
|
||||
//
|
||||
// test("Then: expect encode equals json") {
|
||||
// val encoded = jsonMapperKafkatorio.encodeToString(actual)
|
||||
// encoded.shouldEqualJson(json)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// context("Given: json LuaSurface") {
|
||||
// // language=JSON
|
||||
// val json = """
|
||||
// {
|
||||
// "data": {
|
||||
// "objectName": "LuaSurface",
|
||||
// "name": "nauvis",
|
||||
// "index": 1,
|
||||
// "daytime": 0.745
|
||||
// },
|
||||
// "packetType": "EVENT",
|
||||
// "eventType": "on_tick",
|
||||
// "modVersion": "0.2.1",
|
||||
// "tick": 2301240
|
||||
// }
|
||||
// """.trimIndent()
|
||||
//
|
||||
// context("When: decoded") {
|
||||
// val actual: KafkatorioPacket = jsonMapperKafkatorio.decodeFromString(json)
|
||||
//
|
||||
// test("should equal obj") {
|
||||
//
|
||||
// val expected = FactorioEvent(
|
||||
// data = SurfaceData(
|
||||
// name = "nauvis",
|
||||
// index = SurfaceIndex(1u),
|
||||
// daytime = 0.745
|
||||
// ),
|
||||
// eventType = "on_tick",
|
||||
// modVersion = "0.2.1",
|
||||
// tick = Tick(2301240u)
|
||||
// )
|
||||
//
|
||||
// actual shouldBe expected
|
||||
//
|
||||
// expected.data.objectName shouldBe FactorioObjectData.ObjectName.LuaSurface
|
||||
// }
|
||||
//
|
||||
// test("Then: expect encode equals json") {
|
||||
// val encoded = jsonMapperKafkatorio.encodeToString(actual)
|
||||
// encoded.shouldEqualJson(json)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// context("Given: LuaEntity on_player_changed_position") {
|
||||
// // language=JSON
|
||||
// val json = """
|
||||
// {
|
||||
// "data": {
|
||||
// "objectName": "LuaEntity",
|
||||
// "name": "character",
|
||||
// "type": "character",
|
||||
// "active": true,
|
||||
// "health": 250,
|
||||
// "healthRatio": 1,
|
||||
// "surface": 1,
|
||||
// "force": 1,
|
||||
// "unitNumber": 1,
|
||||
// "position": {
|
||||
// "x": 37.5,
|
||||
// "y": 81.1
|
||||
// }
|
||||
// },
|
||||
// "packetType": "EVENT",
|
||||
// "eventType": "on_player_changed_position",
|
||||
// "modVersion": "0.2.1",
|
||||
// "tick": 2301231
|
||||
// }
|
||||
// """.trimIndent()
|
||||
// context("When: decoded") {
|
||||
// val actual: KafkatorioPacket = jsonMapperKafkatorio.decodeFromString(json)
|
||||
//
|
||||
// test("parse") {
|
||||
//
|
||||
// val expected = FactorioEvent(
|
||||
// data = EntityData(
|
||||
// name = "character",
|
||||
// type = "character",
|
||||
// active = true,
|
||||
// health = 250.0,
|
||||
// healthRatio = 1.0,
|
||||
// surface = SurfaceIndex(1u),
|
||||
// unitNumber = UnitNumber(1u),
|
||||
// force = ForceIndex(1u),
|
||||
// playerIndex = null,
|
||||
// position = MapEntityPosition(
|
||||
// x = 37.5,
|
||||
// y = 81.1,
|
||||
// )
|
||||
// ),
|
||||
// eventType = "on_player_changed_position",
|
||||
// modVersion = "0.2.1",
|
||||
// tick = Tick(2301231u)
|
||||
// )
|
||||
//
|
||||
// actual shouldBe expected
|
||||
//
|
||||
// expected.data.objectName shouldBe FactorioObjectData.ObjectName.LuaEntity
|
||||
// }
|
||||
//
|
||||
// test("Then: expect encode equals json") {
|
||||
// val encoded = jsonMapperKafkatorio.encodeToString(actual)
|
||||
// encoded.shouldEqualJson(json)
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// context("Given: LuaTiles on_player_built_tile") {
|
||||
// // language=JSON
|
||||
// val json = """
|
||||
// {
|
||||
// "data": {
|
||||
// "objectName": "LuaTiles",
|
||||
// "surfaceIndex": 1,
|
||||
// "tiles": [
|
||||
// {
|
||||
// "y": 10,
|
||||
// "x": -65,
|
||||
// "proto": "refined-concrete"
|
||||
// },
|
||||
// {
|
||||
// "y": 11,
|
||||
// "x": -65,
|
||||
// "proto": "red-earth"
|
||||
// },
|
||||
// {
|
||||
// "y": 10,
|
||||
// "x": -64,
|
||||
// "proto": "blue-cheese"
|
||||
// },
|
||||
// {
|
||||
// "y": 11,
|
||||
// "x": -64,
|
||||
// "proto": "refined-concrete"
|
||||
// }
|
||||
// ]
|
||||
// },
|
||||
// "packetType": "EVENT",
|
||||
// "eventType": "on_player_built_tile",
|
||||
// "modVersion": "0.2.2",
|
||||
// "tick": 2429929
|
||||
// }
|
||||
// """.trimIndent()
|
||||
// context("When: decoded") {
|
||||
// val actual: KafkatorioPacket = jsonMapperKafkatorio.decodeFromString(json)
|
||||
//
|
||||
// test("parse") {
|
||||
//
|
||||
// val expected = FactorioEvent(
|
||||
// data = MapTiles(
|
||||
// surfaceIndex = SurfaceIndex(1u),
|
||||
// tiles = listOf(
|
||||
// MapTile(
|
||||
// proto = PrototypeName("refined-concrete"),
|
||||
// x = -65,
|
||||
// y = 10,
|
||||
// ),
|
||||
// MapTile(
|
||||
// proto = PrototypeName("red-earth"),
|
||||
// x = -65,
|
||||
// y = 11,
|
||||
// ),
|
||||
// MapTile(
|
||||
// proto = PrototypeName("blue-cheese"),
|
||||
// x = -64,
|
||||
// y = 10,
|
||||
// ),
|
||||
// MapTile(
|
||||
// proto = PrototypeName("refined-concrete"),
|
||||
// x = -64,
|
||||
// y = 11,
|
||||
// ),
|
||||
// )
|
||||
// ),
|
||||
// eventType = "on_player_built_tile",
|
||||
// modVersion = "0.2.2",
|
||||
// tick = Tick(2429929u)
|
||||
// )
|
||||
//
|
||||
// actual shouldBe expected
|
||||
//
|
||||
// expected.data.objectName shouldBe FactorioObjectData.ObjectName.LuaTiles
|
||||
// }
|
||||
//
|
||||
// test("Then: expect encode equals json") {
|
||||
// val encoded = jsonMapperKafkatorio.encodeToString(actual)
|
||||
// encoded.shouldEqualJson(json)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// context("Given: packet FactorioConfigurationUpdate") {
|
||||
// // language=JSON
|
||||
// val json = """
|
||||
// {
|
||||
// "modVersion": "0.2.8",
|
||||
// "packetType": "CONFIG",
|
||||
// "tick": 534,
|
||||
// "allMods": [
|
||||
// {
|
||||
// "modName": "kafkatorio-events",
|
||||
// "currentVersion": "0.2.8",
|
||||
// "previousVersion": "0.2.7"
|
||||
// },
|
||||
// {
|
||||
// "modName": "base",
|
||||
// "currentVersion": "1.1.53"
|
||||
// }
|
||||
// ],
|
||||
// "factorioData": {}
|
||||
// }
|
||||
// """.trimIndent()
|
||||
// context("When: decoded") {
|
||||
// val actual: FactorioConfigurationUpdate = jsonMapperKafkatorio.decodeFromString(json)
|
||||
//
|
||||
// test("parse") {
|
||||
//
|
||||
// val expected = FactorioConfigurationUpdate(
|
||||
// modVersion = "0.2.8",
|
||||
// tick = Tick(534u),
|
||||
// factorioData = FactorioGameDataUpdate(null, null),
|
||||
// allMods = listOf(
|
||||
// FactorioModInfo(
|
||||
// modName = "kafkatorio-events",
|
||||
// currentVersion = "0.2.8",
|
||||
// previousVersion = "0.2.7"
|
||||
// ),
|
||||
// FactorioModInfo(
|
||||
// modName = "base",
|
||||
// currentVersion = "1.1.53",
|
||||
// previousVersion = null
|
||||
// ),
|
||||
// )
|
||||
// )
|
||||
//
|
||||
// actual shouldBe expected
|
||||
//
|
||||
// expected.packetType shouldBe KafkatorioPacket.PacketType.CONFIG
|
||||
// }
|
||||
//
|
||||
// test("Then: expect encode equals json") {
|
||||
// val encoded = jsonMapperKafkatorio.encodeToString(actual)
|
||||
// encoded.shouldEqualJson(json)
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// }
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue