pw-js-api 0.3.3-dev.b4830b9 → 0.3.4-dev.a7ff2b9

package/cm/api/PWApiClient.d.ts

@@ -1,5 +1,5 @@
 import PWGameClient from "../game/PWGameClient.js";
-import type { APIFailure, AuthResultSuccess, CollectionResult, ColPlayer, ColQuery, ColWorld, JoinKeyResult, ListBlockResult, LobbyResult } from "../types/api.js";
+import type { APIFailure, AuthResultSuccess, CollectionResult, ColUser, ColQuery, ColWorld, JoinKeyResult, ListBlockResult, LobbyResult } from "../types/api.js";
 import type { GameClientSettings, WorldJoinData } from "../types/game.js";
 /**
  * Note if you want to join a world, use new PWGameClient() then run .init()
@@ -127,14 +127,14 @@ export default class PWApiClient {
      * Returns the collection result of the query - players.
      * Default: page - 1, perPage - 10
      */
-    getPlayers(page: number, perPage: number, query?: ColQuery<ColPlayer>): Promise<CollectionResult<ColPlayer>>;
-    getPlayers(query: ColQuery<ColPlayer>): Promise<CollectionResult<ColPlayer>>;
+    getPlayers(page: number, perPage: number, query?: ColQuery<ColUser>): Promise<CollectionResult<ColUser>>;
+    getPlayers(query: ColQuery<ColUser>): Promise<CollectionResult<ColUser>>;
     /**
      * Returns the collection result of the query - players.
      * Default: page - 1, perPage - 10
      */
-    static getPlayers(page: number, perPage: number, query?: ColQuery<ColPlayer>): Promise<CollectionResult<ColPlayer>>;
-    static getPlayers(query: ColQuery<ColPlayer>): Promise<CollectionResult<ColPlayer>>;
+    static getPlayers(page?: number, perPage?: number, query?: ColQuery<ColUser>): Promise<CollectionResult<ColUser>>;
+    static getPlayers(query: ColQuery<ColUser>): Promise<CollectionResult<ColUser>>;
     /**
      * Returns the collection result of the query - public worlds.
      * Default: page - 1, perPage - 10
@@ -145,7 +145,7 @@ export default class PWApiClient {
      * Returns the collection result of the query - public worlds.
      * Default: page - 1, perPage - 10
      */
-    static getPublicWorlds(page: number, perPage: number, query?: ColQuery<ColWorld>): Promise<CollectionResult<ColWorld>>;
+    static getPublicWorlds(page?: number, perPage?: number, query?: ColQuery<ColWorld>): Promise<CollectionResult<ColWorld>>;
     static getPublicWorlds(query: ColQuery<ColWorld>): Promise<CollectionResult<ColWorld>>;
     /**
      * Returns the lobby result.
@@ -194,11 +194,11 @@ export default class PWApiClient {
     /**
      * Note that username is cap sensitive, and may require you to use toUppercase
      */
-    getPlayerByName(username: string): Promise<CollectionResult<ColPlayer>>;
+    getPlayerByName(username: string): Promise<ColUser | undefined>;
     /**
      * Note that username is cap sensitive, and may require you to use toUppercase
      */
-    static getPlayerByName(username: string): Promise<CollectionResult<ColPlayer>>;
+    static getPlayerByName(username: string): Promise<ColUser | undefined>;
     /**
      * IMPORTANT: This will return JSON for any responses that have the content-type of json, anything else will be sent back as Uint8array.
      * If you're expecting raw bytes, make sure the endpoint is guaranteed to give you that otherwise there isn't a reason.

package/cm/api/PWApiClient.js

@@ -154,7 +154,7 @@ class PWApiClient {
             query = page;
             page = 1;
         }
-        return this.request(`${Constants_js_1.Endpoint.Api}/api/collections/public_profiles/records?page=${page}&perPage=${perPage}${(0, Misc_js_1.queryToString)(query)}`);
+        return this.request(`${Constants_js_1.Endpoint.Api}/api/collections/users/records?page=${page}&perPage=${perPage}${(0, Misc_js_1.queryToString)(query)}`);
     }
     getPublicWorlds(page = 1, perPage = 10, query) {
         if (typeof page === "object") {
@@ -168,7 +168,7 @@ class PWApiClient {
             query = page;
             page = 1;
         }
-        return this.request(`${Constants_js_1.Endpoint.Api}/api/collections/public_worlds/records?page=${page}&perPage=${perPage}${(0, Misc_js_1.queryToString)(query)}`);
+        return this.request(`${Constants_js_1.Endpoint.Api}/api/collections/worlds/records?page=${page}&perPage=${perPage}${(0, Misc_js_1.queryToString)(query)}`);
     }
     /**
      * Returns the lobby result.
@@ -222,7 +222,8 @@ class PWApiClient {
      * Note that username is cap sensitive, and may require you to use toUppercase
      */
     static getPlayerByName(username) {
-        return this.getPlayers(1, 1, { filter: { username } });
+        return this.getPlayers(1, 1, { filter: { username } })
+            .then(res => res.items[0]);
     }
     // This doesn't seem to work so I commented it out, not removing it as there might be an oversight idk
     // getMessageTypes() {
