From e30edf77d2cc27db97a6b6b1f845730c4924046c Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Thu, 14 Jul 2022 08:59:20 -0400
Subject: ticket

---
 src/commands/tickets/ticket-!.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/commands/tickets/ticket-!.ts

(limited to 'src')

diff --git a/src/commands/tickets/ticket-!.ts b/src/commands/tickets/ticket-!.ts
new file mode 100644
index 0000000..e69de29
-- 
cgit 


From bddeb83bc0641a059a08c5887e6585c759c3b643 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Thu, 14 Jul 2022 08:59:39 -0400
Subject: invite info

---
 src/commands/info/inviteInfo.ts | 43 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 src/commands/info/inviteInfo.ts

(limited to 'src')

diff --git a/src/commands/info/inviteInfo.ts b/src/commands/info/inviteInfo.ts
new file mode 100644
index 0000000..bfe7eae
--- /dev/null
+++ b/src/commands/info/inviteInfo.ts
@@ -0,0 +1,43 @@
+import { Arg, ArgType, BushCommand, clientSendAndPermCheck, colors, type CommandMessage, type SlashMessage } from '#lib';
+import { ApplicationCommandOptionType, EmbedBuilder, Invite, PermissionFlagsBits } from 'discord.js';
+
+export default class InviteInfoCommand extends BushCommand {
+	public constructor() {
+		super('inviteInfo', {
+			aliases: ['invite-info', 'ii'],
+			category: 'info',
+			description: 'Get info about an invite.',
+			usage: ['invite-info [invite]'],
+			examples: ['invite-info discord.gg/moulberry'],
+			args: [
+				{
+					id: 'invite',
+					description: 'The guild to find information about.',
+					type: 'invite',
+					prompt: 'What invite would you like to find information about?',
+					retry: '{error} Choose a valid invite to find information about.',
+					slashType: ApplicationCommandOptionType.String
+				}
+			],
+			slash: true,
+			clientPermissions: (m) => clientSendAndPermCheck(m, [PermissionFlagsBits.EmbedLinks], true),
+			userPermissions: []
+		});
+	}
+
+	public override async exec(message: CommandMessage | SlashMessage, args: { invite: ArgType<'invite' | 'string'> }) {
+		const invite = message.util.isSlashMessage(message)
+			? ((await Arg.cast('invite', message, args.invite as string)) as ArgType<'invite'>)
+			: args.invite;
+
+		const inviteInfoEmbed = new EmbedBuilder().setTitle(`Invite to ${invite.guild.name}`).setColor(colors.default);
+
+		this.generateAboutField(inviteInfoEmbed, invite);
+	}
+
+	private generateAboutField(embed: EmbedBuilder, invite: Invite) {
+		const about = [`**code:** ${invite.code}`, `**channel:** ${}`];
+
+		embed.addFields({ name: '» About', value: about.join('\n') });
+	}
+}
-- 
cgit 


From 7cec4037ead3287c1d88db4274824b21d9d57d51 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Thu, 14 Jul 2022 09:01:43 -0400
Subject: messing around with repo stuff

---
 src/bot.ts                             |  46 ++---
 src/commands/moulberry-bush/neuRepo.ts |  47 +++++
 src/lib/common/util/Minecraft.ts       | 303 +++++++++++++++++++++++++++++++++
 src/tasks/cache/updateNeuItemCache.ts  |  12 ++
 4 files changed, 388 insertions(+), 20 deletions(-)
 create mode 100644 src/commands/moulberry-bush/neuRepo.ts
 create mode 100644 src/lib/common/util/Minecraft.ts
 create mode 100644 src/tasks/cache/updateNeuItemCache.ts

(limited to 'src')

diff --git a/src/bot.ts b/src/bot.ts
index d7b5ad9..640f2ab 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -1,23 +1,29 @@
-import { init } from './lib/utils/BushLogger.js';
-// creates proxies on console.log and console.warn
-// also starts a REPL session
-init();
+// import { init } from './lib/utils/BushLogger.js';
+// // creates proxies on console.log and console.warn
+// // also starts a REPL session
+// init();
 
