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

bump versions (kafka, ktor, hoplite, simple-syslog, factorio, tstl, typed-factorio, kotka, gradle-node) and update code to compile

Browse source
This commit is contained in:
Adam 2022-08-13 12:05:17 +02:00
parent c1542dcb42
commit c9ae17d418
10 changed files with 50 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/events-mod/src/main/typescript/generated/kafkatorio-schema.ts
View file

@ -269,8 +269,8 @@ export type MapChunkPosition = [
];
export interface EntityItemGroup {
name: string;
type: string;
name?: string | null;
type?: string | null;
parentName?: string | null;
}

6
modules/events-mod/src/main/typescript/main/events/converters.ts
View file

@ -18,13 +18,13 @@ export namespace Converters {
import floor = math.floor;
const mapEventIdToName = new LuaTable<defines.Events, DefinedEventName>()
const mapEventIdToName = new LuaTable<defines.events, DefinedEventName>()
for (const [eventName, eventId] of pairs(defines.events)) {
mapEventIdToName.set(eventId, eventName)
}
export function eventNameString(event: defines.Events): EventName {
export function eventNameString(event: defines.events): EventName {
return mapEventIdToName.get(event) as EventName
}
@ -165,7 +165,7 @@ export namespace Converters {
}
export function collisionBox(collision_box: BoundingBoxRead): MapBoundingBox {
export function collisionBox(collision_box: BoundingBox): MapBoundingBox {
return {
leftTop: Converters.entityPosition(collision_box.left_top),
rightBottom: Converters.entityPosition(collision_box.right_bottom),

13
modules/events-mod/src/main/typescript/main/events/prototypeUpdates.ts
View file

@ -65,7 +65,7 @@ function getEntityPrototypes(): PrototypesByType<FactorioPrototype.Entity> {
protoId: Converters.prototypeId(entity.type, entity.name),
group: convertItemGroup(entity.group),
subgroup: convertItemSubgroup(entity.subgroup),
subgroup: convertItemGroup(entity.subgroup),
isBuilding: entity.is_building,
isEntityWithOwner: entity.is_entity_with_owner,
@ -96,15 +96,6 @@ function convertItemGroup(itemGroup: LuaGroup): EntityItemGroup {
return {
name: itemGroup.name,
type: itemGroup.type,
parentName: null,
}
}
function convertItemSubgroup(itemGroup: LuaGroup): EntityItemGroup {
return {
name: itemGroup.name,
type: itemGroup.type,
parentName: itemGroup.group?.name,
parentName: itemGroup.group?.name ?? null,
}
}