@@ -253,6 +254,7 @@ class PWApiClient {
             headers["content-type"] = "application/json";
             method = "POST";
         }
+        let status = 0;
         return fetch(url, {
             headers, method,
             body: body
@@ -261,10 +263,17 @@ class PWApiClient {
             if (res.status === 403)
                 throw Error("Forbidden access - token invalid or unauthorised.");
             // else if (res.status !== 200) throw Error("")
+            status = res.status;
             if ((_a = res.headers.get("content-type")) === null || _a === void 0 ? void 0 : _a.startsWith("application/json"))
                 return res.json();
             else
                 return res.arrayBuffer();
+        })
+            .then(data => {
+            if (status > 400)
+                throw data;
+            else
+                return data;
         });
     }
     /**
@@ -285,4 +294,4 @@ class PWApiClient {
  */
 PWApiClient.roomTypes = [];
 exports.default = PWApiClient;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PWApiClient.js","sourceRoot":"","sources":["../../lib/api/PWApiClient.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PWApiClient.js","sourceRoot":"","sources":["../../lib/api/PWApiClient.ts"],"names":[],"mappings":";;;AAAA,sFAAmD;AAGnD,uDAAgD;AAChD,6CAAgD;AAEhD;;GAEG;AACH,MAAqB,WAAW;IAuC5B,YAAY,KAAa,EAAE,QAAiB;QAjC5C;;WAEG;QACK,YAAO,GAAG;YACd,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,EAAE;SACf,CAAA;QAED,aAAQ,GAAG,KAAK,CAAC;QA0Bb,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEjC,sBAAsB;IAC1B,CAAC;IAYD,YAAY,CAAC,KAAc,EAAE,QAAiB;QAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAEnH,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YAC3B,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QACrC,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAiC,GAAG,uBAAQ,CAAC,GAAG,2CAA2C,EAC1G,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,CAChC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACT,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC;gBACjB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;gBACvB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACzB,CAAC;YAED,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC,CAAA,qBAAqB;IAC5B,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,QAAgB,EAAE,MAAc;QACvC,OAAO,IAAI,CAAC,OAAO,CAAgB,GAAG,uBAAQ,CAAC,GAAG,gBAAgB,QAAQ,IAAI,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IAC7G,CAAC;IAED;;;;;;OAMG;IACH,SAAS,CAAC,MAAc,EAAE,GAA8E;QACpG,MAAM,IAAI,GAAG,IAAI,yBAAY,CAAC,IAAI,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,YAAY,CAAC,CAAC;QAEvD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IAOD,8BAA8B;IAC9B;;OAEG;IACH,IAAI,SAAS;QACT,OAAO,WAAW,CAAC,SAAS,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,YAAY;QACR,OAAO,WAAW,CAAC,YAAY,EAAE,CAAC;IACtC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,YAAY;QACf,OAAO,IAAI,CAAC,OAAO,CAAW,GAAG,uBAAQ,CAAC,QAAQ,gBAAgB,CAAC;aAC9D,IAAI,CAAC,GAAG,CAAC,EAAE;YACR,WAAW,CAAC,SAAS,GAAG,GAAG,CAAC;YAE5B,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,EAAE;YACP,OAAO,WAAW,CAAC,SAAS,CAAC;QACjC,CAAC,CAAC,CAAA;IACV,CAAC;IAED;;;;;;OAMG;IACH,WAAW;QACP,OAAO,WAAW,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,WAAW;QACd,OAAO,IAAI,CAAC,OAAO,CAAyB,GAAG,uBAAQ,CAAC,QAAQ,WAAW,CAAC,CAAC;IACjF,CAAC;IAeD,aAAa,CAAC,SAAS,GAAG,KAAK,EAAE,QAAkB;QAC/C,8DAA8D;QAC9D,IAAI,QAAQ;YAAE,OAAO,WAAW,CAAC,aAAa,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAEpE,OAAO,WAAW,CAAC,aAAa,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAcD,MAAM,CAAO,aAAa;qEAAC,SAAS,GAAG,KAAK,EAAE,QAAkB;YAC5D,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,QAAQ;oBAAE,OAAO,IAAI,CAAC,UAAU,CAAC;gBACvE,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,IAAI,QAAQ;oBAAE,OAAO,IAAI,CAAC,aAAa,CAAC;YAChF,CAAC;YAED,OAAO,IAAI,CAAC,OAAO,CAAoB,GAAG,uBAAQ,CAAC,QAAQ,aAAa,CAAC;iBACpE,IAAI,CAAC,GAAG,CAAC,EAAE;gBACR,MAAM,GAAG,GAAG,EAAqC,CAAC;gBAClD,MAAM,GAAG,GAAG,EAA4B,CAAC,CAAC,iGAAiG;gBAE3I,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC7C,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;oBAC7C,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC5B,CAAC;gBAED,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC;gBACzB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;gBAEtB,IAAI,QAAQ;oBAAE,OAAO,GAAG,CAAC;;oBACpB,OAAO,GAAG,CAAC;YACpB,CAAC,CAAC,CAAA;QACV,CAAC;KAAA;IAQD,cAAc,CAAC,OAAoC,CAAC,EAAE,UAAkB,EAAE,EAAE,KAA0B;QAClG,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,KAAK,GAAG,IAAI,CAAC;YACb,IAAI,GAAG,CAAC,CAAC;QACb,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAA6B,GAAG,uBAAQ,CAAC,GAAG,wCAAwC,IAAI,YAAY,OAAO,GAAG,IAAA,uBAAa,EAAC,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9K,CAAC;IAQD,UAAU,CAAC,OAAmC,CAAC,EAAE,UAAkB,EAAE,EAAE,KAAyB;QAC5F,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,KAAK,GAAG,IAAI,CAAC;YACb,IAAI,GAAG,CAAC,CAAC;QACb,CAAC;QAED,OAAO,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC;IAQD,MAAM,CAAC,UAAU,CAAC,OAAmC,CAAC,EAAE,UAAkB,EAAE,EAAE,KAAyB;QACnG,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,KAAK,GAAG,IAAI,CAAC;YACb,IAAI,GAAG,CAAC,CAAC;QACb,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAA4B,GAAG,uBAAQ,CAAC,GAAG,uCAAuC,IAAI,YAAY,OAAO,GAAG,IAAA,uBAAa,EAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC3J,CAAC;IAQD,eAAe,CAAC,OAAoC,CAAC,EAAE,UAAkB,EAAE,EAAE,KAA0B;QACnG,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,KAAK,GAAG,IAAI,CAAC;YACb,IAAI,GAAG,CAAC,CAAC;QACb,CAAC;QAED,OAAO,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IAQD,MAAM,CAAC,eAAe,CAAC,OAAoC,CAAC,EAAE,UAAkB,EAAE,EAAE,KAA0B;QAC1G,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,KAAK,GAAG,IAAI,CAAC;YACb,IAAI,GAAG,CAAC,CAAC;QACb,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAA6B,GAAG,uBAAQ,CAAC,GAAG,wCAAwC,IAAI,YAAY,OAAO,GAAG,IAAA,uBAAa,EAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC7J,CAAC;IAED;;OAEG;IACH,gBAAgB;QACZ,OAAO,WAAW,CAAC,gBAAgB,EAAE,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,gBAAgB;QACnB,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAE7F,OAAO,IAAI,CAAC,OAAO,CAAc,GAAG,uBAAQ,CAAC,QAAQ,cAAc,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAC3F,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,EAAU;QACrB,OAAO,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,EAAU;QAC5B,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;aAChD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IAUD,UAAU,CAAC,KAAiD,EAAE,KAAK,GAAG,KAAK;QACvE,IAAI,KAAK;YAAE,OAAO,GAAG,uBAAQ,CAAC,GAAG,8BAA8B,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAE3F,OAAO,WAAW,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAUD,MAAM,CAAC,UAAU,CAAC,KAAiD,EAAE,KAAK,GAAG,KAAK;QAC9E,IAAI,KAAK;YAAE,OAAO,GAAG,uBAAQ,CAAC,GAAG,8BAA8B,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAE3F,OAAO,IAAI,CAAC,OAAO,CAAyB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;aACpE,IAAI,CAAC,GAAG,CAAC,EAAE;YACR,IAAI,SAAS,IAAI,GAAG;gBAAE,MAAM,KAAK,CAAC,mDAAmD,CAAC,CAAC;YAEvF,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACX,CAAC;IAED;;OAEG;IACH,eAAe,CAAC,QAAgB;QAC5B,OAAO,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,QAAgB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC;aACjD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,sGAAsG;IACtG,sBAAsB;IACtB,0EAA0E;IAC1E,oEAAoE;IACpE,IAAI;IAEJ;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,CAAI,GAAW,EAAE,IAAiC,EAAE,KAAc;QAC5E,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,uBAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,uBAAQ,CAAC,QAAQ,CAAC,CAAC;YAAE,MAAM,KAAK,CAAC,uEAAuE,CAAC,CAAC;QAE/J,MAAM,OAAO,GAA0B;QACnC,kCAAkC;SACrC,CAAC;QAEF,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC;QAEhE,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE1D,IAAI,MAAM,GAAG,KAAK,CAAC;QAEnB,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;YAC9B,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;YAC7C,MAAM,GAAG,MAAM,CAAC;QACpB,CAAC;QAED,IAAI,MAAM,GAAG,CAAC,CAAC;QAEf,OAAO,KAAK,CAAC,GAAG,EAAE;YACd,OAAO,EAAE,MAAM;YACf,IAAI,EAAE,IAAI;SACb,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;;YACV,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG;gBAAE,MAAM,KAAK,CAAC,mDAAmD,CAAC,CAAC;YACzF,+CAA+C;YAE/C,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;YAEpB,IAAI,MAAA,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,0CAAE,UAAU,CAAC,kBAAkB,CAAC;gBAAE,OAAO,GAAG,CAAC,IAAI,EAAO,CAAC;;gBACvF,OAAO,GAAG,CAAC,WAAW,EAAO,CAAC;QACvC,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,EAAE;YACT,IAAI,MAAM,GAAG,GAAG;gBAAE,MAAM,IAAI,CAAC;;gBACxB,OAAO,IAAI,CAAC;QACrB,CAAC,CAAC,CAAA;IACN,CAAC;IAGD;;;;;;;;OAQG;IACO,OAAO,CAAI,GAAW,EAAE,IAAiC,EAAE,eAAe,GAAG,KAAK;QACxF,OAAO,WAAW,CAAC,OAAO,CAAI,GAAG,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACtF,CAAC;;AA5UD;;GAEG;AACI,qBAAS,GAAY,EAAE,AAAd,CAAe;kBAzGd,WAAW"}

