@miner-org/mineflayer-bot-war 0.0.2 → 0.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miner-org/mineflayer-bot-war",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "main": "index.js",
   "scripts": {
     "git-update": "git add . && git commit -m \"my butt hurts\" && git push",

package/src/BotWarClient.js

@@ -3,8 +3,12 @@ const { WebSocket } = require("ws");
 const { v4: uuid } = require("uuid");
 
 class BotWarClient extends EventEmitter {
-  constructor(options = {}) {
+  #bot;
+
+  constructor(bot, options = {}) {
     super();
+    this.#bot = bot;
+
     /**
      * @type {import ("./types/WarClientOptions").WarClientOptions}
      */
@@ -78,5 +82,9 @@ class BotWarClient extends EventEmitter {
   getPlayerTeam(playerName) {
     return this.request("getPlayerTeam", { playerName });
   }
+
+  getOwnTeam() {
+    return this.request("getPlayerTeam", { playerName: this.#bot.username });
+  }
 }
 module.exports = BotWarClient;

package/src/BotWarPlugin.js

@@ -12,7 +12,7 @@ class BotWarPlugin {
    * @param {import("./types/WarClientOptions.js").WarClientOptions} options
    */
   connect(options) {
-    this.client = new BotWarClient(options);
+    this.client = new BotWarClient(this.#bot, options);
   }
 }
 

package/src/types/BotWarClient.ts

@@ -1,45 +1,48 @@
 import TypedEmitter from "typed-emitter";
-
-interface SimpleVec3 {
-  x: number;
-  y: number;
-  z: number;
-}
+import {
+  PlayerKilledEvent,
+  TeamWinEvent,
+  StartCaptureEvent,
+  ControlCaptureEvent,
+  SimpleVec3,
+} from "./Event";
 
 export interface BotWarClientEvents {
   ready(): void | Promise<void>;
-  /**
-   *
-   * @param killer The kilelr
-   * @param dead The one that died
-   * @param team The killer's team
-   */
-  playerKilled(
-    killer: string,
-    dead: string,
-    team: string,
-  ): void | Promise<void>;
+
   gameStarted(): void | Promise<void>;
   gameEnd(): void | Promise<void>;
 
-  teamWin(team: string): void | Promise<void>;
+  /**
+   * Fired when a player is killed
+   */
+  playerKilled(data: PlayerKilledEvent): void | Promise<void>;
+
+  teamWin(data: TeamWinEvent): void | Promise<void>;
+
+  /**
+   * Fired when a team starts capturing a control point
+   */
+  startCapture(data: StartCaptureEvent): void | Promise<void>;
 
-  startCapture(position: SimpleVec3, captureTeam: string): void | Promise<void>;
   /**
-   * @description Fires when a control point is captured
-   * @param position Position of the control point
-   * @param captureTeam The team that captured the point
+   * Fired when a control point is fully captured
    */
-  controlCapture(
-    position: SimpleVec3,
-    captureTeam: string,
-  ): void | Promise<void>;
+  controlCapture(data: ControlCaptureEvent): void | Promise<void>;
 }
 
 export interface BotWarClient extends TypedEmitter<BotWarClientEvents> {
   authenticate(): void;
 
-  request(action: string, data: object): Promise<any>;
+  request<T = unknown>(
+    action: string,
+    payload?: Record<string, unknown>,
+  ): Promise<T>;
 
-  getTeams(): Promise<string[]>;
+  getTeams(): Promise<{ teams: string[] }>;
+  getControlPoints(): Promise<{ points: SimpleVec3[] }>;
+  getTeamScore(teamId: string): Promise<{ score: number }>;
+  getTeamPlayers(teamId: string): Promise<{ players: string[] }>;
+  getPlayerTeam(playerName: string): Promise<{ team: string }>;
+  getOwnTeam(): Promise<{ team: string }>;
 }

package/src/types/Event.ts

@@ -0,0 +1,25 @@
+export interface SimpleVec3 {
+  x: number;
+  y: number;
+  z: number;
+}
+
+export interface PlayerKilledEvent {
+  killer: string;
+  dead: string;
+  team: string;
+}
+
+export interface TeamWinEvent {
+  team: string;
+}
+
+export interface StartCaptureEvent {
+  captureTeam: string;
+  position: SimpleVec3;
+}
+
+export interface ControlCaptureEvent {
+  captureTeam: string;
+  position: SimpleVec3;
+}

package/test.js

@@ -1,5 +1,6 @@
 const mineflayer = require("mineflayer");
 const botWarPlugin = require("./index.js");
+const { Vec3 } = require("vec3");
 
 const bot = mineflayer.createBot({
   host: "localhost",
@@ -16,26 +17,53 @@ bot.once("spawn", async () => {
     url: "ws://localhost:8765",
     token: "92389d0ffe1547f1b41939abcc9f0b59",
   });
+  let teams = [];
 
   bot.botwar.client.on("ready", async () => {
-    console.log("uwu");
-    const teams = await bot.botwar.client.getTeams();
+    console.log("Authenticated!");
+  });
+
+  bot.on("messagestr", (msg, pos, chatMessage) => {
+    if (chatMessage.json.translate !== "chat.type.text") return;
+    const cleanName = username.replace(/[<>]/g, "").trim();
+    const usableMessage = Object.values(chatMessage.json.with[1])[0];
+    if (!usableMessage.startsWith(prefix)) return;
+
+    if (cleanName !== "AshLikesFood") return;
 
-    console.log(teams);
+    const args = usableMessage.split(" ");
+    const command = args.shift();
+
+    switch (command) {
+      case "joinTeam": {
+        const team = args[0];
+
+        bot.chat(`/join-team ${team}`);
+        break;
+      }
+    }
   });
 
   bot.botwar.client.on("gameStarted", async () => {
-    console.log("A game has started");
-    bot.botwar.client.on("startCapture", (pos, team) => {
-      console.log(pos, team);
-    });
-
-    bot.botwar.client.on("controlCapture", (pos, team) => {
-      console.log("Captured", pos, team);
-    });
-  });
+    //make sure we are actually in a team;
+    const response = await bot.botwar.client.getOwnTeam();
+
+    if (!response || (response && response.team == null)) return;
+
+    //get nearest control point
+    const controlResponse = await bot.botwar.client.getControlPoints();
+
+    if (!controlResponse) return;
+
+    const points = controlResponse.points
+      .map((p) => new Vec3(p.x, p.y, p.z))
+      .sort(
+        (a, b) =>
+          bot.entity.position.distanceTo(a) - bot.entity.position.distanceTo(b),
+      );
+
+      const closest = points[0];
 
-  bot.botwar.client.on("gameEnd", () => {
-    console.log("A game has ended");
+      
   });
 });