baltica 0.0.10 → 0.0.12

package/dist/bridge/bridge-options.d.ts

@@ -1,6 +1,5 @@
 import type * as Protocol from "@serenityjs/protocol";
 import type { PacketNames } from "../client";
-import type { ClientCacheStatusPacket } from "../network/packets/client-cache-status";
 import { type ServerOptions } from "../server/server-options";
 export type BridgePlayerEvents = {
     [K in PacketNames as `clientbound-${K}`]: [
@@ -18,14 +17,6 @@ export type BridgePlayerEvents = {
             modified: boolean;
         }
     ];
-} & {
-    "serverbound-ClientCacheStatusPacket": [
-        packet: ClientCacheStatusPacket,
-        eventStatus: {
-            cancelled: boolean;
-            modified: boolean;
-        }
-    ];
 };
 export type BridgeOptions = ServerOptions & {
     destination: {

package/dist/bridge/bridge-player.d.ts

@@ -1,4 +1,4 @@
-import type { LevelChunkPacket } from "../network/packets/level-chunk-packet";
+import { type LevelChunkPacket } from "@serenityjs/protocol";
 import type { Client } from "../client";
 import { Emitter } from "../libs";
 import type { Player } from "../server";

package/dist/bridge/bridge.js

@@ -41,7 +41,6 @@ const raknet_1 = require("@sanctumterra/raknet");
 const protocol_1 = require("@serenityjs/protocol");
 const Protocol = __importStar(require("@serenityjs/protocol"));
 const client_1 = require("../client");
-const level_chunk_packet_1 = require("../network/packets/level-chunk-packet");
 const server_1 = require("../server");
 const bridge_options_1 = require("./bridge-options");
 const bridge_player_1 = require("./bridge-player");
@@ -60,9 +59,9 @@ class Bridge extends server_1.Server {
     initializePacketCache() {
         const CLIENT_CACHE_STATUS_ID = 129;
         this.packetClassCache.set(CLIENT_CACHE_STATUS_ID, protocol_1.ClientCacheStatusPacket);
-        const levelChunkId = level_chunk_packet_1.LevelChunkPacket.id;
+        const levelChunkId = Protocol.LevelChunkPacket.id;
         if (levelChunkId !== undefined) {
-            this.packetClassCache.set(levelChunkId, level_chunk_packet_1.LevelChunkPacket);
+            this.packetClassCache.set(levelChunkId, Protocol.LevelChunkPacket);
         }
     }
     getPacketClass(id, PacketClass) {
@@ -88,7 +87,7 @@ class Bridge extends server_1.Server {
         }
         if (packetName === "LevelChunkPacket" && !player.postStartGame) {
             try {
-                player.levelChunkQueue.push(new level_chunk_packet_1.LevelChunkPacket(buffer).deserialize());
+                player.levelChunkQueue.push(new Protocol.LevelChunkPacket(buffer).deserialize());
             }
             catch (e) {
                 raknet_1.Logger.error("Failed to deserialize LevelChunkPacket for queueing", e);
@@ -200,8 +199,8 @@ class Bridge extends server_1.Server {
                 const frame = new raknet_1.Frame();
                 frame.orderChannel = 0;
                 frame.payload = rakDisconnect.serialize();
-                player.client.raknet.sendFrame(frame, raknet_1.Priority.Immediate);
-                player.client.send(disconnect);
+                player.client?.raknet?.sendFrame(frame, raknet_1.Priority.Immediate);
+                player.client?.send(disconnect);
             }
         });
     }
@@ -223,6 +222,7 @@ class Bridge extends server_1.Server {
     onLogin(player) {
         console.log("Creating Client");
         const payload = player.player.data.payload;
+        console.log(this.options);
         const client = new client_1.Client({
             host: this.options.destination.host,
             port: this.options.destination.port,

package/dist/bridge/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./bridge";
+export * from "./bridge-player";
+export * from "./bridge-options";

package/dist/{network/packets → bridge}/index.js

@@ -14,12 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./add-painting"), exports);
-__exportStar(require("./motion-predict-hints"), exports);
-__exportStar(require("./set-last-hurt-by"), exports);
-__exportStar(require("./update-subchunk-blocks"), exports);
-__exportStar(require("./level-chunk-packet"), exports);
-__exportStar(require("./client-cache-status"), exports);
-__exportStar(require("./set-default-gamemode"), exports);
-__exportStar(require("./update-player-game-type"), exports);
-__exportStar(require("./update-block-sync"), exports);
+__exportStar(require("./bridge"), exports);
+__exportStar(require("./bridge-player"), exports);
+__exportStar(require("./bridge-options"), exports);

package/dist/client/client-data.js

@@ -41,6 +41,7 @@ const jose = __importStar(require("jose"));
 const node_crypto_1 = require("node:crypto");
 const login_data_1 = require("./types/login-data");
 const raknet_1 = require("@sanctumterra/raknet");
+const client_options_1 = require("./client-options");
 const PUBLIC_KEY = "MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAECRXueJeTDqNRRgJi/vlRufByu/2G0i2Ebt6YMar5QX/R0DIIyrJMcUpruK4QveTfJSTp3Shlq4Gk34cD/4GUWwkv0DVuzeuB+tXija7HBxii03NHDbPAD0AKnLr2wdAp";
 const algorithm = "ES384";
 const curve = "secp384r1";
@@ -56,7 +57,18 @@ class ClientData {
         const loginPacket = new protocol_1.LoginPacket();
         const chain = [this.loginData.clientIdentityChain, ...this.accessToken];
         const userChain = this.loginData.clientUserChain;
-        const encodedChain = JSON.stringify({ chain });
+        let encodedChain = "";
+        if ((0, client_options_1.versionHigherThan)(this.client.options.version, "1.21.80")) {
+            const certificate = JSON.stringify({ chain });
+            encodedChain = JSON.stringify({
+                AuthenticationType: 2,
+                Certificate: certificate,
+                Token: "",
+            });
+        }
+        else {
+            encodedChain = JSON.stringify({ chain });
+        }
         loginPacket.protocol = this.client.protocol;
         loginPacket.tokens = new protocol_1.LoginTokens(userChain, encodedChain);
         return loginPacket;

package/dist/client/client-options.d.ts

@@ -1,15 +1,13 @@
 import { CompressionMethod, InputMode } from "@serenityjs/protocol";
 import type * as Protocol from "@serenityjs/protocol";
-import type { ClientCacheStatusPacket } from "../network/packets/client-cache-status";
 import type { Advertisement } from "@sanctumterra/raknet";
-import { AddPaintingPacket, UpdateSubchunkBlocksPacket, MotionPredictHintsPacket, SetLastHurtByPacket, SetDefaultGamemodePacket, UpdatePlayerGameTypePacket, UpdateBlockSyncPacket } from "../network/packets";
-import { LevelChunkPacket } from "../network/packets/level-chunk-packet";
 import type { SkinData } from "./types/payload";
 export declare enum ProtocolList {
     "1.21.50" = 766,
     "1.21.60" = 776,
     "1.21.70" = 786,
-    "1.21.80" = 800
+    "1.21.80" = 800,
+    "1.21.90" = 818
 }
 export declare enum DeviceOS {
     Undefined = 0,
@@ -29,6 +27,20 @@ export declare enum DeviceOS {
     WindowsPhone = 14,
     Linux = 15
 }
+/**
+ * Checks if client version is higher than the specified version
+ * @param clientVersion The client version to check
+ * @param targetVersion The version to compare against
+ * @returns True if client version is higher than targetVersion
+ */
+export declare function versionHigherThan(clientVersion: keyof typeof ProtocolList, targetVersion: keyof typeof ProtocolList): boolean;
+/**
+ * Checks if client version is lower than the specified version
+ * @param clientVersion The client version to check
+ * @param targetVersion The version to compare against
+ * @returns True if client version is lower than targetVersion
+ */
+export declare function versionLowerThan(clientVersion: keyof typeof ProtocolList, targetVersion: keyof typeof ProtocolList): boolean;
 type LoginPacketOptions = {
     DeviceModel: string;
     CurrentInputMode: InputMode;
@@ -63,27 +75,8 @@ type ClientEvents = {
     [K in PacketNames]: [packet: InstanceType<(typeof Protocol)[K]>];
 } & {
     session: [];
-    ClientCacheStatusPacket: [
-        packet: InstanceType<typeof ClientCacheStatusPacket>
-    ];
-    UpdateSubchunkBlocksPacket: [
-        packet: InstanceType<typeof UpdateSubchunkBlocksPacket>
-    ];
-    MotionPredictHintsPacket: [
-        packet: InstanceType<typeof MotionPredictHintsPacket>
-    ];
-    SetLastHurtByPacket: [packet: InstanceType<typeof SetLastHurtByPacket>];
-    SetDefaultGamemodePacket: [
-        packet: InstanceType<typeof SetDefaultGamemodePacket>
-    ];
-    UpdatePlayerGameTypePacket: [
-        packet: InstanceType<typeof UpdatePlayerGameTypePacket>
-    ];
-    UpdateBlockSyncPacket: [packet: InstanceType<typeof UpdateBlockSyncPacket>];
 } & {
     packet: [packet: InstanceType<(typeof Protocol)[PacketNames]>];
     connect: [packet: Advertisement];
 };
 export { type ClientOptions, defaultClientOptions, type ClientEvents, type PacketNames, };
-export type ExtraPacketType = typeof LevelChunkPacket | typeof AddPaintingPacket | typeof UpdateSubchunkBlocksPacket | typeof MotionPredictHintsPacket | typeof SetLastHurtByPacket | typeof SetDefaultGamemodePacket | typeof UpdatePlayerGameTypePacket | typeof UpdateBlockSyncPacket;
-export declare const ExtraPackets: Record<number, ExtraPacketType>;

package/dist/client/client-options.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtraPackets = exports.defaultClientOptions = exports.DeviceOS = exports.ProtocolList = void 0;
+exports.defaultClientOptions = exports.DeviceOS = exports.ProtocolList = void 0;
+exports.versionHigherThan = versionHigherThan;
+exports.versionLowerThan = versionLowerThan;
 const protocol_1 = require("@serenityjs/protocol");
-const packets_1 = require("../network/packets");
-const level_chunk_packet_1 = require("../network/packets/level-chunk-packet");
 var ProtocolList;
 (function (ProtocolList) {
     ProtocolList[ProtocolList["1.21.50"] = 766] = "1.21.50";
     ProtocolList[ProtocolList["1.21.60"] = 776] = "1.21.60";
     ProtocolList[ProtocolList["1.21.70"] = 786] = "1.21.70";
     ProtocolList[ProtocolList["1.21.80"] = 800] = "1.21.80";
+    ProtocolList[ProtocolList["1.21.90"] = 818] = "1.21.90";
 })(ProtocolList || (exports.ProtocolList = ProtocolList = {}));
 var DeviceOS;
 (function (DeviceOS) {
@@ -30,6 +31,24 @@ var DeviceOS;
     DeviceOS[DeviceOS["WindowsPhone"] = 14] = "WindowsPhone";
     DeviceOS[DeviceOS["Linux"] = 15] = "Linux";
 })(DeviceOS || (exports.DeviceOS = DeviceOS = {}));
+/**
+ * Checks if client version is higher than the specified version
+ * @param clientVersion The client version to check
+ * @param targetVersion The version to compare against
+ * @returns True if client version is higher than targetVersion
+ */
+function versionHigherThan(clientVersion, targetVersion) {
+    return ProtocolList[clientVersion] > ProtocolList[targetVersion];
+}
+/**
+ * Checks if client version is lower than the specified version
+ * @param clientVersion The client version to check
+ * @param targetVersion The version to compare against
+ * @returns True if client version is lower than targetVersion
+ */
+function versionLowerThan(clientVersion, targetVersion) {
+    return ProtocolList[clientVersion] < ProtocolList[targetVersion];
+}
 const defaultClientOptions = {
     host: "127.0.0.1",
     port: 19132,
@@ -37,7 +56,7 @@ const defaultClientOptions = {
     compressionMethod: protocol_1.CompressionMethod.Zlib,
     compressionLevel: 7,
     deviceOS: DeviceOS.NintendoSwitch,
-    version: "1.21.80",
+    version: "1.21.90",
     username: "SanctumTerra",
     tokensFolder: "tokens",
     viewDistance: 10,
@@ -45,7 +64,7 @@ const defaultClientOptions = {
     offline: false,
     worker: false,
     loginOptions: {
-        DeviceModel: "Beans something something",
+        DeviceModel: "Bean Bag Chair",
         CurrentInputMode: protocol_1.InputMode.GamePad,
         DefaultInputMode: protocol_1.InputMode.GamePad,
     },
@@ -56,13 +75,3 @@ const defaultClientOptions = {
     graphicsMode: 0,
 };
 exports.defaultClientOptions = defaultClientOptions;
-exports.ExtraPackets = {
-    [58]: level_chunk_packet_1.LevelChunkPacket,
-    [22]: packets_1.AddPaintingPacket,
-    [172]: packets_1.UpdateSubchunkBlocksPacket,
-    [157]: packets_1.MotionPredictHintsPacket,
-    [96]: packets_1.SetLastHurtByPacket,
-    [105]: packets_1.SetDefaultGamemodePacket,
-    [151]: packets_1.UpdatePlayerGameTypePacket,
-    [110]: packets_1.UpdateBlockSyncPacket,
-};

package/dist/client/client.js

@@ -7,7 +7,6 @@ const raknet_1 = require("@sanctumterra/raknet");
 const protocol_1 = require("@serenityjs/protocol");
 const emitter_1 = require("../libs/emitter");
 const network_1 = require("../network");
-const client_cache_status_1 = require("../network/packets/client-cache-status");
 const packet_encryptor_1 = require("../network/packet-encryptor");
 const client_data_1 = require("./client-data");
 const client_options_1 = require("./client-options");
@@ -123,11 +122,8 @@ class Client extends emitter_1.Emitter {
     /** Already decompressed packets */
     processPacket(buffer) {
         const id = (0, protocol_1.getPacketId)(buffer);
-        let PacketClass = protocol_1.Packets[id];
+        const PacketClass = protocol_1.Packets[id];
         try {
-            if (id in client_options_1.ExtraPackets) {
-                PacketClass = client_options_1.ExtraPackets[id];
-            }
             if (!PacketClass || !PacketClass.name) {
                 raknet_1.Logger.warn(`Unknown Game packet ${id}`);
                 return;
@@ -227,7 +223,9 @@ class Client extends emitter_1.Emitter {
         response.response = protocol_1.ResourcePackResponse.Completed;
         this.send(response);
         if (packet instanceof protocol_1.ResourcePacksInfoPacket) {
-            this.send(client_cache_status_1.ClientCacheStatusPacket.create(false));
+            const packet = new protocol_1.ClientCacheStatusPacket();
+            packet.enabled = false;
+            this.send(packet);
         }
     }
     startEncryption(iv) {

package/dist/client/types/payload.d.ts

@@ -43,7 +43,6 @@ export type Payload = {
     SkinImageWidth: number;
     SkinResourcePatch: string;
     ThirdPartyName: string;
-    ThirdPartyNameOnly: boolean;
     TrustedSkin: boolean;
     UIProfile: number;
     GraphicsMode: number;

package/dist/client/types/payload.js

@@ -82,7 +82,6 @@ const createDefaultPayload = (client) => {
         SkinImageWidth: skin.skinData.SkinImageWidth,
         SkinResourcePatch: skin.skinData.SkinResourcePatch,
         ThirdPartyName: username,
-        ThirdPartyNameOnly: false,
         TrustedSkin: skin.skinData.TrustedSkin,
         UIProfile: client.options.uiProfile,
         GraphicsMode: client.options.graphicsMode,