package/cm/gen/world_pb.d.ts

@@ -157,10 +157,10 @@ export type WorldPacket = Message<"WorldPackets.WorldPacket"> & {
         case: "playerDirectMessagePacket";
     } | {
         /**
-         * @generated from field: WorldPackets.PlayerTouchPlayerPacket player_touch_player_packet = 24;
+         * @generated from field: WorldPackets.PlayerExchangeEffectsPacket player_exchange_effects_packet = 24;
          */
-        value: PlayerTouchPlayerPacket;
-        case: "playerTouchPlayerPacket";
+        value: PlayerExchangeEffectsPacket;
+        case: "playerExchangeEffectsPacket";
     } | {
         /**
          * @generated from field: WorldPackets.PlayerTeleportedPacket player_teleported_packet = 25;
@@ -249,6 +249,18 @@ export type WorldPacket = Message<"WorldPackets.WorldPacket"> & {
          */
         value: PlayerCounterTransactionPacket;
         case: "playerCounterTransactionPacket";
+    } | {
+        /**
+         * @generated from field: WorldPackets.PlayerSetCollectiblesPacket player_set_collectibles_packet = 39;
+         */
+        value: PlayerSetCollectiblesPacket;
+        case: "playerSetCollectiblesPacket";
+    } | {
+        /**
+         * @generated from field: WorldPackets.PlayerWoot player_woot = 40;
+         */
+        value: PlayerWoot;
+        case: "playerWoot";
     } | {
         case: undefined;
         value?: undefined;
@@ -286,9 +298,9 @@ export type GlobalSwitchChangedPacket = Message<"WorldPackets.GlobalSwitchChange
      */
     switchId: number;
     /**
-     * @generated from field: bool enabled = 3;
+     * @generated from field: bool switch_enabled = 3;
      */
-    enabled: boolean;
+    switchEnabled: boolean;
 };
 /**
  * Describes the message WorldPackets.GlobalSwitchChangedPacket.
@@ -304,9 +316,9 @@ export type GlobalSwitchResetPacket = Message<"WorldPackets.GlobalSwitchResetPac
      */
     playerId: number;
     /**
-     * @generated from field: bool enabled = 2;
+     * @generated from field: bool switch_enabled = 2;
      */