-const { dirname } = await import('path');
-const { fileURLToPath } = await import('url');
-const { default: config } = await import('../config/options.js');
-const { Sentry } = await import('./lib/common/Sentry.js');
-const { BushClient } = await import('./lib/index.js');
-
-const isDry = process.argv.includes('dry');
-if (!isDry && config.credentials.sentryDsn !== null) new Sentry(dirname(fileURLToPath(import.meta.url)) || process.cwd(), config);
-BushClient.extendStructures();
-const client = new BushClient(config);
-if (!isDry) await client.dbPreInit();
-await client.init();
-if (isDry) {
-	await client.destroy();
-	process.exit(0);
+// eslint-disable-next-line no-constant-condition
+if (false) {
+	// const { dirname } = await import('path');
+	// const { fileURLToPath } = await import('url');
+	// const { default: config } = await import('../config/options.js');
+	// const { Sentry } = await import('./lib/common/Sentry.js');
+	// const { BushClient } = await import('./lib/index.js');
+	//
+	// const isDry = process.argv.includes('dry');
+	// if (!isDry && config.credentials.sentryDsn !== null)
+	// 	new Sentry(dirname(fileURLToPath(import.meta.url)) || process.cwd(), config);
+	// BushClient.extendStructures();
+	// const client = new BushClient(config);
+	// if (!isDry) await client.dbPreInit();
+	// await client.init();
+	// if (isDry) {
+	// 	await client.destroy();
+	// 	process.exit(0);
+	// } else {
+	// 	await client.start();
+	// }
 } else {
-	await client.start();
+	import('./lib/common/util/Minecraft.js');
 }
diff --git a/src/commands/moulberry-bush/neuRepo.ts b/src/commands/moulberry-bush/neuRepo.ts
new file mode 100644
index 0000000..24f83ad
--- /dev/null
+++ b/src/commands/moulberry-bush/neuRepo.ts
@@ -0,0 +1,47 @@
+import { BushCommand, clientSendAndPermCheck, type ArgType, type CommandMessage, type SlashMessage } from '#lib';
+import { ApplicationCommandOptionType, AutocompleteInteraction, CacheType, PermissionFlagsBits } from 'discord.js';
+
+export default class NeuRepoCommand extends BushCommand {
+	public static items: { name: string; id: string }[] = [];
+
+	public constructor() {
+		super('neuRepo', {
+			aliases: ['neu-repo', 'repo-item', 'neu-item', 'item-repo'],
+			category: "Moulberry's Bush",
+			description: 'Get information about an item from the NEU item repo.',
+			usage: ['neu-repo <item>'],
+			examples: ['neu-repo BARRIER'],
+			args: [
+				{
+					id: 'item',
+					description: 'The item id that you would like to find neu item information about.',
+					type: 'string',
+					prompt: 'What SkyBlock item would you like to get information about?',
+					retry: '{error} Pick a valid SkyBlock item ID. Try using the slash command for a better experience.',
+					slashType: ApplicationCommandOptionType.String,
+					autocomplete: true
+				}
+				/* {
+					id: 'dangerous',
+					description: 'Whether or not to use the dangerous branch.',
+					prompt: 'Would you like to use the dangerous branch instead of the master branch?',
+					match: 'flag',
+					flag: ['--dangerous', '-d'],
+					default: false,
+					optional: true,
+					slashType: ApplicationCommandOptionType.Boolean
+				} */
+			],
+			slash: true,
+			clientPermissions: (m) => clientSendAndPermCheck(m, [PermissionFlagsBits.EmbedLinks], true),
+			userPermissions: []
+		});
+	}
+
+	public override async exec(
+		message: CommandMessage | SlashMessage,
+		args: { item: ArgType<'string'> /* dangerous: ArgType<'flag'> */ }
+	) {}
+
+	public override async autocomplete(interaction: AutocompleteInteraction<CacheType>) {}
+}
diff --git a/src/lib/common/util/Minecraft.ts b/src/lib/common/util/Minecraft.ts
new file mode 100644
index 0000000..fbacbf0
--- /dev/null
+++ b/src/lib/common/util/Minecraft.ts
@@ -0,0 +1,303 @@
+import { Byte, Int, parse } from '@ironm00n/nbt-ts';
+import { BitField } from 'discord.js';
+import fs from 'fs/promises';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+export enum FormattingCodes {
+	Black = '§0',
+	DarkBlue = '§1',
+	DarkGreen = '§2',
+	DarkAqua = '§3',
+	DarkRed = '§4',
+	DarkPurple = '§5',
+	Gold = '§6',
+	Gray = '§7',
+	DarkGray = '§8',
+	Blue = '§9',
+	Green = '§a',
+	Aqua = '§b',
+	Red = '§c',
+	LightPurple = '§d',
+	Yellow = '§e',
+	White = '§f',
+
+	Obfuscated = '§k',
+	Bold = '§l',
+	Strikethrough = '§m',
+	Underline = '§n',
+	Italic = '§o',
+	Reset = '§r'
+}
+
+// https://minecraft.fandom.com/wiki/Formatting_codes
+export const formattingInfo = {
+	[FormattingCodes.Black]: { foreground: '#000000', background: '#000000', ansi: '\u001b[0;30m' },
+	[FormattingCodes.DarkBlue]: { foreground: '#0000AA', background: '#00002A', ansi: '\u001b[0;34m' },
+	[FormattingCodes.DarkGreen]: { foreground: '#00AA00', background: '#002A00', ansi: '\u001b[0;32m' },
+	[FormattingCodes.DarkAqua]: { foreground: '#00AAAA', background: '#002A2A', ansi: '\u001b[0;36m' },
+	[FormattingCodes.DarkRed]: { foreground: '#AA0000', background: '#2A0000', ansi: '\u001b[0;31m' },
+	[FormattingCodes.DarkPurple]: { foreground: '#AA00AA', background: '#2A002A', ansi: '\u001b[0;35m' },
+	[FormattingCodes.Gold]: { foreground: '#FFAA00', background: '#2A2A00', ansi: '\u001b[0;33m' },
+	[FormattingCodes.Gray]: { foreground: '#AAAAAA', background: '#2A2A2A', ansi: '\u001b[0;37m' },
+	[FormattingCodes.DarkGray]: { foreground: '#555555', background: '#151515', ansi: '\u001b[0;90m' },
+	[FormattingCodes.Blue]: { foreground: '#5555FF', background: '#15153F', ansi: '\u001b[0;94m' },
+	[FormattingCodes.Green]: { foreground: '#55FF55', background: '#153F15', ansi: '\u001b[0;92m' },
+	[FormattingCodes.Aqua]: { foreground: '#55FFFF', background: '#153F3F', ansi: '\u001b[0;96m' },
+	[FormattingCodes.Red]: { foreground: '#FF5555', background: '#3F1515', ansi: '\u001b[0;91m' },
+	[FormattingCodes.LightPurple]: { foreground: '#FF55FF', background: '#3F153F', ansi: '\u001b[0;95m' },
+	[FormattingCodes.Yellow]: { foreground: '#FFFF55', background: '#3F3F15', ansi: '\u001b[0;93m' },
+	[FormattingCodes.White]: { foreground: '#FFFFFF', background: '#3F3F3F', ansi: '\u001b[0;97m' },
+
+	[FormattingCodes.Obfuscated]: { ansi: '\u001b[8m' },
+	[FormattingCodes.Bold]: { ansi: '\u001b[1m' },
+	[FormattingCodes.Strikethrough]: { ansi: '\u001b[9m' },
+	[FormattingCodes.Underline]: { ansi: '\u001b[4m' },
+	[FormattingCodes.Italic]: { ansi: '\u001b[3m' },
+	[FormattingCodes.Reset]: { ansi: '\u001b[0m' }
+} as const;
+
+export type McItemId = Lowercase<string>;
+export type SbItemId = Uppercase<string>;
+export type MojangJson = string;
+export type SbRecipeItem = `${SbItemId}:${number}` | '';
+export type SbRecipe = {
+	[Location in `${'A' | 'B' | 'C'}${1 | 2 | 3}`]: SbRecipeItem;
+};
+export type InfoType = 'WIKI_URL' | '';
+
+type Slayer = `${'WOLF' | 'BLAZE' | 'EMAN'}_${1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9}`;
+
+export interface RawNeuItem {
+	itemid: McItemId;
+	displayname: string;
+	nbttag: MojangJson;
+	damage: number;
+	lore: string[];
+	recipe?: SbRecipe;
+	internalname: SbItemId;
+	modver: string;
+	infoType: InfoType;
+	info?: string[];
+	crafttext: string;
+	vanilla?: boolean;
+	useneucraft?: boolean;
+	slayer_req?: Slayer;
+	clickcommand?: string;
+	x?: number;
+	y?: number;
+	z?: number;
+	island?: string;
+	recipes?: { type: string; cost: any[]; result: SbItemId }[];
+	/** @deprecated */
+	parent?: SbItemId;
+	noseal?: boolean;
+}
+
+export enum HideFlagsBits {
+	Enchantments = 1,
+	AttributeModifiers = 2,
+	Unbreakable = 4,
+	CanDestroy = 8,
+	CanPlaceOn = 16,
+	/**
+	 * potion effects, shield pattern info, "StoredEnchantments", written book
+	 * "generation" and "author", "Explosion", "Fireworks", and map tooltips
+	 */
+	OtherInformation = 32,
+	Dyed = 64
+}
+
+export type HideFlagsString = keyof typeof HideFlagsBits;
+
+export class HideFlags extends BitField<HideFlagsString> {
+	public static override Flags = HideFlagsBits;
+}
+
+export const formattingCode = new RegExp(
+	`§[${Object.values(FormattingCodes)
+		.filter((v) => v.startsWith('§'))
+		.map((v) => v.substring(1))
+		.join('')}]`
+);
+
+export function removeMCFormatting(str: string) {
+	return str.replaceAll(formattingCode, '');
+}
+
+const repo = path.join(__dirname, '..', '..', '..', '..', '..', 'neu-item-repo-dangerous');
+const itemPath = path.join(repo, 'items');
+const items = await fs.readdir(itemPath);
+
+// for (let i = 0; i < 5; i++) {
+for (const path_ of items) {
+	// const randomItem = items[Math.floor(Math.random() * items.length)];
+	// console.log(randomItem);
+	const item = (await import(path.join(itemPath, /* randomItem */ path_), { assert: { type: 'json' } })).default as RawNeuItem;
+	if (item.displayname.includes('(Monster)') || item.displayname.includes('(NPC)')) continue;
+	/* console.log(path_);
+	 console.dir(item, { depth: Infinity }); */
+
+	/* console.log('==========='); */
+	const nbt = /* fn( */ parse(item.nbttag /* .replaceAll(/([0-9]{1,3}:)(["{])/g, '$2'), { useMaps: true } */) as any; /*); */
+	console.dir(nbt, { depth: Infinity });
+	console.log('===========');
+	// console.dir((nbt.(item.nbttag)));
+
+	/* 	// eslint-disable-next-line no-inner-declarations
+	function fn(map: TagMap) {
+		const ret = {} as any;
+		map.forEach((val, key) => {
+			function fn2(val: any): any {
+				if (val instanceof Map) return fn(val);
+				else if (Array.isArray(val)) return val.map((v) => fn2(v));
+				else return val.valueOf();
+			}
+			ret[key] = fn2(val);
+		});
+		return ret;
+	} */
+
+	/* if (nbt?.display && nbt.display.Name !== item.displayname)
+		console.log(`${path_}		display name mismatch: ${mcToAnsi(nbt.display.Name)} != ${mcToAnsi(item.displayname)}`);
+
+	if (nbt?.ExtraAttributes && nbt?.ExtraAttributes.id !== item.internalname)
+		console.log(`${path_}		internal name mismatch: ${mcToAnsi(nbt?.ExtraAttributes.id)} != ${mcToAnsi(item.internalname)}`); */
+
+	/* console.log('===========');
+
+	console.log(mcToAnsi(item.displayname));
+	console.log(item.lore.map((l) => mcToAnsi(l)).join('\n')); */
+
+	/* const keys = [
+		'itemid',
+		'displayname',
+		'nbttag',
+		'damage',
+		'lore',
+		'recipe',
+		'internalname',
+		'modver',
+		'infoType',
+		'info',
+		'crafttext',
+		'vanilla',
+		'useneucraft',
+		'slayer_req',
+		'clickcommand',
+		'x',
+		'y',
+		'z',
+		'island',
+		'recipes',
+		'parent',
+		'noseal'
+	];
+
+	Object.keys(item).forEach((k) => {
+		if (!keys.includes(k)) throw new Error(`Unknown key: ${k}`);
+	});
+
+	if (
+		'slayer_req' in item &&
+		!new Array(10).flatMap((_, i) => ['WOLF', 'BLAZE', 'EMAN'].map((e) => e + (i + 1)).includes(item.slayer_req!))
+	)
+		throw new Error(`Unknown slayer req: ${item.slayer_req!}`); */
+
+	/* console.log('=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-'); */
+}
+
+interface NbtTag {
+	overrideMeta?: Byte;
+	Unbreakable?: Int;
+	ench?: string[];
+	HideFlags?: HideFlags;
+	SkullOwner?: SkullOwner;
+	display?: NbtTagDisplay;
+	ExtraAttributes?: ExtraAttributes;
+}
+
+interface SkullOwner {
+	Id?: string;
+	Properties?: {
+		textures?: { Value?: string }[];
+	};
+}
+
+interface NbtTagDisplay {
+	Lore?: string[];
+	Name?: string;
+}
+
+type RuneId = string;
+
+interface ExtraAttributes {
+	originTag?: Origin;
+	id?: string;
+	generator_tier?: Int;
+	boss_tier?: Int;
+	enchantments?: { hardened_mana?: Int };
+	dungeon_item_level?: Int;
+	runes?: { [key: RuneId]: Int };
+}
+
+type Origin = 'SHOP_PURCHASE';
+
+class NeuItem {
+	public itemId: string;
+	public nbtTag: NbtTag;
+
+	public constructor(raw: RawNeuItem) {
+		this.itemId = raw.itemid;
+		this.nbtTag = <NbtTag>parse(raw.nbttag);
+	}
+
+	public get lore(): string {
+		return '';
+	}
+
+	private pet() {}
+}
+
+function mcToAnsi(str: string) {
+	for (const format in formattingInfo) {
+		str = str.replaceAll(format, formattingInfo[format as keyof typeof formattingInfo].ansi);
+	}
+	return `${str}\u001b[0m`;
+}
+
+const neuConstantsPath = path.join(repo, 'constants');
+const neuPetsPath = path.join(neuConstantsPath, 'pets.json');
+const neuPets = await import(neuPetsPath, { assert: { type: 'json' } });
+
+// console.dir(await nbt.parse(buffer));
+/* console.dir(
+	await nbt.parse(
+		Buffer.from(
+			'{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:"4173bc61-9e2f-3c84-8d31-4517e64062ab",Properties:{textures:[0:{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjNhYWY3YjFhNzc4OTQ5Njk2Y2I5OWQ0ZjA0YWQxYWE1MThjZWVlMjU2YzcyZTVlZDY1YmZhNWMyZDg4ZDllIn19fQ=="}]}},display:{Lore:[0:"§8Combat Pet",1:"",2:"§7Intelligence: §a{INTELLIGENCE}",3:"§7Strength: §a{STRENGTH}",4:"",5:"§6Rekindle",6:"§7§7Before death, become §eimmune",7:"§e§7and gain §c{0} §c❁ Strength",8:"§c§7for §a{1} §7seconds",9:"§83 minutes cooldown",10:"",11:"§6Fourth Flare",12:"§7§7On 4th melee strike, §6ignite",13:"§6§7mobs, dealing §c{4}x §7your",14:"§7§9☠ Crit Damage §7each second",15:"§7for §a{5} §7seconds",16:"",17:"§7§eRight-click to add this pet to",18:"§eyour pet menu!",19:"",20:"§5§lEPIC"],Name:"§f§f§7[Lvl {LVL}] §5Phoenix"},ExtraAttributes:{petInfo:"{\\"type\\":\\"PHOENIX\\",\\"active\\":false,\\"exp\\":0.0,\\"tier\\":\\"EPIC\\",\\"hideInfo\\":false}",id:"PHOENIX;3"},AttributeModifiers:[]}',
+			'utf8'
+		)
+	)
+); */
+
+// import _ from 'lodash';
+
+// const str =
+// 	'{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:"4173bc61-9e2f-3c84-8d31-4517e64062ab",Properties:{textures:[0:{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjNhYWY3YjFhNzc4OTQ5Njk2Y2I5OWQ0ZjA0YWQxYWE1MThjZWVlMjU2YzcyZTVlZDY1YmZhNWMyZDg4ZDllIn19fQ=="}]}},display:{Lore:[0:"§8Combat Pet",1:"",2:"§7Intelligence: §a{INTELLIGENCE}",3:"§7Strength: §a{STRENGTH}",4:"",5:"§6Rekindle",6:"§7§7Before death, become §eimmune",7:"§e§7and gain §c{0} §c❁ Strength",8:"§c§7for §a{1} §7seconds",9:"§83 minutes cooldown",10:"",11:"§6Fourth Flare",12:"§7§7On 4th melee strike, §6ignite",13:"§6§7mobs, dealing §c{4}x §7your",14:"§7§9☠ Crit Damage §7each second",15:"§7for §a{5} §7seconds",16:"",17:"§7§eRight-click to add this pet to",18:"§eyour pet menu!",19:"",20:"§5§lEPIC"],Name:"§f§f§7[Lvl {LVL}] §5Phoenix"},ExtraAttributes:{petInfo:"{\\"type\\":\\"PHOENIX\\",\\"active\\":false,\\"exp\\":0.0,\\"tier\\":\\"EPIC\\",\\"hideInfo\\":false}",id:"PHOENIX;3"},AttributeModifiers:[]}'.replaceAll(
+// 		/([0-9]{1,3}:)(["{])/g,
+// 		'$2'
+// 	);
+
+// console.log(str);
+
+// console.dir(
+// 	_.chunk(
+// 		str.split('').map((v, i) => [i, v]),
+// 		10
+// 	).map((v) => [v[0][0], v.map((v) => v[1]).join('')]),
+// 	{ maxArrayLength: Infinity, compact: 100 }
+// );
+
+// console.dir(parse(str));
diff --git a/src/tasks/cache/updateNeuItemCache.ts b/src/tasks/cache/updateNeuItemCache.ts
new file mode 100644
index 0000000..fff9e08
--- /dev/null
+++ b/src/tasks/cache/updateNeuItemCache.ts
@@ -0,0 +1,12 @@
+import { BushTask, Time } from '#lib';
+
+export default class UpdatePriceItemCache extends BushTask {
+	public constructor() {
+		super('updatePriceItemCache', {
+			delay: 1 * Time.Hour,
+			runOnStart: true
+		});
+	}
+
+	public async exec() {}
+}
-- 
cgit 


From 7bdeccaeb4976a997d0d483481b29000795a92a9 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Thu, 14 Jul 2022 11:17:52 -0400
Subject: this is very boring

---
 src/lib/common/util/Minecraft.ts | 140 +++++++++++++++++++++++----------------
 1 file changed, 84 insertions(+), 56 deletions(-)

(limited to 'src')

diff --git a/src/lib/common/util/Minecraft.ts b/src/lib/common/util/Minecraft.ts
index fbacbf0..b4b013f 100644
--- a/src/lib/common/util/Minecraft.ts
+++ b/src/lib/common/util/Minecraft.ts
@@ -136,29 +136,28 @@ for (const path_ of items) {
 	// const randomItem = items[Math.floor(Math.random() * items.length)];
 	// console.log(randomItem);
 	const item = (await import(path.join(itemPath, /* randomItem */ path_), { assert: { type: 'json' } })).default as RawNeuItem;
-	if (item.displayname.includes('(Monster)') || item.displayname.includes('(NPC)')) continue;
+	if (/.*?((_MONSTER)|(_NPC)|(_ANIMAL)|(_MINIBOSS)|(_BOSS)|(_SC))$/.test(item.internalname)) continue;
+	if (!/.*?;[0-5]$/.test(item.internalname)) continue;
 	/* console.log(path_);
 	 console.dir(item, { depth: Infinity }); */
 
 	/* console.log('==========='); */
-	const nbt = /* fn( */ parse(item.nbttag /* .replaceAll(/([0-9]{1,3}:)(["{])/g, '$2'), { useMaps: true } */) as any; /*); */
+	const nbt = parse(item.nbttag) as NbtTag;
+
+	if (nbt?.SkullOwner?.Properties?.textures?.[0]?.Value) {
+		nbt.SkullOwner.Properties.textures[0].Value = parse(
+			Buffer.from(nbt.SkullOwner.Properties.textures[0].Value, 'base64').toString('utf-8')
+		) as string;
+	}
+
+	if (nbt.ExtraAttributes?.petInfo) {
+		nbt.ExtraAttributes.petInfo = JSON.parse(nbt.ExtraAttributes.petInfo as any as string);
+	}
+
+	// delete nbt.display?.Lore;
+
 	console.dir(nbt, { depth: Infinity });
 	console.log('===========');
-	// console.dir((nbt.(item.nbttag)));
-
-	/* 	// eslint-disable-next-line no-inner-declarations
-	function fn(map: TagMap) {
-		const ret = {} as any;
-		map.forEach((val, key) => {
-			function fn2(val: any): any {
-				if (val instanceof Map) return fn(val);
-				else if (Array.isArray(val)) return val.map((v) => fn2(v));
-				else return val.valueOf();
-			}
-			ret[key] = fn2(val);
-		});
-		return ret;
-	} */
 
 	/* if (nbt?.display && nbt.display.Name !== item.displayname)
 		console.log(`${path_}		display name mismatch: ${mcToAnsi(nbt.display.Name)} != ${mcToAnsi(item.displayname)}`);
@@ -228,6 +227,7 @@ interface SkullOwner {
 
 interface NbtTagDisplay {
 	Lore?: string[];
+	color?: Int;
 	Name?: string;
 }
 
@@ -241,24 +241,86 @@ interface ExtraAttributes {
 	enchantments?: { hardened_mana?: Int };
 	dungeon_item_level?: Int;
 	runes?: { [key: RuneId]: Int };
+	petInfo?: PetInfo;
+}
+
+interface PetInfo {
+	type: 'ZOMBIE';
+	active: boolean;
+	exp: number;
+	tier: 'COMMON' | 'UNCOMMON' | 'RARE' | 'EPIC' | 'LEGENDARY';
+	hideInfo: boolean;
+	candyUsed: number;
 }
 
 type Origin = 'SHOP_PURCHASE';
 
+const neuConstantsPath = path.join(repo, 'constants');
+const neuPetsPath = path.join(neuConstantsPath, 'pets.json');
+const neuPets = (await import(neuPetsPath, { assert: { type: 'json' } })) as PetsConstants;
+const neuPetNumsPath = path.join(neuConstantsPath, 'petnums.json');
+const neuPetNums = (await import(neuPetNumsPath, { assert: { type: 'json' } })) as PetNums;
+
+interface PetsConstants {
+	pet_rarity_offset: Record<string, number>;
+	pet_levels: number[];
+	custom_pet_leveling: Record<string, { type: number; pet_levels: number[]; max_level: number }>;
+	pet_types: Record<string, string>;
+}
+
+interface PetNums {
+	[key: string]: {
+		[key: string]: {
+			'1': {
+				otherNums: number[];
+				statNums: Record<string, number>;
+			};
+			'100': {
+				otherNums: number[];
+				statNums: Record<string, number>;
+			};
+			'stats_levelling_curve'?: `${number};${number};${number}`;
+		};
+	};
+}
+
 class NeuItem {
-	public itemId: string;
+	public itemId: McItemId;
+	public displayName: string;
 	public nbtTag: NbtTag;
+	public internalName: SbItemId;
+	public lore: string[];
 
 	public constructor(raw: RawNeuItem) {
 		this.itemId = raw.itemid;
 		this.nbtTag = <NbtTag>parse(raw.nbttag);
-	}
+		this.displayName = raw.displayname;
+		this.internalName = raw.internalname;
+		this.lore = raw.lore;
 
-	public get lore(): string {
-		return '';
+		this.petLoreReplacements();
 	}
 
-	private pet() {}
+	private petLoreReplacements(level = -1) {
+		if (/.*?;[0-5]$/.test(this.internalName) && this.displayName.includes('LVL')) {
+			const maxLevel = neuPets?.custom_pet_leveling?.[this.internalName]?.max_level ?? 100;
+			this.displayName = this.displayName.replace('LVL', `1➡${maxLevel}`);
+
+			const nums = neuPetNums[this.internalName];
+			if (!nums) throw new Error(`Pet (${this.internalName}) has no pet nums.`);
+
+			const teir = ['COMMON', 'UNCOMMON', 'RARE', 'EPIC', 'LEGENDARY', 'MYTHIC'][+this.internalName.at(-1)!];
+			const petInfoTier = nums[teir];
+			if (!petInfoTier) throw new Error(`Pet (${this.internalName}) has no pet nums for ${teir} rarity.`);
+
+			const curve = petInfoTier?.stats_levelling_curve?.split(';');
+
+			const minStatsLevel = parseInt(curve?.[0] ?? '0');
+			const maxStatsLevel = parseInt(curve?.[0] ?? '100');
+
+			const lore = '';
+		}
+	}
 }
 
 function mcToAnsi(str: string) {
@@ -267,37 +329,3 @@ function mcToAnsi(str: string) {
 	}
 	return `${str}\u001b[0m`;
 }
-
-const neuConstantsPath = path.join(repo, 'constants');
-const neuPetsPath = path.join(neuConstantsPath, 'pets.json');
-const neuPets = await import(neuPetsPath, { assert: { type: 'json' } });
-
-// console.dir(await nbt.parse(buffer));
-/* console.dir(
-	await nbt.parse(
-		Buffer.from(
-			'{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:"4173bc61-9e2f-3c84-8d31-4517e64062ab",Properties:{textures:[0:{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjNhYWY3YjFhNzc4OTQ5Njk2Y2I5OWQ0ZjA0YWQxYWE1MThjZWVlMjU2YzcyZTVlZDY1YmZhNWMyZDg4ZDllIn19fQ=="}]}},display:{Lore:[0:"§8Combat Pet",1:"",2:"§7Intelligence: §a{INTELLIGENCE}",3:"§7Strength: §a{STRENGTH}",4:"",5:"§6Rekindle",6:"§7§7Before death, become §eimmune",7:"§e§7and gain §c{0} §c❁ Strength",8:"§c§7for §a{1} §7seconds",9:"§83 minutes cooldown",10:"",11:"§6Fourth Flare",12:"§7§7On 4th melee strike, §6ignite",13:"§6§7mobs, dealing §c{4}x §7your",14:"§7§9☠ Crit Damage §7each second",15:"§7for §a{5} §7seconds",16:"",17:"§7§eRight-click to add this pet to",18:"§eyour pet menu!",19:"",20:"§5§lEPIC"],Name:"§f§f§7[Lvl {LVL}] §5Phoenix"},ExtraAttributes:{petInfo:"{\\"type\\":\\"PHOENIX\\",\\"active\\":false,\\"exp\\":0.0,\\"tier\\":\\"EPIC\\",\\"hideInfo\\":false}",id:"PHOENIX;3"},AttributeModifiers:[]}',
-			'utf8'
-		)
-	)
-); */
-
-// import _ from 'lodash';
-
-// const str =
-// 	'{overrideMeta:1b,HideFlags:254,SkullOwner:{Id:"4173bc61-9e2f-3c84-8d31-4517e64062ab",Properties:{textures:[0:{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjNhYWY3YjFhNzc4OTQ5Njk2Y2I5OWQ0ZjA0YWQxYWE1MThjZWVlMjU2YzcyZTVlZDY1YmZhNWMyZDg4ZDllIn19fQ=="}]}},display:{Lore:[0:"§8Combat Pet",1:"",2:"§7Intelligence: §a{INTELLIGENCE}",3:"§7Strength: §a{STRENGTH}",4:"",5:"§6Rekindle",6:"§7§7Before death, become §eimmune",7:"§e§7and gain §c{0} §c❁ Strength",8:"§c§7for §a{1} §7seconds",9:"§83 minutes cooldown",10:"",11:"§6Fourth Flare",12:"§7§7On 4th melee strike, §6ignite",13:"§6§7mobs, dealing §c{4}x §7your",14:"§7§9☠ Crit Damage §7each second",15:"§7for §a{5} §7seconds",16:"",17:"§7§eRight-click to add this pet to",18:"§eyour pet menu!",19:"",20:"§5§lEPIC"],Name:"§f§f§7[Lvl {LVL}] §5Phoenix"},ExtraAttributes:{petInfo:"{\\"type\\":\\"PHOENIX\\",\\"active\\":false,\\"exp\\":0.0,\\"tier\\":\\"EPIC\\",\\"hideInfo\\":false}",id:"PHOENIX;3"},AttributeModifiers:[]}'.replaceAll(
-// 		/([0-9]{1,3}:)(["{])/g,
-// 		'$2'
-// 	);
-
-// console.log(str);
-
-// console.dir(
-// 	_.chunk(
-// 		str.split('').map((v, i) => [i, v]),
-// 		10
-// 	).map((v) => [v[0][0], v.map((v) => v[1]).join('')]),
-// 	{ maxArrayLength: Infinity, compact: 100 }
-// );
-
-// console.dir(parse(str));
-- 
cgit 


From 9247fa8c65174eb35fbfe3cd9d4167f9cf9ce17a Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Fri, 15 Jul 2022 17:24:14 -0400
Subject: upgrade deps

---
 src/bot.ts | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/bot.ts b/src/bot.ts
index 640f2ab..038fbbb 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -1,29 +1,23 @@
-// import { init } from './lib/utils/BushLogger.js';
-// // creates proxies on console.log and console.warn
-// // also starts a REPL session
-// init();
+import { init } from './lib/utils/BushLogger.js';
+// creates proxies on console.log and console.warn
+// also starts a REPL session
+init();
 
-// eslint-disable-next-line no-constant-condition
-if (false) {
-	// const { dirname } = await import('path');
-	// const { fileURLToPath } = await import('url');
-	// const { default: config } = await import('../config/options.js');
-	// const { Sentry } = await import('./lib/common/Sentry.js');
-	// const { BushClient } = await import('./lib/index.js');
-	//
-	// const isDry = process.argv.includes('dry');
-	// if (!isDry && config.credentials.sentryDsn !== null)
-	// 	new Sentry(dirname(fileURLToPath(import.meta.url)) || process.cwd(), config);
-	// BushClient.extendStructures();
-	// const client = new BushClient(config);
-	// if (!isDry) await client.dbPreInit();
-	// await client.init();
-	// if (isDry) {
-	// 	await client.destroy();
-	// 	process.exit(0);
-	// } else {
-	// 	await client.start();
-	// }
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { default as config } from '../config/options.js';
+import { Sentry } from './lib/common/Sentry.js';
+import { BushClient } from './lib/index.js';
+
+const isDry = process.argv.includes('dry');
+if (!isDry && config.credentials.sentryDsn !== null) new Sentry(dirname(fileURLToPath(import.meta.url)) || process.cwd(), config);
+BushClient.extendStructures();
+const client = new BushClient(config);
+if (!isDry) await client.dbPreInit();
+await client.init();
+if (isDry) {
+	await client.destroy();
+	process.exit(0);
 } else {
-	import('./lib/common/util/Minecraft.js');
+	await client.start();
 }
-- 
cgit 


From e4206aaa9211e792660b4015551519d633409355 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Fri, 5 Aug 2022 20:10:42 -0400
Subject: random stuff

---
 src/commands/info/inviteInfo.ts       |  6 ++--
 src/commands/utilities/highlight-!.ts |  5 +--
 src/lib/utils/BushLogger.ts           | 58 +++++++++++++++--------------------
 src/tasks/cache/updateNeuItemCache.ts |  4 +--
 4 files changed, 31 insertions(+), 42 deletions(-)

(limited to 'src')

diff --git a/src/commands/info/inviteInfo.ts b/src/commands/info/inviteInfo.ts
index bfe7eae..5df86ad 100644
--- a/src/commands/info/inviteInfo.ts
+++ b/src/commands/info/inviteInfo.ts
@@ -28,15 +28,15 @@ export default class InviteInfoCommand extends BushCommand {
 	public override async exec(message: CommandMessage | SlashMessage, args: { invite: ArgType<'invite' | 'string'> }) {
 		const invite = message.util.isSlashMessage(message)
 			? ((await Arg.cast('invite', message, args.invite as string)) as ArgType<'invite'>)
-			: args.invite;
+			: (args.invite as Invite);
 
-		const inviteInfoEmbed = new EmbedBuilder().setTitle(`Invite to ${invite.guild.name}`).setColor(colors.default);
+		const inviteInfoEmbed = new EmbedBuilder().setTitle(`Invite to ${invite.guild!.name}`).setColor(colors.default);
 
 		this.generateAboutField(inviteInfoEmbed, invite);
 	}
 
 	private generateAboutField(embed: EmbedBuilder, invite: Invite) {
-		const about = [`**code:** ${invite.code}`, `**channel:** ${}`];
+		const about = [`**code:** ${invite.code}`, `**channel:** ${invite.channel!.name}`];
 
 		embed.addFields({ name: '» About', value: about.join('\n') });
 	}
diff --git a/src/commands/utilities/highlight-!.ts b/src/commands/utilities/highlight-!.ts
index b93f59a..f2ee259 100644
--- a/src/commands/utilities/highlight-!.ts
+++ b/src/commands/utilities/highlight-!.ts
@@ -186,10 +186,7 @@ export default class HighlightCommand extends BushCommand {
 		throw new Error('This command is not meant to be executed directly.');
 	}
 
-	public override async execSlash(
-		message: SlashMessage,
-		args: { subcommand: keyof typeof highlightSubcommands; subcommandGroup?: string }
-	) {
+	public override async execSlash(message: SlashMessage, args: { subcommand: string; subcommandGroup?: string }) {
 		// manual `Flag.continue`
 		const subcommand = this.handler.modules.get(`highlight-${args.subcommandGroup ?? args.subcommand}`)!;
 		return subcommand.exec(message, args);
diff --git a/src/lib/utils/BushLogger.ts b/src/lib/utils/BushLogger.ts
index 5c98760..995dd82 100644
--- a/src/lib/utils/BushLogger.ts
+++ b/src/lib/utils/BushLogger.ts
@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { Client, EmbedBuilder, escapeMarkdown, PartialTextBasedChannelFields, type Message } from 'discord.js';
+import { Client, EmbedBuilder, escapeMarkdown, Formatters, PartialTextBasedChannelFields, type Message } from 'discord.js';
+import { stripVTControlCharacters as stripColor } from 'node:util';
 import repl, { REPLServer, REPL_MODE_STRICT } from 'repl';
 import { WriteStream } from 'tty';
 import { type SendMessageType } from '../extensions/discord-akairo/BushClient.js';
@@ -72,16 +73,16 @@ function parseFormatting(
 	discordFormat = false
 ): string | typeof content {
 	if (typeof content !== 'string') return content;
-	const newContent: Array<string> = content.split(/<<|>>/);
-	const tempParsedArray: Array<string> = [];
-	newContent.forEach((value, index) => {
-		if (index % 2 !== 0) {
-			tempParsedArray.push(discordFormat ? `**${escapeMarkdown(value)}**` : color ? chalk[color](value) : value);
-		} else {
-			tempParsedArray.push(discordFormat ? escapeMarkdown(value) : value);
-		}
-	});
-	return tempParsedArray.join('');
+	return content
+		.split(/<<|>>/)
+		.map((value, index) => {
+			if (discordFormat) {
+				return index % 2 === 0 ? escapeMarkdown(value) : Formatters.bold(escapeMarkdown(value));
+			} else {
+				return index % 2 === 0 || !color ? value : chalk[color](value);
+			}
+		})
+		.join('');
 }
 
 /**
@@ -98,34 +99,25 @@ function inspectContent(content: any, depth = 2, colors = true): string {
 	return content;
 }
 
-/**
- * Strips ANSI color codes from a string.
- * @param text The string to strip color codes from.
- * @returns A string without ANSI color codes.
- */
-function stripColor(text: string): string {
-	return text.replace(
-		// eslint-disable-next-line no-control-regex
-		/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
-		''
-	);
-}
-
 /**
  * Generates a formatted timestamp for logging.
  * @returns The formatted timestamp.
  */
 function getTimeStamp(): string {
 	const now = new Date();
-	const hours = now.getHours();
-	const minute = now.getMinutes();
-	let hour = hours;
-	let amOrPm: 'AM' | 'PM' = 'AM';
-	if (hour > 12) {
-		amOrPm = 'PM';
-		hour = hour - 12;
-	}
-	return `${hour >= 10 ? hour : `0${hour}`}:${minute >= 10 ? minute : `0${minute}`} ${amOrPm}`;
+	const minute = pad(now.getMinutes());
+	const hour = pad(now.getHours() % 12);
+	const meridiem = now.getHours() > 12 ? 'PM' : 'AM';
+	const year = now.getFullYear().toString().slice(2).padStart(2, '0');
+	const date = `${pad(now.getMonth() + 1)}/${pad(now.getDay())}/${year}`;
+	return `${date} ${hour}:${minute} ${meridiem}`;
+}
+
+/**
+ * Pad a two-digit number.
+ */
+function pad(num: number) {
+	return num.toString().padStart(2, '0');
 }
 
 /**
diff --git a/src/tasks/cache/updateNeuItemCache.ts b/src/tasks/cache/updateNeuItemCache.ts
index fff9e08..14c107b 100644
--- a/src/tasks/cache/updateNeuItemCache.ts
+++ b/src/tasks/cache/updateNeuItemCache.ts
@@ -1,8 +1,8 @@
 import { BushTask, Time } from '#lib';
 
-export default class UpdatePriceItemCache extends BushTask {
+export default class UpdateNeuItemCache extends BushTask {
 	public constructor() {
-		super('updatePriceItemCache', {
+		super('updateNeuItemCache', {
 			delay: 1 * Time.Hour,
 			runOnStart: true
 		});
-- 
cgit 


From 18ba8b2743c3cad7e89b70d0e1dcacacc007f6d6 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Fri, 5 Aug 2022 20:11:08 -0400
Subject: wip tickets

---
 src/commands/tickets/ticket-!.ts      | 63 +++++++++++++++++++++++++++++++++++
 src/commands/tickets/ticket-create.ts |  0
 2 files changed, 63 insertions(+)
 create mode 100644 src/commands/tickets/ticket-create.ts

(limited to 'src')

diff --git a/src/commands/tickets/ticket-!.ts b/src/commands/tickets/ticket-!.ts
index e69de29..7751df1 100644
--- a/src/commands/tickets/ticket-!.ts
+++ b/src/commands/tickets/ticket-!.ts
@@ -0,0 +1,63 @@
+import { BushCommand, clientSendAndPermCheck, deepWriteable, type SlashMessage } from '#lib';
+import { Flag, type ArgumentGeneratorReturn, type SlashOption } from 'discord-akairo';
+import { ApplicationCommandOptionType } from 'discord.js';
+
+export const ticketSubcommands = deepWriteable({
+	create: {
+		description: 'Create a ticket.',
+		type: ApplicationCommandOptionType.Subcommand,
+		options: [
+			{
+				name: 'word',
+				description: 'What word do you want to highlight?',
+				retry: '{error} Enter a valid word.',
+				type: ApplicationCommandOptionType.String,
+				required: true
+			}
+		]
+	}
+} as const);
+
+export default class TicketCommand extends BushCommand {
+	public constructor() {
+		super('ticket', {
+			aliases: ['ticket'],
+			category: 'ticket',
+			description: 'Manage tickets.',
+			usage: ['ticket create <reason>'],
+			examples: ['ticket creates very cool ticket'],
+			slashOptions: Object.entries(ticketSubcommands).map(
+				([subcommand, options]) => ({ name: subcommand, ...options } as SlashOption)
+			),
+			slash: true,
+			channel: 'guild',
+			clientPermissions: (m) => clientSendAndPermCheck(m),
+			userPermissions: []
+		});
+	}
+
+	public override *args(): ArgumentGeneratorReturn {
+		const subcommand: keyof typeof ticketSubcommands = yield {
+			id: 'subcommand',
+			type: Object.keys(ticketSubcommands),
+			prompt: {
+				start: 'What sub command would you like to use?',
+				retry: `{error} Valid subcommands are: ${Object.keys(ticketSubcommands)
+					.map((s) => `\`${s}\``)
+					.join()}.`
+			}
+		};
+
+		return Flag.continue(`ticket-${subcommand}`);
+	}
+
+	public override async exec() {
+		throw new Error('This command is not meant to be executed directly.');
+	}
+
+	public override async execSlash(message: SlashMessage, args: { subcommand: string; subcommandGroup?: string }) {
+		// manual `Flag.continue`
+		const subcommand = this.handler.modules.get(`ticket-${args.subcommandGroup ?? args.subcommand}`)!;
+		return subcommand.exec(message, args);
+	}
+}
diff --git a/src/commands/tickets/ticket-create.ts b/src/commands/tickets/ticket-create.ts
new file mode 100644
index 0000000..e69de29
-- 
cgit 


From 2ec1de170091178263e53ecfce744c7a0710a409 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Fri, 5 Aug 2022 20:11:45 -0400
Subject: wip tooltip rendering

---
 src/commands/moulberry-bush/neuRepo.ts | 153 ++++++++++++++++++++-
 src/lib/common/util/Minecraft.ts       | 234 ++++++++++++++++++---------------
 src/lib/common/util/Minecraft_Test.ts  |  86 ++++++++++++
 3 files changed, 361 insertions(+), 112 deletions(-)
 create mode 100644 src/lib/common/util/Minecraft_Test.ts

(limited to 'src')

diff --git a/src/commands/moulberry-bush/neuRepo.ts b/src/commands/moulberry-bush/neuRepo.ts
index 24f83ad..9d76810 100644
--- a/src/commands/moulberry-bush/neuRepo.ts
+++ b/src/commands/moulberry-bush/neuRepo.ts
@@ -1,5 +1,16 @@
 import { BushCommand, clientSendAndPermCheck, type ArgType, type CommandMessage, type SlashMessage } from '#lib';
-import { ApplicationCommandOptionType, AutocompleteInteraction, CacheType, PermissionFlagsBits } from 'discord.js';
+import canvas from 'canvas';
+import {
+	ApplicationCommandOptionType,
+	AttachmentBuilder,
+	AutocompleteInteraction,
+	CacheType,
+	PermissionFlagsBits
+} from 'discord.js';
+import { dirname, join } from 'path';
+import tinycolor from 'tinycolor2';
+import { fileURLToPath } from 'url';
+import { formattingInfo, RawNeuItem } from '../../lib/common/util/Minecraft.js';
 
 export default class NeuRepoCommand extends BushCommand {
 	public static items: { name: string; id: string }[] = [];
@@ -34,14 +45,148 @@ export default class NeuRepoCommand extends BushCommand {
 			],
 			slash: true,
 			clientPermissions: (m) => clientSendAndPermCheck(m, [PermissionFlagsBits.EmbedLinks], true),
-			userPermissions: []
+			userPermissions: [],
+			ownerOnly: true
 		});
 	}
 
 	public override async exec(
 		message: CommandMessage | SlashMessage,
 		args: { item: ArgType<'string'> /* dangerous: ArgType<'flag'> */ }
-	) {}
+	) {
+		const itemPath = join(import.meta.url, '..', '..', '..', '..', '..', 'neu-item-repo-dangerous', 'items', `${args.item}.json`);
+		const item = (await import(itemPath, { assert: { type: 'json' } })).default as RawNeuItem;
 
-	public override async autocomplete(interaction: AutocompleteInteraction<CacheType>) {}
+		const toolTip = this.toolTip(item);
+
+		return message.util.reply({
+			files: [new AttachmentBuilder(toolTip, { name: `${item.internalname}.png`, description: item.displayname })]
+		});
+	}
+
+	public toolTip(item: RawNeuItem): Buffer {
+		canvas.registerFont(join(dirname(fileURLToPath(import.meta.url)), '..', '..', '..', '..', 'assets', 'Faithful.ttf'), {
+			family: 'Faithful'
+		});
+
+		const background = '#100010';
+
+		const width = 250;
+		const height = 250;
+		const scale = 10;
+
+		const itemRender = canvas.createCanvas(width, height),
+			ctx = itemRender.getContext('2d');
+
+		ctx.globalAlpha = 0.94;
+		ctx.fillStyle = background;
+
+		// top outside
+		ctx.fillRect(scale, 0, width - 2 * scale, scale);
+
+		// bottom outside
+		ctx.fillRect(scale, height - scale, width - 2 * scale, scale);
+
+		// left outside
+		ctx.fillRect(0, scale, scale, height - 2 * scale);
+
+		// right outside
+		ctx.fillRect(width - scale, scale, scale, height - 2 * scale);
+
+		// middle
+		ctx.fillRect(2 * scale, 2 * scale, width - 4 * scale, height - 4 * scale);
+
+		ctx.globalAlpha = 0.78;
+
+		const borderColorStart = parseInt(new tinycolor(this.getPrimaryColour(item.displayname)).toHex(), 16);
+		const borderColorEnd = ((borderColorStart & 0xfefefe) >> 1) | (borderColorStart & 0xff000000);
+
+		const borderColorStartStr = `#${borderColorStart.toString(16)}`;
+		const borderColorEndStr = `#${borderColorEnd.toString(16)}`;
+
+		ctx.fillStyle = borderColorStartStr;
+
+		// top highlight
+		ctx.fillRect(scale, scale, width - 2 * scale, scale);
+
+		// left highlight
+		ctx.fillRect(scale, 2 * scale, scale, height - 3 * scale);
+
+		// bottom highlight
+		{
+			const x = 2 * scale,
+				y = height - 2 * scale,
+				w = width - 3 * scale,
+				h = scale;
+			const gradient = ctx.createLinearGradient(x, y, x + w, y + h);
+			gradient.addColorStop(0, borderColorStartStr);
+			gradient.addColorStop(1, borderColorEndStr);
+			ctx.fillStyle = gradient;
+
+			ctx.fillRect(x, y, w, h);
+		}
+
+		// right highlight
+		{
+			const x = width - 2 * scale,
+				y = 2 * scale,
+				w = scale,
+				h = height - 4 * scale;
+			const gradient = ctx.createLinearGradient(x, y, x + w, y + h);
+			gradient.addColorStop(0, borderColorStartStr);
+			gradient.addColorStop(1, borderColorEndStr);
+			ctx.fillStyle = gradient;
+
+			ctx.fillRect(x, y, w, h);
+		}
+
+		item.displayname.split('');
+
+		return itemRender.toBuffer();
+	}
+
+	// stolen from NEU and modified
+	public getPrimaryColourCode(displayname: string): code {
+		let lastColourCode = -99;
+		let currentColour = 0;
+		const mostCommon = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+		for (let i = 0; i < displayname.length; i++) {
+			const c = displayname.charAt(i);
+			if (c === '\u00A7') {
+				lastColourCode = i;
+			} else if (lastColourCode === i - 1) {
+				const colIndex = '0123456789abcdef'.indexOf(c);
+				if (colIndex >= 0) {
+					currentColour = colIndex;
+				} else {
+					currentColour = 0;
+				}
+			} else if ('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.indexOf(c) >= 0) {
+				if (currentColour > 0) {
+					mostCommon[currentColour] = mostCommon[currentColour]++;
+				}
+			}
+		}
+		let mostCommonCount = 0;
+		for (let index = 0; index < mostCommon.length; index++) {
+			if (mostCommon[index] > mostCommonCount) {
+				mostCommonCount = mostCommon[index];
+				currentColour = index;
+			}
+		}
+
+		return <code>'0123456789abcdef'.charAt(currentColour);
+	}
+
+	// stolen from NEU and modified
+	public getPrimaryColour(displayname: string) {
+		const code = this.getPrimaryColourCode(displayname);
+		return formattingInfo[`§${code}`].foregroundDarker;
+	}
+
+	public override async autocomplete(interaction: AutocompleteInteraction<CacheType>) {
+		return interaction.respond([{ name: 'Blazetekk™ Ham Radio', value: 'BLAZETEKK_HAM_RADIO' }]);
+	}
 }
+
+type code = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | 'a' | 'b' | 'c' | 'd' | 'e' | 'f';
diff --git a/src/lib/common/util/Minecraft.ts b/src/lib/common/util/Minecraft.ts
index b4b013f..a12ebf2 100644
--- a/src/lib/common/util/Minecraft.ts
+++ b/src/lib/common/util/Minecraft.ts
@@ -1,6 +1,5 @@
 import { Byte, Int, parse } from '@ironm00n/nbt-ts';
 import { BitField } from 'discord.js';
-import fs from 'fs/promises';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
@@ -34,22 +33,118 @@ export enum FormattingCodes {
 
 // https://minecraft.fandom.com/wiki/Formatting_codes
 export const formattingInfo = {
-	[FormattingCodes.Black]: { foreground: '#000000', background: '#000000', ansi: '\u001b[0;30m' },
-	[FormattingCodes.DarkBlue]: { foreground: '#0000AA', background: '#00002A', ansi: '\u001b[0;34m' },
-	[FormattingCodes.DarkGreen]: { foreground: '#00AA00', background: '#002A00', ansi: '\u001b[0;32m' },
-	[FormattingCodes.DarkAqua]: { foreground: '#00AAAA', background: '#002A2A', ansi: '\u001b[0;36m' },
-	[FormattingCodes.DarkRed]: { foreground: '#AA0000', background: '#2A0000', ansi: '\u001b[0;31m' },
-	[FormattingCodes.DarkPurple]: { foreground: '#AA00AA', background: '#2A002A', ansi: '\u001b[0;35m' },
-	[FormattingCodes.Gold]: { foreground: '#FFAA00', background: '#2A2A00', ansi: '\u001b[0;33m' },
-	[FormattingCodes.Gray]: { foreground: '#AAAAAA', background: '#2A2A2A', ansi: '\u001b[0;37m' },
-	[FormattingCodes.DarkGray]: { foreground: '#555555', background: '#151515', ansi: '\u001b[0;90m' },
-	[FormattingCodes.Blue]: { foreground: '#5555FF', background: '#15153F', ansi: '\u001b[0;94m' },
-	[FormattingCodes.Green]: { foreground: '#55FF55', background: '#153F15', ansi: '\u001b[0;92m' },
-	[FormattingCodes.Aqua]: { foreground: '#55FFFF', background: '#153F3F', ansi: '\u001b[0;96m' },
-	[FormattingCodes.Red]: { foreground: '#FF5555', background: '#3F1515', ansi: '\u001b[0;91m' },
-	[FormattingCodes.LightPurple]: { foreground: '#FF55FF', background: '#3F153F', ansi: '\u001b[0;95m' },
-	[FormattingCodes.Yellow]: { foreground: '#FFFF55', background: '#3F3F15', ansi: '\u001b[0;93m' },
-	[FormattingCodes.White]: { foreground: '#FFFFFF', background: '#3F3F3F', ansi: '\u001b[0;97m' },
+	[FormattingCodes.Black]: {
+		foreground: 'rgb(0, 0, 0)',
+		foregroundDarker: 'rgb(0, 0, 0)',
+		background: 'rgb(0, 0, 0)',
+		backgroundDarker: 'rgb(0, 0, 0)',
+		ansi: '\u001b[0;30m'
+	},
+	[FormattingCodes.DarkBlue]: {
+		foreground: 'rgb(0, 0, 170)',
+		foregroundDarker: 'rgb(0, 0, 118)',
+		background: 'rgb(0, 0, 42)',
+		backgroundDarker: 'rgb(0, 0, 29)',
+		ansi: '\u001b[0;34m'
+	},
+	[FormattingCodes.DarkGreen]: {
+		foreground: 'rgb(0, 170, 0)',
+		foregroundDarker: 'rgb(0, 118, 0)',
+		background: 'rgb(0, 42, 0)',
+		backgroundDarker: 'rgb(0, 29, 0)',
+		ansi: '\u001b[0;32m'
+	},
+	[FormattingCodes.DarkAqua]: {
+		foreground: 'rgb(0, 170, 170)',
+		foregroundDarker: 'rgb(0, 118, 118)',
+		background: 'rgb(0, 42, 42)',
+		backgroundDarker: 'rgb(0, 29, 29)',
+		ansi: '\u001b[0;36m'
+	},
+	[FormattingCodes.DarkRed]: {
+		foreground: 'rgb(170, 0, 0)',
+		foregroundDarker: 'rgb(118, 0, 0)',
+		background: 'rgb(42, 0, 0)',
+		backgroundDarker: 'rgb(29, 0, 0)',
+		ansi: '\u001b[0;31m'
+	},
+	[FormattingCodes.DarkPurple]: {
+		foreground: 'rgb(170, 0, 170)',
+		foregroundDarker: 'rgb(118, 0, 118)',
+		background: 'rgb(42, 0, 42)',
+		backgroundDarker: 'rgb(29, 0, 29)',
+		ansi: '\u001b[0;35m'
+	},
+	[FormattingCodes.Gold]: {
+		foreground: 'rgb(255, 170, 0)',
+		foregroundDarker: 'rgb(178, 118, 0)',
+		background: 'rgb(42, 42, 0)',
+		backgroundDarker: 'rgb(29, 29, 0)',
+		ansi: '\u001b[0;33m'
+	},
+	[FormattingCodes.Gray]: {
+		foreground: 'rgb(170, 170, 170)',
+		foregroundDarker: 'rgb(118, 118, 118)',
+		background: 'rgb(42, 42, 42)',
+		backgroundDarker: 'rgb(29, 29, 29)',
+		ansi: '\u001b[0;37m'
+	},
+	[FormattingCodes.DarkGray]: {
+		foreground: 'rgb(85, 85, 85)',
+		foregroundDarker: 'rgb(59, 59, 59)',
+		background: 'rgb(21, 21, 21)',
+		backgroundDarker: 'rgb(14, 14, 14)',
+		ansi: '\u001b[0;90m'
+	},
+	[FormattingCodes.Blue]: {
+		foreground: 'rgb(85, 85, 255)',
+		foregroundDarker: 'rgb(59, 59, 178)',
+		background: 'rgb(21, 21, 63)',
+		backgroundDarker: 'rgb(14, 14, 44)',
+		ansi: '\u001b[0;94m'
+	},
+	[FormattingCodes.Green]: {
+		foreground: 'rgb(85, 255, 85)',
+		foregroundDarker: 'rgb(59, 178, 59)',
+		background: 'rgb(21, 63, 21)',
+		backgroundDarker: 'rgb(14, 44, 14)',
+		ansi: '\u001b[0;92m'
+	},
+	[FormattingCodes.Aqua]: {
+		foreground: 'rgb(85, 255, 255)',
+		foregroundDarker: 'rgb(59, 178, 178)',
+		background: 'rgb(21, 63, 63)',
+		backgroundDarker: 'rgb(14, 44, 44)',
+		ansi: '\u001b[0;96m'
+	},
+	[FormattingCodes.Red]: {
+		foreground: 'rgb(255, 85, 85)',
+		foregroundDarker: 'rgb(178, 59, 59)',
+		background: 'rgb(63, 21, 21)',
+		backgroundDarker: 'rgb(44, 14, 14)',
+		ansi: '\u001b[0;91m'
+	},
+	[FormattingCodes.LightPurple]: {
+		foreground: 'rgb(255, 85, 255)',
+		foregroundDarker: 'rgb(178, 59, 178)',
+		background: 'rgb(63, 21, 63)',
+		backgroundDarker: 'rgb(44, 14, 44)',
+		ansi: '\u001b[0;95m'
+	},
+	[FormattingCodes.Yellow]: {
+		foreground: 'rgb(255, 255, 85)',
+		foregroundDarker: 'rgb(178, 178, 59)',
+		background: 'rgb(63, 63, 21)',
+		backgroundDarker: 'rgb(44, 44, 14)',
+		ansi: '\u001b[0;93m'
+	},
+	[FormattingCodes.White]: {
+		foreground: 'rgb(255, 255, 255)',
+		foregroundDarker: 'rgb(178, 178, 178)',
+		background: 'rgb(63, 63, 63)',
+		backgroundDarker: 'rgb(44, 44, 44)',
+		ansi: '\u001b[0;97m'
+	},
 
 	[FormattingCodes.Obfuscated]: { ansi: '\u001b[8m' },
 	[FormattingCodes.Bold]: { ansi: '\u001b[1m' },
@@ -68,7 +163,7 @@ export type SbRecipe = {
 };
 export type InfoType = 'WIKI_URL' | '';
 
-type Slayer = `${'WOLF' | 'BLAZE' | 'EMAN'}_${1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9}`;
+export type Slayer = `${'WOLF' | 'BLAZE' | 'EMAN'}_${1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9}`;
 
 export interface RawNeuItem {
 	itemid: McItemId;
@@ -128,87 +223,8 @@ export function removeMCFormatting(str: string) {
 }
 
 const repo = path.join(__dirname, '..', '..', '..', '..', '..', 'neu-item-repo-dangerous');
-const itemPath = path.join(repo, 'items');
-const items = await fs.readdir(itemPath);
-
-// for (let i = 0; i < 5; i++) {
-for (const path_ of items) {
-	// const randomItem = items[Math.floor(Math.random() * items.length)];
-	// console.log(randomItem);
-	const item = (await import(path.join(itemPath, /* randomItem */ path_), { assert: { type: 'json' } })).default as RawNeuItem;
-	if (/.*?((_MONSTER)|(_NPC)|(_ANIMAL)|(_MINIBOSS)|(_BOSS)|(_SC))$/.test(item.internalname)) continue;
-	if (!/.*?;[0-5]$/.test(item.internalname)) continue;
-	/* console.log(path_);
-	 console.dir(item, { depth: Infinity }); */
-
-	/* console.log('==========='); */
-	const nbt = parse(item.nbttag) as NbtTag;
-
-	if (nbt?.SkullOwner?.Properties?.textures?.[0]?.Value) {
-		nbt.SkullOwner.Properties.textures[0].Value = parse(
-			Buffer.from(nbt.SkullOwner.Properties.textures[0].Value, 'base64').toString('utf-8')
-		) as string;
-	}
-
-	if (nbt.ExtraAttributes?.petInfo) {
-		nbt.ExtraAttributes.petInfo = JSON.parse(nbt.ExtraAttributes.petInfo as any as string);
-	}
 
-	// delete nbt.display?.Lore;
-
-	console.dir(nbt, { depth: Infinity });
-	console.log('===========');
-
-	/* if (nbt?.display && nbt.display.Name !== item.displayname)
-		console.log(`${path_}		display name mismatch: ${mcToAnsi(nbt.display.Name)} != ${mcToAnsi(item.displayname)}`);
-
-	if (nbt?.ExtraAttributes && nbt?.ExtraAttributes.id !== item.internalname)
-		console.log(`${path_}		internal name mismatch: ${mcToAnsi(nbt?.ExtraAttributes.id)} != ${mcToAnsi(item.internalname)}`); */
-
-	/* console.log('===========');
-
-	console.log(mcToAnsi(item.displayname));
-	console.log(item.lore.map((l) => mcToAnsi(l)).join('\n')); */
-
-	/* const keys = [
-		'itemid',
-		'displayname',
-		'nbttag',
-		'damage',
-		'lore',
-		'recipe',
-		'internalname',
-		'modver',
-		'infoType',
-		'info',
-		'crafttext',
-		'vanilla',
-		'useneucraft',
-		'slayer_req',
-		'clickcommand',
-		'x',
-		'y',
-		'z',
-		'island',
-		'recipes',
-		'parent',
-		'noseal'
-	];
-
-	Object.keys(item).forEach((k) => {
-		if (!keys.includes(k)) throw new Error(`Unknown key: ${k}`);
-	});
-
-	if (
-		'slayer_req' in item &&
-		!new Array(10).flatMap((_, i) => ['WOLF', 'BLAZE', 'EMAN'].map((e) => e + (i + 1)).includes(item.slayer_req!))
-	)
-		throw new Error(`Unknown slayer req: ${item.slayer_req!}`); */
-
-	/* console.log('=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-'); */
-}
-
-interface NbtTag {
+export interface NbtTag {
 	overrideMeta?: Byte;
 	Unbreakable?: Int;
 	ench?: string[];
@@ -218,22 +234,22 @@ interface NbtTag {
 	ExtraAttributes?: ExtraAttributes;
 }
 
-interface SkullOwner {
+export interface SkullOwner {
 	Id?: string;
 	Properties?: {
 		textures?: { Value?: string }[];
 	};
 }
 
-interface NbtTagDisplay {
+export interface NbtTagDisplay {
 	Lore?: string[];
 	color?: Int;
 	Name?: string;
 }
 
-type RuneId = string;
+export type RuneId = string;
 
-interface ExtraAttributes {
+export interface ExtraAttributes {
 	originTag?: Origin;
 	id?: string;
 	generator_tier?: Int;
@@ -244,7 +260,7 @@ interface ExtraAttributes {
 	petInfo?: PetInfo;
 }
 
-interface PetInfo {
+export interface PetInfo {
 	type: 'ZOMBIE';
 	active: boolean;
 	exp: number;
@@ -253,7 +269,7 @@ interface PetInfo {
 	candyUsed: number;
 }
 
-type Origin = 'SHOP_PURCHASE';
+export type Origin = 'SHOP_PURCHASE';
 
 const neuConstantsPath = path.join(repo, 'constants');
 const neuPetsPath = path.join(neuConstantsPath, 'pets.json');
@@ -261,14 +277,14 @@ const neuPets = (await import(neuPetsPath, { assert: { type: 'json' } })) as Pet
 const neuPetNumsPath = path.join(neuConstantsPath, 'petnums.json');
 const neuPetNums = (await import(neuPetNumsPath, { assert: { type: 'json' } })) as PetNums;
 
-interface PetsConstants {
+export interface PetsConstants {
 	pet_rarity_offset: Record<string, number>;
 	pet_levels: number[];
 	custom_pet_leveling: Record<string, { type: number; pet_levels: number[]; max_level: number }>;
 	pet_types: Record<string, string>;
 }
 
-interface PetNums {
+export interface PetNums {
 	[key: string]: {
 		[key: string]: {
 			'1': {
@@ -284,7 +300,7 @@ interface PetNums {
 	};
 }
 
-class NeuItem {
+export class NeuItem {
 	public itemId: McItemId;
 	public displayName: string;
 	public nbtTag: NbtTag;
@@ -315,6 +331,8 @@ class NeuItem {
 
 			const curve = petInfoTier?.stats_levelling_curve?.split(';');
 
+			// todo: finish copying from neu
+
 			const minStatsLevel = parseInt(curve?.[0] ?? '0');
 			const maxStatsLevel = parseInt(curve?.[0] ?? '100');
 
@@ -323,7 +341,7 @@ class NeuItem {
 	}
 }
 
-function mcToAnsi(str: string) {
+export function mcToAnsi(str: string) {
 	for (const format in formattingInfo) {
 		str = str.replaceAll(format, formattingInfo[format as keyof typeof formattingInfo].ansi);
 	}
diff --git a/src/lib/common/util/Minecraft_Test.ts b/src/lib/common/util/Minecraft_Test.ts
new file mode 100644
index 0000000..26ca648
--- /dev/null
+++ b/src/lib/common/util/Minecraft_Test.ts
@@ -0,0 +1,86 @@
+import fs from 'fs/promises';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { mcToAnsi, RawNeuItem } from './Minecraft.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const repo = path.join(__dirname, '..', '..', '..', '..', '..', 'neu-item-repo-dangerous');
+const itemPath = path.join(repo, 'items');
+const items = await fs.readdir(itemPath);
+
+// for (let i = 0; i < 5; i++) {
+for (const path_ of items) {
+	// const randomItem = items[Math.floor(Math.random() * items.length)];
+	// console.log(randomItem);
+	const item = (await import(path.join(itemPath, /* randomItem */ path_), { assert: { type: 'json' } })).default as RawNeuItem;
+	if (/.*?((_MONSTER)|(_NPC)|(_ANIMAL)|(_MINIBOSS)|(_BOSS)|(_SC))$/.test(item.internalname)) continue;
+	if (!/.*?;[0-5]$/.test(item.internalname)) continue;
+	/* console.log(path_);
+	 console.dir(item, { depth: Infinity }); */
+
+	/* console.log('==========='); */
+	// const nbt = parse(item.nbttag) as NbtTag;
+
+	// if (nbt?.SkullOwner?.Properties?.textures?.[0]?.Value) {
+	// 	nbt.SkullOwner.Properties.textures[0].Value = parse(
+	// 		Buffer.from(nbt.SkullOwner.Properties.textures[0].Value, 'base64').toString('utf-8')
+	// 	) as string;
+	// }
+
+	// if (nbt.ExtraAttributes?.petInfo) {
+	// 	nbt.ExtraAttributes.petInfo = JSON.parse(nbt.ExtraAttributes.petInfo as any as string);
+	// }
+
+	// delete nbt.display?.Lore;
+
+	// console.dir(nbt, { depth: Infinity });
+	// console.log('===========');
+
+	/* if (nbt?.display && nbt.display.Name !== item.displayname)
+		console.log(`${path_}		display name mismatch: ${mcToAnsi(nbt.display.Name)} != ${mcToAnsi(item.displayname)}`);
+
+	if (nbt?.ExtraAttributes && nbt?.ExtraAttributes.id !== item.internalname)
+		console.log(`${path_}		internal name mismatch: ${mcToAnsi(nbt?.ExtraAttributes.id)} != ${mcToAnsi(item.internalname)}`); */
+
+	//  console.log('===========');
+
+	console.log(mcToAnsi(item.displayname));
+	console.log(item.lore.map((l) => mcToAnsi(l)).join('\n'));
+
+	/* const keys = [
+		'itemid',
+		'displayname',
+		'nbttag',
+		'damage',
+		'lore',
+		'recipe',
+		'internalname',
+		'modver',
+		'infoType',
+		'info',
+		'crafttext',
+		'vanilla',
+		'useneucraft',
+		'slayer_req',
+		'clickcommand',
+		'x',
+		'y',
+		'z',
+		'island',
+		'recipes',
+		'parent',
+		'noseal'
+	];
+
+	Object.keys(item).forEach((k) => {
+		if (!keys.includes(k)) throw new Error(`Unknown key: ${k}`);
+	});
+
+	if (
+		'slayer_req' in item &&
+		!new Array(10).flatMap((_, i) => ['WOLF', 'BLAZE', 'EMAN'].map((e) => e + (i + 1)).includes(item.slayer_req!))
+	)
+		throw new Error(`Unknown slayer req: ${item.slayer_req!}`); */
+
+	/* console.log('=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-'); */
+}
-- 
cgit 


From 7824c911806e368f6a1bea7f6b55d1f470b755d1 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Fri, 5 Aug 2022 20:14:49 -0400
Subject: hide incomplete commands

---
 src/commands/moulberry-bush/neuRepo.ts | 5 +++--
 src/commands/tickets/ticket-!.ts       | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/commands/moulberry-bush/neuRepo.ts b/src/commands/moulberry-bush/neuRepo.ts
index 9d76810..d07ba53 100644
--- a/src/commands/moulberry-bush/neuRepo.ts
+++ b/src/commands/moulberry-bush/neuRepo.ts
@@ -43,10 +43,11 @@ export default class NeuRepoCommand extends BushCommand {
 					slashType: ApplicationCommandOptionType.Boolean
 				} */
 			],
-			slash: true,
+			slash: false,
 			clientPermissions: (m) => clientSendAndPermCheck(m, [PermissionFlagsBits.EmbedLinks], true),
 			userPermissions: [],
-			ownerOnly: true
+			ownerOnly: true,
+			hidden: true
 		});
 	}
 
diff --git a/src/commands/tickets/ticket-!.ts b/src/commands/tickets/ticket-!.ts
index 7751df1..6ec4093 100644
--- a/src/commands/tickets/ticket-!.ts
+++ b/src/commands/tickets/ticket-!.ts
@@ -29,10 +29,12 @@ export default class TicketCommand extends BushCommand {
 			slashOptions: Object.entries(ticketSubcommands).map(
 				([subcommand, options]) => ({ name: subcommand, ...options } as SlashOption)
 			),
-			slash: true,
+			slash: false,
 			channel: 'guild',
 			clientPermissions: (m) => clientSendAndPermCheck(m),
-			userPermissions: []
+			userPermissions: [],
+			ownerOnly: true,
+			hidden: true
 		});
 	}
 
-- 
cgit 


From 7894d181d4863e3031c3f7721c345077cc5bc613 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Fri, 5 Aug 2022 22:56:44 -0400
Subject: add more mappings

---
 src/arguments/abbreviatedNumber.ts          |  2 +-
 src/arguments/tinyColor.ts                  |  2 +-
 src/commands/info/userInfo.ts               |  6 +++---
 src/commands/moulberry-bush/giveawayPing.ts |  6 +++---
 src/commands/moulberry-bush/moulHammer.ts   | 14 +++++++++++---
 src/commands/moulberry-bush/report.ts       |  4 +++-
 src/commands/moulberry-bush/rule.ts         |  5 +++--
 src/lib/utils/BushConstants.ts              | 21 ++++++++++++++++-----
 src/listeners/bush/appealListener.ts        |  2 +-
 src/listeners/bush/joinAutoBan.ts           |  2 +-
 src/listeners/bush/supportThread.ts         |  6 +++---
 src/listeners/bush/userUpdateAutoBan.ts     |  2 +-
 src/listeners/message/quoteCreate.ts        |  4 ++--
 13 files changed, 49 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/arguments/abbreviatedNumber.ts b/src/arguments/abbreviatedNumber.ts
index eba9214..a7d8ce5 100644
--- a/src/arguments/abbreviatedNumber.ts
+++ b/src/arguments/abbreviatedNumber.ts
@@ -1,5 +1,5 @@
 import type { BushArgumentTypeCaster } from '#lib';
-import assert from 'assert';
+import assert from 'assert/strict';
 import numeral from 'numeral';
 assert(typeof numeral === 'function');
 
diff --git a/src/arguments/tinyColor.ts b/src/arguments/tinyColor.ts
index 8d01928..148c078 100644
--- a/src/arguments/tinyColor.ts
+++ b/src/arguments/tinyColor.ts
@@ -1,5 +1,5 @@
 import type { BushArgumentTypeCaster } from '#lib';
-import assert from 'assert';
+import assert from 'assert/strict';
 import tinycolorModule from 'tinycolor2';
 assert(tinycolorModule);
 
diff --git a/src/commands/info/userInfo.ts b/src/commands/info/userInfo.ts
index 3479ea3..7b67816 100644
--- a/src/commands/info/userInfo.ts
+++ b/src/commands/info/userInfo.ts
@@ -162,11 +162,11 @@ export default class UserInfoCommand extends BushCommand {
 			);
 		if (member.premiumSince) serverUserInfo.push(`**Booster Since:** ${timestampAndDelta(member.premiumSince, 'd')}`);
 		if (member.displayHexColor) serverUserInfo.push(`**Display Color:** ${member.displayHexColor}`);
-		if (member.user.id == '322862723090219008' && member.guild?.id == mappings.guilds.bush)
+		if (member.user.id == mappings.users['IRONM00N'] && member.guild?.id == mappings.guilds["Moulberry's Bush"])
 			serverUserInfo.push(`**General Deletions:** 1⅓`);
 		if (
-			(['384620942577369088', '496409778822709251'] as const).includes(member.user.id) &&
-			member.guild.id == mappings.guilds.bush
+			([mappings.users['nopo'], mappings.users['Bestower']] as const).includes(member.user.id) &&
+			member.guild.id == mappings.guilds["Moulberry's Bush"]
 		)
 			serverUserInfo.push(`**General Deletions:** ⅓`);
 		if (member?.nickname) serverUserInfo.push(`**Nickname:** ${escapeMarkdown(member?.nickname)}`);
diff --git a/src/commands/moulberry-bush/giveawayPing.ts b/src/commands/moulberry-bush/giveawayPing.ts
index d93e0c9..6803c0c 100644
--- a/src/commands/moulberry-bush/giveawayPing.ts
+++ b/src/commands/moulberry-bush/giveawayPing.ts
@@ -1,4 +1,4 @@
-import { AllowedMentions, BushCommand, clientSendAndPermCheck, emojis, type CommandMessage } from '#lib';
+import { AllowedMentions, BushCommand, clientSendAndPermCheck, emojis, mappings, type CommandMessage } from '#lib';
 import assert from 'assert';
 import { PermissionFlagsBits } from 'discord.js';
 
@@ -24,8 +24,8 @@ export default class GiveawayPingCommand extends BushCommand {
 			cooldown: 1.44e7, //4 hours
 			ratelimit: 1,
 			editable: false,
-			restrictedGuilds: ['516977525906341928'],
-			restrictedChannels: ['767782084981817344', '833855738501267456']
+			restrictedGuilds: [mappings.guilds["Moulberry's Bush"]],
+			restrictedChannels: [mappings.channels['giveaways']]
 		});
 	}
 
diff --git a/src/commands/moulberry-bush/moulHammer.ts b/src/commands/moulberry-bush/moulHammer.ts
index 0eeb769..277f051 100644
--- a/src/commands/moulberry-bush/moulHammer.ts
+++ b/src/commands/moulberry-bush/moulHammer.ts
@@ -1,4 +1,12 @@
-import { BushCommand, clientSendAndPermCheck, colors, type ArgType, type CommandMessage, type SlashMessage } from '#lib';
+import {
+	BushCommand,
+	clientSendAndPermCheck,
+	colors,
+	mappings,
+	type ArgType,
+	type CommandMessage,
+	type SlashMessage
+} from '#lib';
 import assert from 'assert';
 import { ApplicationCommandOptionType, EmbedBuilder, PermissionFlagsBits } from 'discord.js';
 
@@ -22,8 +30,8 @@ export default class MoulHammerCommand extends BushCommand {
 			],
 			slash: true,
 			channel: 'guild',
-			slashGuilds: ['516977525906341928'],
-			restrictedGuilds: ['516977525906341928'],
+			slashGuilds: [mappings.guilds["Moulberry's Bush"]],
+			restrictedGuilds: [mappings.guilds["Moulberry's Bush"]],
 			clientPermissions: (m) => clientSendAndPermCheck(m, [PermissionFlagsBits.EmbedLinks], true),
 			userPermissions: []
 		});
diff --git a/src/commands/moul