diff --git a/mapsync-mod/build.gradle.kts b/mapsync-mod/build.gradle.kts index f1802a86..f072cd1d 100644 --- a/mapsync-mod/build.gradle.kts +++ b/mapsync-mod/build.gradle.kts @@ -9,6 +9,15 @@ base { archivesName = project.property("archives_base_name").toString() } +loom { + runConfigs.configureEach { + programArgs += buildList { + // Use same username between runClient runs + addAll(listOf("--username", "LocalModTester")) + } + } +} + dependencies { minecraft(libs.minecraft) loom { diff --git a/mapsync-server/package-lock.json b/mapsync-server/package-lock.json index bddbf621..292db64f 100644 --- a/mapsync-server/package-lock.json +++ b/mapsync-server/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "async-mutex": "^0.4.0", "better-sqlite3": "^9.5.0", - "kysely": "^0.26.1", + "kysely": "^0.28.14", "source-map-support": "^0.5.21", "zod": "^3.21.4", "zod-validation-error": "^1.3.1" @@ -258,12 +258,12 @@ "license": "ISC" }, "node_modules/kysely": { - "version": "0.26.3", - "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.26.3.tgz", - "integrity": "sha512-yWSgGi9bY13b/W06DD2OCDDHQmq1kwTGYlQ4wpZkMOJqMGCstVCFIvxCCVG4KfY1/3G0MhDAcZsip/Lw8/vJWw==", + "version": "0.28.14", + "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.28.14.tgz", + "integrity": "sha512-SU3lgh0rPvq7upc6vvdVrCsSMUG1h3ChvHVOY7wJ2fw4C9QEB7X3d5eyYEyULUX7UQtxZJtZXGuT6U2US72UYA==", "license": "MIT", "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" } }, "node_modules/mimic-response": { diff --git a/mapsync-server/package.json b/mapsync-server/package.json index eebbda65..d186a1a1 100644 --- a/mapsync-server/package.json +++ b/mapsync-server/package.json @@ -9,12 +9,12 @@ "format": "prettier -w .", "test": "true", "start": "node --security-revert=CVE-2023-46809 -r source-map-support/register dist/main.js", - "start:dev": "tsc && node --inspect -r source-map-support/register dist/main.js" + "start:dev": "tsc && node --security-revert=CVE-2023-46809 --inspect -r source-map-support/register dist/main.js" }, "dependencies": { "async-mutex": "^0.4.0", "better-sqlite3": "^9.5.0", - "kysely": "^0.26.1", + "kysely": "^0.28.14", "source-map-support": "^0.5.21", "zod": "^3.21.4", "zod-validation-error": "^1.3.1" diff --git a/mapsync-server/src/Renderer.ts b/mapsync-server/src/Renderer.ts deleted file mode 100644 index 3d6f603b..00000000 --- a/mapsync-server/src/Renderer.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { spawn } from "child_process"; -import { promisify } from "util"; -import * as database from "./database"; - -export async function renderTile( - dimension: string, - tileX: number, - tileZ: number, -) { - const allChunks = await database.getRegionChunks(dimension, tileX, tileZ); - - const proc = spawn( - "../render/target/release/civmap-render", - [String(tileX), String(tileZ), "tiles"], - { cwd: "../render" }, // so render can find blocks.json - ); - proc.stdout.pipe(process.stdout); - proc.stderr.pipe(process.stderr); - - const write = promisify(proc.stdin.write.bind(proc.stdin)); - - const numBuf = Buffer.allocUnsafe(4); - numBuf.writeUInt32BE(allChunks.length); - await write(numBuf); - - const chunkHeaderBuf = Buffer.allocUnsafe(4 + 4 + 2); // reused. 32+32+16 bit - for (const chunk of allChunks) { - chunkHeaderBuf.writeInt32BE(chunk.chunk_x, 0); - chunkHeaderBuf.writeInt32BE(chunk.chunk_z, 4); - chunkHeaderBuf.writeUInt16BE(chunk.version, 8); - await write(chunkHeaderBuf); - await write(chunk.data); - } -} diff --git a/mapsync-server/src/constants.ts b/mapsync-server/src/constants.ts index 5d087814..817eeb52 100644 --- a/mapsync-server/src/constants.ts +++ b/mapsync-server/src/constants.ts @@ -1,7 +1,4 @@ -export const SUPPORTED_VERSIONS = new Set([ - "2.1.0-1.21.11+fabric", - // "2.1.0-1.21.11+forge", -]); +export const SUPPORTED_VERSIONS = new Set(["2.2.0-SNAPSHOT-1.21.11+fabric"]); // SHA1 produces 160-bit (20-byte) hashes // https://en.wikipedia.org/wiki/SHA-1 diff --git a/mapsync-server/src/main.ts b/mapsync-server/src/main.ts index 554e4d9f..f7fdb953 100644 --- a/mapsync-server/src/main.ts +++ b/mapsync-server/src/main.ts @@ -102,8 +102,6 @@ export class Main { if (client === otherClient) continue; otherClient.send(pkt); } - - // TODO queue tile render for web map } async handleCatchupRequest(