-    enabled: boolean;
+    switchEnabled: boolean;
 };
 /**
  * Describes the message WorldPackets.GlobalSwitchResetPacket.
@@ -456,28 +468,24 @@ export type WorldBlockPlacedPacket = Message<"WorldPackets.WorldBlockPlacedPacke
      * @generated from field: optional int32 player_id = 1;
      */
     playerId?: number;
-    /**
-     * @generated from field: bool is_fill_operation = 3;
-     */
-    isFillOperation: boolean;
     /**
      * Repeated for use in fill operations
      *
-     * @generated from field: repeated WorldPackets.PointInteger positions = 4;
+     * @generated from field: repeated WorldPackets.PointInteger positions = 2;
      */
     positions: PointInteger[];
     /**
-     * @generated from field: int32 layer = 5;
+     * @generated from field: int32 layer = 3;
      */
     layer: number;
     /**
-     * @generated from field: int32 block_id = 6;
+     * @generated from field: int32 block_id = 4;
      */
     blockId: number;
     /**
      * Legacy? Holds a byte[] that can hold extra information
      *
-     * @generated from field: bytes extra_fields = 7;
+     * @generated from field: bytes extra_fields = 5;
      */
     extraFields: Uint8Array;
 };
@@ -562,13 +570,19 @@ export type PlayerInitPacket = Message<"WorldPackets.PlayerInitPacket"> & {
     /**
      * Very specific world state
      *
-     * @generated from field: bytes global_switch_state = 6;
+     * @generated from field: bytes global_switch_state = 5;
      */
     globalSwitchState: Uint8Array;
     /**
-     * @generated from field: bytes world_data = 7;
+     * @generated from field: bytes world_data = 6;
      */
     worldData: Uint8Array;
+    /**
+     * Did player woot?
+     *
+     * @generated from field: WorldPackets.PlayerWoot player_woot = 7;
+     */
+    playerWoot?: PlayerWoot;
 };
 /**
  * Describes the message WorldPackets.PlayerInitPacket.
@@ -809,7 +823,7 @@ export declare const PlayerModModePacketSchema: GenMessage<PlayerModModePacket>;
  */
 export type PlayerEnterSecretEditKeyPacket = Message<"WorldPackets.PlayerEnterSecretEditKeyPacket"> & {
     /**
-     * @generated from field: string secret_edit_key = 2;
+     * @generated from field: string secret_edit_key = 1;
      */
     secretEditKey: string;
 };
