update to NPM 9.2.0

EarthMC-Toolkit · Jun 24, 2024 · c3ad566 · c3ad566
1 parent a574142
commit c3ad566
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/bot/types.ts b/bot/types.ts
@@ -7,7 +7,7 @@ import {
     SharedNameAndDescription
 } from "discord.js"
 
-import { Map } from "earthmc"
+import { Dynmap, Squaremap } from "earthmc"
 import { Timestamp, WriteResult } from "firebase-admin/firestore"
 
 export type BaseCommand = {
@@ -43,7 +43,7 @@ export type DJSEvent = {
 }
 
 export type MapInstance = { 
-    emc: Map,
+    emc: Squaremap | Dynmap,
     db: MapDB
 }
 

diff --git a/bot/updater.ts b/bot/updater.ts
@@ -485,10 +485,10 @@ async function updateFallenTowns(map: MapInstance) {
         }
 
         for (let i = 0; i < fallenTownsLen; i++) {
-            const town = fallenTowns[i],
-                  residentBatch1 = [], 
-                  residentBatch2 = [],
-                  mayor = town.mayor.replace(/_/g, "\\_")
+            const town = fallenTowns[i]
+            const residentBatch1 = []
+            const residentBatch2 = []
+            const mayor = town.mayor.replace(/_/g, "\\_")
 
             const route = await Aurora.GPS.fastestRoute({ x: town.x, z: town.z })
             const desc = `Type **/n spawn ${route.nation.name}** and head **${route.direction}** for **${route.distance}** blocks.`

diff --git a/bun.lockb b/bun.lockb
diff --git a/common/resident.ts b/common/resident.ts
@@ -4,7 +4,7 @@ import striptags from 'striptags'
 import * as MC from '../bot/utils/minecraft.js'
 import * as database from '../bot/utils/database.js'
 
-import { 
+import {
     OfficialAPI, 
     Nova, Aurora,
     type OAPIResident, 
@@ -73,14 +73,14 @@ class ResidentHelper extends BaseHelper {
         if (!this.isNova) {
             let res: OAPIResident
             try {
-                res = await OfficialAPI.resident(arg1)
+                res = await OfficialAPI.V2.resident(arg1)
             } catch (e) {
                 console.log(e)
                 return false
             }
 
             if (res.town) {
-                const resTown = await OfficialAPI.town(res.town.toLowerCase())
+                const resTown = await OfficialAPI.V2.town(res.town.toLowerCase())
 
                 let rank = resTown.mayor == res.name ? "Mayor" : "Resident"
                 if (rank == "Mayor" && resTown.status.isCapital) 

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "discord.js": "14.13.0",
     "dotenv": "^16.4.5",
-    "earthmc": "^8.3.4",
+    "earthmc": "9.2.0",
     "firebase": "latest",
     "firebase-admin": "latest",
     "koyeb.js": "^4.2.3",