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

version bumps

Browse source
This commit is contained in:
Adam 2022-12-06 00:23:52 +01:00
parent c015e9c478
commit fcb870072a
7 changed files with 151 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

36
modules/events-mod/package-lock.json generated
View file

@ -10,9 +10,9 @@
"integrity": "sha512-GtmhFqyg+txpGgGLM3mlS3R6AEG9MQhKALxxcbr6SBzg9u7YAXcPKqUBaBYd6nH+Pi/eQLcWz4BNOLhz8v4TjQ=="
},
"enhanced-resolve": {
"version": "5.10.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
"integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
"version": "5.12.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
"integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
"requires": {
"graceful-fs": "^4.2.4",
"tapable": "^2.2.0"
@ -37,17 +37,17 @@
}
},
"is-core-module": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
"integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
"integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
"requires": {
"has": "^1.0.3"
}
},
"lua-types": {
"version": "2.13.0",
"resolved": "https://registry.npmjs.org/lua-types/-/lua-types-2.13.0.tgz",
"integrity": "sha512-wra+mIPZlcbm8bYoM6QutEwTOAjZ9KyKMiaidGeZ+QJItIAK9hwG+1I6GCDKnW0T9E/Xv2IoTFtZwxQv4zAIJw=="
"version": "2.13.1",
"resolved": "https://registry.npmjs.org/lua-types/-/lua-types-2.13.1.tgz",
"integrity": "sha512-rRwtvX6kS+5MpuO3xpvKsnYjdSDDI064Qq1OqX8gY+r+0l7m3dFLiZPDFoHqH22jaBpEvcHcPs6+WD7qkdmFsA=="
},
"path-parse": {
"version": "1.0.7",
@ -80,19 +80,19 @@
"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
},
"typed-factorio": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.9.0.tgz",
"integrity": "sha512-k3qVo5ehUYgJItQp4BT4MtAodzeUgLk3Wzf3TG53SNdce1vYfIdmlNMjfG17wkOpoCBCA1p6XvMQxkWcbk23ZA=="
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.11.0.tgz",
"integrity": "sha512-RYCEpcECiQ2dw1tj03bPv6fRXCevuAP89ipMBv67FsY09+W7ApZkfjXIJq9RaxoIMtbGkqPUql33O/DYVMtAng=="
},
"typescript": {
"version": "4.8.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
"integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="
"version": "4.9.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz",
"integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA=="
},
"typescript-to-lua": {
"version": "1.10.1",
"resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.10.1.tgz",
"integrity": "sha512-R6KQc1YzFcejyaZ9tAvVK0MFTlRS1b10vON5sxjtGVSUWl+W4KRLik0LDCgKfI0wnDQH+LNVnKBNUsBfTtEoQQ==",
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.11.1.tgz",
"integrity": "sha512-XxGOf0zBRrMocGr4BbVaJdnvnk4yTrUs0BCdamfb/Qg94hKZg8ydRUy17ZtHZfYmnwFupR88R5DZXIpHYP0S5g==",
"requires": {
"@typescript-to-lua/language-extensions": "1.0.0",
"enhanced-resolve": "^5.8.2",

8
modules/events-mod/package.json
View file

@ -11,10 +11,10 @@
},
"devDependencies": {},
"dependencies": {
"lua-types": "2.13.0",
"typescript-to-lua": "1.10.1",
"typed-factorio": "1.9.0",
"typescript": "4.8.4"
"lua-types": "2.13.1",
"typescript-to-lua": "1.11.1",
"typed-factorio": "1.11.0",
"typescript": "4.9"
},
"license": "GPL-3.0-only",
"peerDependencies": {},

46
modules/events-mod/src/generated/lua/lualib_bundle.lua
View file

@ -972,8 +972,7 @@ do
if not rawget(metatable, "_descriptors") then
metatable._descriptors = {}
end
local descriptor = __TS__CloneDescriptor(desc)
metatable._descriptors[key] = descriptor
metatable._descriptors[key] = __TS__CloneDescriptor(desc)
metatable.__index = descriptorIndex
metatable.__newindex = descriptorNewIndex
end
@ -1385,10 +1384,6 @@ local function __TS__MathSign(val)
return 0
end
local function __TS__Modulo50(a, b)
return a - math.floor(a / b) * b
end
local function __TS__Number(value)
local valueType = type(value)
if valueType == "number" then
@ -1609,22 +1604,6 @@ local function __TS__ParseFloat(numberString)
return ____number_1
end
local function __TS__StringSubstr(self, from, length)
if from ~= from then
from = 0
end
if length ~= nil then
if length ~= length or length <= 0 then
return ""
end
length = length + from
end
if from >= 0 then
from = from + 1
end
return string.sub(self, from, length)
end
local function __TS__StringSubstring(self, start, ____end)
if ____end ~= ____end then
____end = 0
@ -1654,9 +1633,9 @@ do
base = 16
local ____TS__Match_result__0_0
if __TS__Match(hexMatch, "-") then
____TS__Match_result__0_0 = "-" .. __TS__StringSubstr(numberString, #hexMatch)
____TS__Match_result__0_0 = "-" .. __TS__StringSubstring(numberString, #hexMatch)
else
____TS__Match_result__0_0 = __TS__StringSubstr(numberString, #hexMatch)
____TS__Match_result__0_0 = __TS__StringSubstring(numberString, #hexMatch)
end
numberString = ____TS__Match_result__0_0
end
@ -1668,7 +1647,7 @@ do
if base <= 10 then
____temp_1 = __TS__StringSubstring(parseIntBasePattern, 0, base)
else
____temp_1 = __TS__StringSubstr(parseIntBasePattern, 0, 10 + 2 * (base - 10))
____temp_1 = __TS__StringSubstring(parseIntBasePattern, 0, 10 + 2 * (base - 10))
end
local allowedDigits = ____temp_1
local pattern = ("^%s*(-?[" .. allowedDigits) .. "]*)"
@ -2378,6 +2357,22 @@ local function __TS__StringStartsWith(self, searchString, position)
return string.sub(self, position + 1, #searchString + position) == searchString
end
local function __TS__StringSubstr(self, from, length)
if from ~= from then
from = 0
end
if length ~= nil then
if length ~= length or length <= 0 then
return ""
end
length = length + from
end
if from >= 0 then
from = from + 1
end
return string.sub(self, from, length)
end
local function __TS__StringTrim(self)
local result = string.gsub(self, "^[%s ]*(.-)[%s ]*$", "%1")
return result
@ -2477,7 +2472,6 @@ return {
__TS__MathAtan2 = __TS__MathAtan2,
__TS__MathModf = __TS__MathModf,
__TS__MathSign = __TS__MathSign,
__TS__Modulo50 = __TS__Modulo50,
__TS__New = __TS__New,
__TS__Number = __TS__Number,
__TS__NumberIsFinite = __TS__NumberIsFinite,

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

@ -18,6 +18,7 @@ import io.kvision.maps.externals.leaflet.geo.LatLng
import io.kvision.maps.externals.leaflet.layer.LayerGroup
import io.kvision.maps.externals.leaflet.layer.tile.TileLayer
import io.kvision.utils.px
import js.core.jso
import kotlinx.browser.document
import kotlinx.browser.window
import kotlinx.coroutines.CoroutineName
@ -30,7 +31,6 @@ import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import kotlinx.js.jso
import org.w3c.dom.HTMLElement
import org.w3c.dom.Image
import org.w3c.dom.asList

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

@ -5,7 +5,7 @@ import dev.adamko.kafkatorio.schema.common.Tick
import dev.adamko.kafkatorio.schema.packets.PlayerUpdate
import io.kvision.maps.Maps
import io.kvision.maps.externals.leaflet.layer.vector.CircleMarker
import kotlinx.js.jso
import js.core.jso
data class PlayerState(
val index: PlayerIndex,