@@ -867,7 +881,11 @@ export type PlayerTouchBlockPacket = Message<"WorldPackets.PlayerTouchBlockPacke
      */
     position?: PointInteger;
     /**
-     * @generated from field: int32 block_id = 3;
+     * @generated from field: int32 layer = 3;
+     */
+    layer: number;
+    /**
+     * @generated from field: int32 block_id = 4;
      */
     blockId: number;
 };
@@ -876,73 +894,30 @@ export type PlayerTouchBlockPacket = Message<"WorldPackets.PlayerTouchBlockPacke
  * Use `create(PlayerTouchBlockPacketSchema)` to create a new message.
  */
 export declare const PlayerTouchBlockPacketSchema: GenMessage<PlayerTouchBlockPacket>;
-/**
- * @generated from message WorldPackets.PlayerTouchPlayerPacket
- */
-export type PlayerTouchPlayerPacket = Message<"WorldPackets.PlayerTouchPlayerPacket"> & {
-    /**
-     * @generated from field: optional int32 player_id = 1;
-     */
-    playerId?: number;
-    /**
-     * @generated from field: int32 touched_player = 2;
-     */
-    touchedPlayer: number;
-    /**
-     * @generated from field: WorldPackets.PlayerTouchPlayerPacket.TouchType touch_type = 3;
-     */
-    touchType: PlayerTouchPlayerPacket_TouchType;
-};
-/**
- * Describes the message WorldPackets.PlayerTouchPlayerPacket.
- * Use `create(PlayerTouchPlayerPacketSchema)` to create a new message.
- */
-export declare const PlayerTouchPlayerPacketSchema: GenMessage<PlayerTouchPlayerPacket>;
-/**
- * @generated from enum WorldPackets.PlayerTouchPlayerPacket.TouchType
- */
-export declare enum PlayerTouchPlayerPacket_TouchType {
-    /**
-     * @generated from enum value: START = 0;
-     */
-    START = 0,
-    /**
-     * @generated from enum value: END = 1;
-     */
-    END = 1
-}
-/**
- * Describes the enum WorldPackets.PlayerTouchPlayerPacket.TouchType.
- */
-export declare const PlayerTouchPlayerPacket_TouchTypeSchema: GenEnum<PlayerTouchPlayerPacket_TouchType>;
 /**
  * @generated from message WorldPackets.PlayerAddEffectPacket
  */
 export type PlayerAddEffectPacket = Message<"WorldPackets.PlayerAddEffectPacket"> & {
     /**
-     * @generated from field: optional int32 player_id = 1;
-     */
-    playerId?: number;
-    /**
-     * @generated from field: bool from_server = 2;
+     * @generated from field: int32 player_id = 1;
      */
-    fromServer: boolean;
+    playerId: number;
     /**
-     * Effect data
-     *
-     * Todo: Make this an enum.
-     *
-     * @generated from field: int32 effect_id = 3;
+     * @generated from field: int32 effect_id = 2;
      */
     effectId: number;
     /**
-     * @generated from field: optional int32 duration = 4;
+     * @generated from field: optional int32 duration = 3;
      */
     duration?: number;
     /**
-     * @generated from field: optional int32 strength = 5;
+     * @generated from field: optional int32 strength = 4;
      */
     strength?: number;
+    /**
+     * @generated from field: optional int32 from_player_id = 5;
+     */
+    fromPlayerId?: number;
 };
 /**
  * Describes the message WorldPackets.PlayerAddEffectPacket.
@@ -954,15 +929,17 @@ export declare const PlayerAddEffectPacketSchema: GenMessage<PlayerAddEffectPack
  */
 export type PlayerRemoveEffectPacket = Message<"WorldPackets.PlayerRemoveEffectPacket"> & {
     /**
-     * @generated from field: optional int32 player_id = 1;
+     * @generated from field: int32 player_id = 1;
      */
-    playerId?: number;
+    playerId: number;
     /**
-     * Todo: Make this an enum.
-     *
-     * @generated from field: int32 effect_id = 4;
+     * @generated from field: int32 effect_id = 2;
      */
     effectId: number;
+    /**
+     * @generated from field: optional int32 to_player_id = 3;
+     */
+    toPlayerId?: number;
 };
 /**
  * Describes the message WorldPackets.PlayerRemoveEffectPacket.
@@ -974,19 +951,29 @@ export declare const PlayerRemoveEffectPacketSchema: GenMessage<PlayerRemoveEffe
  */
 export type PlayerResetEffectsPacket = Message<"WorldPackets.PlayerResetEffectsPacket"> & {
     /**
-     * @generated from field: optional int32 player_id = 1;
-     */
-    playerId?: number;
-    /**
-     * @generated from field: bool from_server = 2;
+     * @generated from field: int32 player_id = 1;
      */
-    fromServer: boolean;
+    playerId: number;
 };
 /**
  * Describes the message WorldPackets.PlayerResetEffectsPacket.
  * Use `create(PlayerResetEffectsPacketSchema)` to create a new message.
  */
 export declare const PlayerResetEffectsPacketSchema: GenMessage<PlayerResetEffectsPacket>;
