Chat Relay

.gitignore

@@ -105,3 +105,7 @@ dist
 
 # TernJS port file
 .tern-port
+
+# Custom
+Minecraft/auth/
+Minecraft/cache/

Commands/admin/reload.ts

@@ -1,7 +1,7 @@
 import { ChatInputCommandInteraction, SlashCommandBuilder } from 'discord.js';
 import { loadCommands } from '../../Handlers/commandHandler';
 import { loadEvents } from '../../Handlers/eventHandler';
-import { DrippyClient } from '../../Utils/DrippyClient';
+import { DiscordClient } from '../../Utils/DiscordClient';
 
 export const developer = true;
 
@@ -12,7 +12,7 @@ export const data = new SlashCommandBuilder()
     .addSubcommand((options) => options.setName('events').setDescription('Reload Events'))
     .addSubcommand((options) => options.setName('commands').setDescription('Reload Commands'))
 
-export function execute(interaction: ChatInputCommandInteraction, client: DrippyClient) {
+export function execute(interaction: ChatInputCommandInteraction, client: DiscordClient) {
     const subCommand = interaction.options.getSubcommand();
 
     switch(subCommand) {

Commands/general/apply.ts

@@ -1,11 +1,11 @@
 import { ChatInputCommandInteraction, SlashCommandBuilder, ActionRowBuilder, ModalBuilder, TextInputBuilder, TextInputStyle } from "discord.js";
-import { DrippyClient } from "../../Utils/DrippyClient";
+import { DiscordClient } from "../../Utils/DiscordClient";
 
 export const data = new SlashCommandBuilder()
     .setName('apply')
     .setDescription('Apply for the rw role!')
 
-export async function execute(interaction: ChatInputCommandInteraction, client: DrippyClient) {
+export async function execute(interaction: ChatInputCommandInteraction, client: DiscordClient) {
     const modal = new ModalBuilder()
         .setCustomId(`application`)
         .setTitle(`RW Application`);

Commands/general/check.ts

@@ -1,12 +1,12 @@
 import { SlashCommandBuilder, EmbedBuilder, ChatInputCommandInteraction, User } from 'discord.js';
-import { DrippyClient } from '../../Utils/DrippyClient';
+import { DiscordClient } from '../../Utils/DiscordClient';
 
 export const data = new SlashCommandBuilder()
     .setName('check')
     .setDescription('Do you have the right ip? Check with this command')
     .addStringOption((o) => o.setName(`ip`).setDescription(`Put the ip here (no port needed!)`).setRequired(true))
 
-export function execute(interaction: ChatInputCommandInteraction, client: DrippyClient) {
+export function execute(interaction: ChatInputCommandInteraction, client: DiscordClient) {
     const user = interaction.member?.user
     if(!(user instanceof User)) return;
 

Commands/general/ping.ts

@@ -1,11 +1,11 @@
 import { SlashCommandBuilder, EmbedBuilder, ChatInputCommandInteraction } from 'discord.js';
-import { DrippyClient } from '../../Utils/DrippyClient';
+import { DiscordClient } from '../../Utils/DiscordClient';
 
 export const data = new SlashCommandBuilder()
     .setName('ping')
     .setDescription('A simple ping command!')
 
-export async function execute(interaction: ChatInputCommandInteraction, client: DrippyClient) {
+export async function execute(interaction: ChatInputCommandInteraction, client: DiscordClient) {
     const date = Date.now()
     const embed = new EmbedBuilder()
     .setTitle('🟢 Pong!')

Commands/general/status.ts

@@ -1,19 +1,23 @@
-import { SlashCommandBuilder, EmbedBuilder, ActivityType, ChatInputCommandInteraction } from 'discord.js';
 import axios from 'axios';
-import { DrippyClient } from '../../Utils/DrippyClient';
+import { resolve } from 'path';
+import { SlashCommandBuilder, EmbedBuilder, ActivityType, ChatInputCommandInteraction, AttachmentBuilder } from 'discord.js';
+import { DiscordClient } from '../../Utils/DiscordClient';
+import Jimp, { read, MIME_PNG } from 'jimp';
+import { Player } from '../../Minecraft/Player';
+import { groupByN } from '../../Utils/Sort';
 
 export const data = new SlashCommandBuilder()
     .setName('status')
     .setDescription('Check the server status!');
 
-export async function execute(interaction: ChatInputCommandInteraction, client: DrippyClient) {
+export async function execute(interaction: ChatInputCommandInteraction, client: DiscordClient) {
     await interaction.deferReply({
         ephemeral: true
     })
 
     const embed = new EmbedBuilder()
     const guild = await client.guilds.cache.find(g => g.id === client.config.guild.id)
-    const channel = await guild?.channels.cache.find(c => c.id === client.config.guild.channels.statchan);
+    const channel = await guild?.channels.cache.find(c => c.id === client.config.guild.channels.stat_channel);
 
     try {
         const ip = client.config.ips.main;
@@ -31,7 +35,10 @@ export async function execute(interaction: ChatInputCommandInteraction, client:
         } else {
             client.user?.setActivity(`${data.players.online}/${data.players.max} players`, { type: ActivityType.Watching });
             embed.setTitle(`LiveOverflow SMP • ${data.players.online}/${data.players.max}`)
-            embed.setDescription(`Current server status`)
+            if(client.config['in-game-bot'].enabled) embed.setImage(`attachment://tab.png`)
+            else embed.setDescription(`Current server status.`)
+
+
             if(data.players.online >= data.players.max) {
                 channel?.setName(`🟠 ${data.players.online}/${data.players.max} Players`)
                 client.user?.setStatus('idle');
@@ -46,7 +53,43 @@ export async function execute(interaction: ChatInputCommandInteraction, client:
         console.error(error)
     }
 
-    interaction.editReply({
+    if(client.config['in-game-bot'].enabled) interaction.editReply({
+        embeds: [embed],
+        files: [await renderTabImage(client.bot.playerManager.getPlayerArray())]
+    })
+    else interaction.editReply({
         embeds: [embed],
     })
+}
+
+async function renderTabImage(players: Player[]) {
+    players = players.filter((player) => !player.name.startsWith('N00bBot'));
+
+    const rows = 5;
+    const grouping = groupByN(rows, players)
+    const canvas = await read((rows * 180) + (rows * 20), (grouping.length * 180) + grouping.length * 60, '#2C2F33');
+    const font = await Jimp.loadFont(resolve('./Minecraft/Font/xsJGJPdTmfYtAZNHX7Kk5tfJ.ttf.fnt'));
+
+    for(var i = 0; i < grouping.length; i++) {
+        const group = grouping[i];
+        for(var l = 0; l < group.length; l++) {
+            const player = group[l];
+
+            const image = await player.downloadImage();
+
+            if(!image) continue;
+            const mathX = (l * 180) + (l * 20) + 10;
+            const mathY = (i * 180) + (i * 60) + 30;
+            canvas.composite(image, mathX, mathY);
+            const layer = await Jimp.read(Math.round(25 * player.name.length), 180);
+            const text = layer.print(font, 0, 0, player.name, 180, 180);
+            text.color([{ apply: 'xor', params: ['#FFFFFF'] }]); 
+            text.scaleToFit(205, 100);
+            canvas.composite(text, mathX, player.name.length > 8 ? mathY - 45 : mathY - 25);
+            //text.resize(Math.round(22.5 * player.name.length), 25);
+        }
+    }
+
+    const imageBuffer = await canvas.getBufferAsync(MIME_PNG);
+    return new AttachmentBuilder(imageBuffer, { name: 'tab.png' })
 }

Commands/general/vouch.ts

@@ -1,13 +1,13 @@
 import { SlashCommandBuilder, EmbedBuilder, ChatInputCommandInteraction, GuildMemberRoleManager } from 'discord.js';
-import { DrippyClient } from '../../Utils/DrippyClient';
+import { DiscordClient } from '../../Utils/DiscordClient';
 
 export const data = new SlashCommandBuilder()
     .setName('vouch')
     .setDescription('Vouch for someone else to get the rw role!')
     .addUserOption((o) => o.setName(`user`).setDescription(`Who do you want to vouch for?`).setRequired(true))
 
 
-export async function execute(interaction: ChatInputCommandInteraction, client: DrippyClient) {
+export async function execute(interaction: ChatInputCommandInteraction, client: DiscordClient) {
     const embed = new EmbedBuilder()
 
     //@ts-ignore
@@ -36,12 +36,12 @@ export async function execute(interaction: ChatInputCommandInteraction, client:
         return true;
     }
 
-    member.roles.add(interaction.guild.roles.cache.find(r => r.id === client.config.guild.roles.rw))
+    member.roles.add(interaction.guild?.roles.cache.find(r => r.id === client.config.guild.roles.rw))
     embed.setTitle(`Thanks for vouching!`);
     embed.setDescription(`The member has recieved their role!`);
     embed.setColor(`Green`);
 
-    const chan = client.channels.cache.find(c => c.id === client.config.guild.channels.logchan)
+    const chan = client.channels.cache.find(c => c.id === client.config.guild.channels.log_channel)
     //@ts-ignore
     chan?.send({
         //@ts-ignore

Events/Client/ready.ts

@@ -1,15 +1,15 @@
 import { loadCommands } from '../../Handlers/commandHandler';
 import axios from 'axios';
 import { ActivityType } from 'discord.js';
-import { DrippyClient } from '../../Utils/DrippyClient';
+import { DiscordClient } from '../../Utils/DiscordClient';
 
 export const name = "ready";
 export const once = true;
-export async function execute(client: DrippyClient) {
-    async function checksrv() {
+export async function execute(client: DiscordClient) {
+    async function checkSRV() {
         try {
             const guild = await client.guilds.cache.find(g => g.id === client.config.guild.id)
-            const channel = await guild?.channels.cache.find(c => c.id === client.config.guild.channels.statchan);
+            const channel = await guild?.channels.cache.find(c => c.id === client.config.guild.channels.stat_channel);
             const ip = client.config.ips.main;
             const url = `https://api.mcsrvstat.us/2/${ip}`;
 
@@ -34,11 +34,11 @@ export async function execute(client: DrippyClient) {
     }
 
     loadCommands(client);
-    checksrv()
+    checkSRV()
     console.log(` ⚪ - ${client.user?.tag} ready!`);
     client.user?.setActivity('the Server', { type: ActivityType.Watching });
 
     setInterval(async () => {
-        await checksrv()
+        await checkSRV()
     }, client.config.autodata.delay * 1000)
 }

Events/Interactions/ButtonUse.ts

@@ -1,12 +1,12 @@
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, PermissionFlagsBits, EmbedBuilder, TextChannel } from 'discord.js';
 import { setTimeout } from 'node:timers/promises';
-import { DrippyClient } from '../../Utils/DrippyClient';
+import { DiscordClient } from '../../Utils/DiscordClient';
 const wait = setTimeout;
 
 export const name = "interactionCreate";
-export async function execute(interaction, client: DrippyClient) {
+export async function execute(interaction, client: DiscordClient) {
     if(!interaction.isButton()) return;
-    const chan = client.channels.cache.find(c => c.id === client.config.guild.channels.logchan)
+    const chan = client.channels.cache.find(c => c.id === client.config.guild.channels.log_channel)
 
     if(interaction.customId === `apply:close`) {
         if(!interaction.member.permissions.has(PermissionFlagsBits.ManageChannels)) {

Events/Interactions/ModalSubmit.ts

@@ -1,9 +1,9 @@
 import { EmbedBuilder } from '@discordjs/builders';
 import { ChannelType, PermissionFlagsBits, ActionRowBuilder, ButtonBuilder, ButtonStyle, CategoryChannel } from 'discord.js';
-import { DrippyClient } from '../../Utils/DrippyClient';
+import { DiscordClient } from '../../Utils/DiscordClient';
 
 export const name = "interactionCreate";
-export async function execute(interaction, client: DrippyClient) {
+export async function execute(interaction, client: DiscordClient) {
     if(!interaction.isModalSubmit()) return;
 
     if(interaction.customId === `application`) {
@@ -18,7 +18,7 @@ export async function execute(interaction, client: DrippyClient) {
         )
         .setTimestamp()
 
-        const cat = client.channels.cache.find(c => c.id === client.config.guild.channels.appcat) as CategoryChannel
+        const cat = client.channels.cache.find(c => c.id === client.config.guild.channels.app_category) as CategoryChannel
         const chan = await cat?.children?.create({
             name: `${interaction.member.user.tag}`,
             type: ChannelType.GuildText,

Events/Interactions/SlashCommands.ts

@@ -1,8 +1,8 @@
 import { ChatInputCommandInteraction } from 'discord.js';
-import { DrippyClient } from '../../Utils/DrippyClient';
+import { DiscordClient } from '../../Utils/DiscordClient';
 
 export const name = "interactionCreate";
-export function execute(interaction: ChatInputCommandInteraction, client: DrippyClient) {
+export function execute(interaction: ChatInputCommandInteraction, client: DiscordClient) {
     if(!interaction.isChatInputCommand()) return;
 
     const command = client.commands.get(interaction.commandName);

Events/Messages/MessageCreate.ts

@@ -1,7 +1,7 @@
-import { DrippyClient } from "../../Utils/DrippyClient"
+import { DiscordClient } from "../../Utils/DiscordClient"
 
 export const name = "messageCreate"
-export function execute(message, client: DrippyClient) {
+export function execute(message, client: DiscordClient) {
 	if(blacklist(message.content)) {
 		message.delete()
 		message.channel.send({content: `:x: Your message contained a blacklisted phase ${message.member.tag}`})

Functions/uploadImage.ts

@@ -0,0 +1,9 @@
+import Jimp, { MIME_PNG } from "jimp";
+import { DiscordClient } from "../Utils/DiscordClient";
+import { AttachmentBuilder } from 'discord.js';
+
+export async function uploadImage(image: Jimp, client: DiscordClient) {
+    const buffer = await image.getBufferAsync(MIME_PNG);
+    const attachment = new AttachmentBuilder(buffer, { name: 'image.png' });
+    return client.sendAttachments(client.config.guild.channels.cache_channel, [ attachment ]);
+}

Handlers/commandHandler.ts

@@ -1,7 +1,7 @@
 import { loadFiles } from "../Functions/fileLoader";
-import { DrippyClient } from "../Utils/DrippyClient";
+import { DiscordClient } from "../Utils/DiscordClient";
 
-export async function loadCommands(client: DrippyClient) {
+export async function loadCommands(client: DiscordClient) {
     const ascii = require('ascii-table');
     const table = new ascii().setHeading('Commands', 'Status');
 

Handlers/eventHandler.ts

@@ -1,7 +1,7 @@
 import { loadFiles } from "../Functions/fileLoader";
-import { DrippyClient } from "../Utils/DrippyClient";
+import { DiscordClient } from "../Utils/DiscordClient";
 
-export async function loadEvents(client: DrippyClient) {
+export async function loadEvents(client: DiscordClient) {
   const ascii = require("ascii-table");
   const table = new ascii().setHeading("Events", "Status");
 

Minecraft/Bot.ts

@@ -0,0 +1,50 @@
+import { createClient } from '../Utils/MinecraftClient';
+import { DiscordClient } from '../Utils/DiscordClient';
+import { handleChat } from './Chat';
+import { PlayerManager } from './PlayerManager';
+import { ProfileCache } from './ProfileCache';
+
+export function handleMinecraft(client: DiscordClient) {
+    if (!client.config['in-game-bot'].enabled) return; // Returns if there is no bot config
+    client.bot = createClient({
+        host: client.config.ips.n00b,
+        port: 25565,
+        username: 'sysctl',
+        profilesFolder: __dirname + '\\auth',
+        auth: 'microsoft',
+        disableChatSigning: true
+    }); // Creates the bot
+
+    client.bot.profileCache = new ProfileCache(client);
+    client.bot.playerManager = new PlayerManager(client);
+
+    client.bot.on('disconnect', (packet) => {
+        console.log('Disconnected from server : ' + packet.reason);
+        reconnectToServer(client);
+    }); // Sends log message when the bot disconnects from the server and reconnects it
+
+    client.bot.on('end', () => {
+        console.log('Connection lost');
+        reconnectToServer(client);
+    }); // Sends log message when the bot loses connection to the server and reconnects it
+
+    client.bot.on('error', (err) => {
+        if (err.message.includes('play.toClient')) return;
+        console.log('Error occurred');
+        console.log(err);
+    }); // Sends log message when the bot encounters an error
+
+    client.bot.on('connect', () => {
+        console.log(`Connected to Server...`);
+        handleChat(client);
+    }); // Sends log message when the bot connects to the server
+}
+
+// Waits a minute and tries to reconnect to the server
+function reconnectToServer(client: DiscordClient) {
+    console.log('Reconnecting in 60 seconds...');
+    setTimeout(() => {
+        console.log('Attempting to connect...');
+        client.bot = createClient(client.bot.options);
+    }, 1000 * 60);
+}