+/**
+ * @generated from message WorldPackets.PlayerExchangeEffectsPacket
+ */
+export type PlayerExchangeEffectsPacket = Message<"WorldPackets.PlayerExchangeEffectsPacket"> & {
+    /**
+     * @generated from field: int32 target_player_id = 1;
+     */
+    targetPlayerId: number;
+};
+/**
+ * Describes the message WorldPackets.PlayerExchangeEffectsPacket.
+ * Use `create(PlayerExchangeEffectsPacketSchema)` to create a new message.
+ */
+export declare const PlayerExchangeEffectsPacketSchema: GenMessage<PlayerExchangeEffectsPacket>;
 /**
  * @generated from message WorldPackets.PlayerTeamUpdatePacket
  */
@@ -1062,15 +1049,11 @@ export declare const PlayerLocalSwitchChangedPacketSchema: GenMessage<PlayerLoca
  */
 export type PlayerLocalSwitchResetPacket = Message<"WorldPackets.PlayerLocalSwitchResetPacket"> & {
     /**
-     * @generated from field: optional int32 player_id = 1;
-     */
-    playerId?: number;
-    /**
-     * @generated from field: int32 switch_id = 2;
+     * @generated from field: int32 player_id = 1;
      */
-    switchId: number;
+    playerId: number;
     /**
-     * @generated from field: bool switch_enabled = 3;
+     * @generated from field: bool switch_enabled = 2;
      */
     switchEnabled: boolean;
 };
@@ -1101,6 +1084,42 @@ export type PlayerDirectMessagePacket = Message<"WorldPackets.PlayerDirectMessag
  * Use `create(PlayerDirectMessagePacketSchema)` to create a new message.
  */
 export declare const PlayerDirectMessagePacketSchema: GenMessage<PlayerDirectMessagePacket>;
+/**
+ * @generated from message WorldPackets.PlayerSetCollectiblesPacket
+ */
+export type PlayerSetCollectiblesPacket = Message<"WorldPackets.PlayerSetCollectiblesPacket"> & {
+    /**
+     * @generated from field: optional int32 player_id = 1;
+     */
+    playerId?: number;
+    /**
+     * @generated from field: repeated WorldPackets.PointInteger collected = 2;
+     */
+    collected: PointInteger[];
+};
+/**
+ * Describes the message WorldPackets.PlayerSetCollectiblesPacket.
+ * Use `create(PlayerSetCollectiblesPacketSchema)` to create a new message.
+ */
+export declare const PlayerSetCollectiblesPacketSchema: GenMessage<PlayerSetCollectiblesPacket>;
+/**
+ * @generated from message WorldPackets.PlayerWoot
+ */
+export type PlayerWoot = Message<"WorldPackets.PlayerWoot"> & {
+    /**
+     * @generated from field: optional int32 player_id = 1;
+     */
+    playerId?: number;
+    /**
+     * @generated from field: bool active = 2;
+     */
+    active: boolean;
+};
+/**
+ * Describes the message WorldPackets.PlayerWoot.
+ * Use `create(PlayerWootSchema)` to create a new message.
+ */
+export declare const PlayerWootSchema: GenMessage<PlayerWoot>;
 /**
  *
  * ============================================
@@ -1284,6 +1303,10 @@ export type WorldMeta = Message<"WorldPackets.WorldMeta"> & {
      * @generated from field: bool has_secret_edit_key = 11;
      */
     hasSecretEditKey: boolean;
+    /**
+     * @generated from field: int32 woots = 12;
+     */
+    woots: number;
 };
 /**
  * Describes the message WorldPackets.WorldMeta.
@@ -1379,3 +1402,28 @@ export type PointDouble = Message<"WorldPackets.PointDouble"> & {
  * Use `create(PointDoubleSchema)` to create a new message.
  */
 export declare const PointDoubleSchema: GenMessage<PointDouble>;
+/**
+ *
+ * Represents an effect.
+ *
+ * @generated from message WorldPackets.PlayerEffect
+ */
+export type PlayerEffect = Message<"WorldPackets.PlayerEffect"> & {
+    /**
+     * @generated from field: int32 type = 1;
+     */
+    type: number;
+    /**
+     * @generated from field: optional int32 duration = 2;
+     */
+    duration?: number;
+    /**
+     * @generated from field: optional int32 strength = 3;
+     */
+    strength?: number;
+};
+/**
+ * Describes the message WorldPackets.PlayerEffect.
+ * Use `create(PlayerEffectSchema)` to create a new message.
+ */
+export declare const PlayerEffectSchema: GenMessage<PlayerEffect>;