Cleanup toolkit imports to reduce import times/issues

scripts/monster_table.ts

@@ -1,4 +1,4 @@
-import { calcPerHour } from '@oldschoolgg/toolkit';
+import { calcPerHour } from '@oldschoolgg/toolkit/util';
 import type { PlayerOwnedHouse } from '@prisma/client';
 import { Time } from 'e';
 import { Bank, Items, convertBankToPerHourStats } from 'oldschooljs';

scripts/renderCommandsFile.ts

@@ -1,6 +1,6 @@
 import { execSync } from 'node:child_process';
 import { writeFileSync } from 'node:fs';
-import { stringMatches } from '@oldschoolgg/toolkit';
+import { stringMatches } from '@oldschoolgg/toolkit/util';
 import { ApplicationCommandOptionType } from 'discord.js';
 import { BOT_TYPE } from '../src/lib/constants';
 import { allCommands } from '../src/mahoji/commands/allCommands';

scripts/wiki.ts

@@ -1,12 +1,14 @@
 import { readFileSync, writeFileSync } from 'node:fs';
+import { toTitleCase } from '@oldschoolgg/toolkit';
+import { Bank, Monsters } from 'oldschooljs';
 
 import '../src/lib/safeglobals';
 import { type CombatAchievement, CombatAchievements } from '../src/lib/combat_achievements/combatAchievements';
 import { COXMaxMageGear, COXMaxMeleeGear, COXMaxRangeGear, itemBoosts } from '../src/lib/data/cox';
 import killableMonsters from '../src/lib/minions/data/killableMonsters';
 import { quests } from '../src/lib/minions/data/quests';
 import { sorts } from '../src/lib/sorts';
-import { Bank, Monsters, itemNameFromID, toTitleCase } from '../src/lib/util';
+import { itemNameFromID } from '../src/lib/util';
 import { Markdown, Tab, Tabs } from './markdown/markdown';
 
 function combatAchievementHowToFinish(ca: CombatAchievement) {

src/index.ts

@@ -4,7 +4,7 @@ import './lib/MUser';
 import './lib/util/transactItemsFromBank';
 import './lib/geImage';
 
-import { MahojiClient } from '@oldschoolgg/toolkit';
+import { MahojiClient } from '@oldschoolgg/toolkit/util';
 import { init } from '@sentry/node';
 import type { TextChannel } from 'discord.js';
 import { GatewayIntentBits, Options, Partials } from 'discord.js';

src/lib/MUser.ts

@@ -1,4 +1,4 @@
-import { cleanUsername, mentionCommand } from '@oldschoolgg/toolkit';
+import { cleanUsername, mentionCommand } from '@oldschoolgg/toolkit/util';
 import type { GearSetupType, Prisma, User, UserStats, xp_gains_skill_enum } from '@prisma/client';
 import { userMention } from 'discord.js';
 import { calcWhatPercent, percentChance, sumArr, uniqueArr } from 'e';

src/lib/addXP.ts

@@ -1,4 +1,4 @@
-import { formatOrdinal, toTitleCase } from '@oldschoolgg/toolkit';
+import { formatOrdinal, toTitleCase } from '@oldschoolgg/toolkit/util';
 import { type User, UserEventType } from '@prisma/client';
 import { bold } from 'discord.js';
 import { Time, noOp } from 'e';

src/lib/bankImage.ts

@@ -1,7 +1,7 @@
 import { existsSync } from 'node:fs';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { cleanString, formatItemStackQuantity, generateHexColorForCashStack } from '@oldschoolgg/toolkit';
+import { cleanString, formatItemStackQuantity, generateHexColorForCashStack } from '@oldschoolgg/toolkit/util';
 import { AttachmentBuilder } from 'discord.js';
 import { chunk, randInt, sumArr } from 'e';
 import fetch from 'node-fetch';

src/lib/cache.ts

@@ -1,4 +1,4 @@
-import type { PerkTier } from '@oldschoolgg/toolkit';
+import type { PerkTier } from '@oldschoolgg/toolkit/util';
 import type { User } from '@prisma/client';
 
 export const perkTierCache = new Map<string, 0 | PerkTier>();

src/lib/collectionLogTask.ts

@@ -1,5 +1,5 @@
-import { formatItemStackQuantity, generateHexColorForCashStack } from '@oldschoolgg/toolkit';
-import type { CommandResponse } from '@oldschoolgg/toolkit';
+import { formatItemStackQuantity, generateHexColorForCashStack } from '@oldschoolgg/toolkit/util';
+import type { CommandResponse } from '@oldschoolgg/toolkit/util';
 import { calcWhatPercent, objectEntries } from 'e';
 import type { Bank } from 'oldschooljs';
 import { Util } from 'oldschooljs';

src/lib/colosseum.ts

@@ -1,5 +1,5 @@
-import { exponentialPercentScale, formatDuration, mentionCommand } from '@oldschoolgg/toolkit';
 import { GeneralBank, type GeneralBankType, UserError } from '@oldschoolgg/toolkit/structures';
+import { exponentialPercentScale, formatDuration, mentionCommand } from '@oldschoolgg/toolkit/util';
 import {
 	Time,
 	calcPercentOfNum,

src/lib/data/Collections.ts

@@ -1,4 +1,4 @@
-import { stringMatches } from '@oldschoolgg/toolkit';
+import { stringMatches } from '@oldschoolgg/toolkit/util';
 import { calcWhatPercent, isObject, notEmpty, removeFromArr, sumArr, uniqueArr } from 'e';
 import { Bank, ChambersOfXeric, Clues, type Item, type Monster, Monsters } from 'oldschooljs';
 import { resolveItems } from 'oldschooljs/dist/util/util';

src/lib/data/buyables/skillCapeBuyables.ts

@@ -1,4 +1,4 @@
-import { toTitleCase } from '@oldschoolgg/toolkit';
+import { toTitleCase } from '@oldschoolgg/toolkit/util';
 import { Bank } from 'oldschooljs';
 
 import Skillcapes from '../../skilling/skillcapes';

src/lib/data/itemAliases.ts

@@ -1,4 +1,4 @@
-import { replaceWhitespaceAndUppercase } from '@oldschoolgg/toolkit';
+import { replaceWhitespaceAndUppercase } from '@oldschoolgg/toolkit/util';
 import { EItem, Items, allTeamCapes, itemNameMap } from 'oldschooljs';
 import { getItemOrThrow, resolveItems } from 'oldschooljs/dist/util/util';
 import { mergeDeep, omit } from 'remeda';

src/lib/events.ts

@@ -1,4 +1,4 @@
-import { channelIsSendable, mentionCommand } from '@oldschoolgg/toolkit';
+import { channelIsSendable, mentionCommand } from '@oldschoolgg/toolkit/util';
 import type { BaseMessageOptions, Message, TextChannel } from 'discord.js';
 import { ButtonBuilder, ButtonStyle, EmbedBuilder, bold } from 'discord.js';
 import { Time, isFunction, roll } from 'e';

src/lib/finishables.ts

@@ -1,19 +1,21 @@
-import { stringMatches } from '@oldschoolgg/toolkit';
+import { stringMatches } from '@oldschoolgg/toolkit/util';
 import { notEmpty, randArrItem, roll } from 'e';
 import {
 	Bank,
 	BeginnerCasket,
+	ChambersOfXeric,
 	EasyCasket,
 	EliteCasket,
+	EliteMimicTable,
 	HardCasket,
 	MasterCasket,
+	MasterMimicTable,
 	MediumCasket,
-	Monsters
+	Monsters,
+	Nightmare,
+	resolveItems
 } from 'oldschooljs';
-import { ChambersOfXeric, Nightmare } from 'oldschooljs/dist/simulation/misc';
-import { EliteMimicTable, MasterMimicTable } from 'oldschooljs/dist/simulation/misc/Mimic';
 
-import { resolveItems } from 'oldschooljs/dist/util/util';
 import { allCollectionLogsFlat } from './data/Collections';
 import {
 	NexCL,

src/lib/geImage.ts

@@ -1,5 +1,5 @@
 import * as fs from 'node:fs/promises';
-import { formatItemStackQuantity, generateHexColorForCashStack, toTitleCase } from '@oldschoolgg/toolkit';
+import { formatItemStackQuantity, generateHexColorForCashStack, toTitleCase } from '@oldschoolgg/toolkit/util';
 import type { GEListing, GETransaction } from '@prisma/client';
 
 import type { GEListingWithTransactions } from './../mahoji/commands/ge';

src/lib/gear/functions/generateGearImage.ts

@@ -1,4 +1,4 @@
-import { toTitleCase } from '@oldschoolgg/toolkit';
+import { toTitleCase } from '@oldschoolgg/toolkit/util';
 import { EquipmentSlot } from 'oldschooljs/dist/meta/types';
 
 import { Gear, maxDefenceStats, maxOffenceStats } from '../../structures/Gear';

src/lib/grandExchange.ts

@@ -1,21 +1,20 @@
+import { getInterval } from '@oldschoolgg/toolkit/util';
 import type { GEListing, GETransaction } from '@prisma/client';
 import { GEListingType } from '@prisma/client';
 import { ButtonBuilder, ButtonStyle, bold, userMention } from 'discord.js';
 import { Time, calcPercentOfNum, clamp, noOp, sumArr, uniqueArr } from 'e';
 import { LRUCache } from 'lru-cache';
-import { Bank } from 'oldschooljs';
-import type { Item, ItemBank } from 'oldschooljs/dist/meta/types';
+import { Bank, type Item, type ItemBank } from 'oldschooljs';
 import PQueue from 'p-queue';
 
 import { ADMIN_IDS, OWNER_IDS, production } from '../config';
+import { BLACKLISTED_USERS } from './blacklists';
 import { BitField, ONE_TRILLION, PerkTier, globalConfig } from './constants';
 import { marketPricemap } from './marketPrices';
 import type { RobochimpUser } from './roboChimp';
 import { roboChimpUserFetch } from './roboChimp';
-
-import { BLACKLISTED_USERS } from './blacklists';
 import { fetchTableBank, makeTransactFromTableBankQueries } from './tableBank';
-import { assert, generateGrandExchangeID, getInterval, itemNameFromID, makeComponents, toKMB } from './util';
+import { assert, generateGrandExchangeID, itemNameFromID, makeComponents, toKMB } from './util';
 import { mahojiClientSettingsFetch, mahojiClientSettingsUpdate } from './util/clientSettings';
 import getOSItem, { getItem } from './util/getOSItem';
 import { logError } from './util/logError';

src/lib/handleNewCLItems.ts

@@ -1,4 +1,4 @@
-import { formatOrdinal, roboChimpCLRankQuery } from '@oldschoolgg/toolkit';
+import { formatOrdinal, roboChimpCLRankQuery } from '@oldschoolgg/toolkit/util';
 import type { Prisma } from '@prisma/client';
 import { UserEventType } from '@prisma/client';
 import { roll, sumArr } from 'e';

src/lib/lootTrack.ts

@@ -1,9 +1,9 @@
+import { cleanString, formatDuration } from '@oldschoolgg/toolkit/util';
 import type { LootTrack, loot_track_type } from '@prisma/client';
 import { Time } from 'e';
 import { Bank } from 'oldschooljs';
 
 import type { ItemBank } from './types';
-import { cleanString, formatDuration } from './util';
 import { makeBankImage } from './util/makeBankImage';
 
 type TrackLootOptions =

src/lib/minions/data/bankBackgrounds.ts

@@ -1,4 +1,4 @@
-import { StoreBitfield } from '@oldschoolgg/toolkit';
+import { StoreBitfield } from '@oldschoolgg/toolkit/util';
 import { Bank } from 'oldschooljs';
 
 import { BitField, PerkTier } from '../../constants';

src/lib/minions/functions/degradeableItemsCommand.ts

@@ -1,4 +1,4 @@
-import type { CommandResponse } from '@oldschoolgg/toolkit';
+import type { CommandResponse } from '@oldschoolgg/toolkit/util';
 import type { ChatInputCommandInteraction } from 'discord.js';
 import { Bank } from 'oldschooljs';
 

src/lib/minions/functions/trainCommand.ts

@@ -1,4 +1,4 @@
-import { toTitleCase } from '@oldschoolgg/toolkit';
+import { toTitleCase } from '@oldschoolgg/toolkit/util';
 import { uniqueArr } from 'e';
 import { SkillsEnum } from 'oldschooljs/dist/constants';
 

src/lib/minions/functions/unequipAllCommand.ts

@@ -1,4 +1,4 @@
-import { toTitleCase } from '@oldschoolgg/toolkit';
+import { toTitleCase } from '@oldschoolgg/toolkit/util';
 import { Bank } from 'oldschooljs';
 
 import type { GearSetupType } from '../../gear/types';

src/lib/minions/types.ts

@@ -1,4 +1,4 @@
-import type { StoreBitfield } from '@oldschoolgg/toolkit';
+import type { StoreBitfield } from '@oldschoolgg/toolkit/util';
 import type { XpGainSource } from '@prisma/client';
 import type { Bank, Item, MonsterKillOptions, SimpleMonster } from 'oldschooljs';
 

src/lib/openables.ts

@@ -1,4 +1,4 @@
-import { formatOrdinal } from '@oldschoolgg/toolkit';
+import { formatOrdinal } from '@oldschoolgg/toolkit/util';
 import {
 	Bank,
 	BrimstoneChest,

src/lib/party.ts

@@ -1,5 +1,5 @@
-import { makeComponents } from '@oldschoolgg/toolkit';
 import { UserError } from '@oldschoolgg/toolkit/structures';
+import { makeComponents } from '@oldschoolgg/toolkit/util';
 import { TimerManager } from '@sapphire/timer-manager';
 import type { TextChannel } from 'discord.js';
 import { ButtonBuilder, ButtonStyle, ComponentType, InteractionCollector } from 'discord.js';

src/lib/premiumPatronTime.ts

@@ -1,7 +1,7 @@
+import { formatDuration } from '@oldschoolgg/toolkit/util';
 import type { ChatInputCommandInteraction } from 'discord.js';
 import { Time } from 'e';
 
-import { formatDuration } from '@oldschoolgg/toolkit';
 import { handleMahojiConfirmation } from './util/handleMahojiConfirmation';
 
 export async function premiumPatronTime(

src/lib/roboChimp.ts

@@ -1,4 +1,4 @@
-import { formatOrdinal } from '@oldschoolgg/toolkit';
+import { formatOrdinal } from '@oldschoolgg/toolkit/util';
 import type { TriviaQuestion, User } from '@prisma/robochimp';
 import { calcWhatPercent, round, sumArr } from 'e';
 import deepEqual from 'fast-deep-equal';

src/lib/rolesTask.ts

@@ -1,21 +1,21 @@
 import { Stopwatch } from '@oldschoolgg/toolkit/structures';
+import type { CommandResponse } from '@oldschoolgg/toolkit/util';
+import { Prisma } from '@prisma/client';
 import { noOp, notEmpty, uniqueArr } from 'e';
+import PQueue from 'p-queue';
+import { partition } from 'remeda';
+import z from 'zod';
 
 import { SupportServer } from '../config';
 import { BadgesEnum, Roles } from '../lib/constants';
 import { getCollectionItems } from '../lib/data/Collections';
 import { Minigames } from '../lib/settings/minigames';
-
-import { Prisma } from '@prisma/client';
-import PQueue from 'p-queue';
-import { partition } from 'remeda';
-import z from 'zod';
-import { type CommandResponse, convertXPtoLVL, getUsernameSync, returnStringOrFile } from '../lib/util';
 import { ClueTiers } from './clues/clueTiers';
 import { loggedRawPrismaQuery } from './rawSql';
 import { TeamLoot } from './simulation/TeamLoot';
 import { SkillsArray } from './skilling/types';
 import type { ItemBank } from './types';
+import { convertXPtoLVL, getUsernameSync, returnStringOrFile } from './util';
 import { fetchMultipleCLLeaderboards } from './util/clLeaderboard';
 import { logError } from './util/logError';
 

src/lib/settings/settings.ts

@@ -1,5 +1,5 @@
-import type { CommandResponse } from '@oldschoolgg/toolkit';
-import type { CommandOptions } from '@oldschoolgg/toolkit';
+import type { CommandOptions } from '@oldschoolgg/toolkit/util';
+import type { CommandResponse } from '@oldschoolgg/toolkit/util';
 import type { Activity, NewUser, Prisma } from '@prisma/client';
 import type {
 	APIInteractionGuildMember,

src/lib/simulation/nex.ts

@@ -14,7 +14,7 @@ import {
 import { Bank } from 'oldschooljs';
 import { randomVariation } from 'oldschooljs/dist/util/util';
 
-import { exponentialPercentScale, formatDuration } from '@oldschoolgg/toolkit';
+import { exponentialPercentScale, formatDuration } from '@oldschoolgg/toolkit/util';
 import { resolveItems } from 'oldschooljs/dist/util/util';
 import { BitField, NEX_ID } from '../constants';
 import type { Skills } from '../types';

src/lib/simulation/toa.ts

@@ -1,5 +1,5 @@
-import { exponentialPercentScale, mentionCommand } from '@oldschoolgg/toolkit';
-import type { CommandResponse } from '@oldschoolgg/toolkit';
+import { exponentialPercentScale, mentionCommand } from '@oldschoolgg/toolkit/util';
+import type { CommandResponse } from '@oldschoolgg/toolkit/util';
 import type { Minigame } from '@prisma/client';
 import { XpGainSource } from '@prisma/client';
 import { bold } from 'discord.js';

src/lib/simulation/wintertodt.ts

@@ -1,5 +1,5 @@
-import { normal } from '@oldschoolgg/toolkit';
 import { SimpleTable } from '@oldschoolgg/toolkit/structures';
+import { normal } from '@oldschoolgg/toolkit/util';
 import { calcPercentOfNum, randInt, roll } from 'e';
 import { Bank, LootTable, convertXPtoLVL, resolveItems } from '../util';
 

src/lib/skilling/functions/calcFarmingContracts.ts

@@ -1,4 +1,4 @@
-import { stringMatches } from '@oldschoolgg/toolkit';
+import { stringMatches } from '@oldschoolgg/toolkit/util';
 import { randArrItem, randInt, roll } from 'e';
 import { Bank, LootTable } from 'oldschooljs';
 

src/lib/skilling/functions/getFarmingInfo.ts

@@ -1,4 +1,4 @@
-import { toTitleCase } from '@oldschoolgg/toolkit';
+import { toTitleCase } from '@oldschoolgg/toolkit/util';
 import type { User } from '@prisma/client';
 import { Time } from 'e';
 

src/lib/structures/OldSchoolBotClient.ts

@@ -1,4 +1,4 @@
-import type { MahojiClient } from '@oldschoolgg/toolkit';
+import type { MahojiClient } from '@oldschoolgg/toolkit/util';
 import type { User } from 'discord.js';
 import { Client } from 'discord.js';
 

src/lib/util.ts

@@ -1,4 +1,11 @@
-import { type CommandResponse, stripEmojis } from '@oldschoolgg/toolkit';
+import {
+	type CommandResponse,
+	calcPerHour,
+	formatDuration,
+	isWeekend,
+	makeComponents,
+	stringMatches
+} from '@oldschoolgg/toolkit/util';
 import type {
 	BaseMessageOptions,
 	ButtonInteraction,
@@ -42,9 +49,10 @@ import itemID from './util/itemID';
 import { makeBadgeString } from './util/makeBadgeString';
 import { itemNameFromID } from './util/smallUtils';
 
-export * from '@oldschoolgg/toolkit';
 export * from 'oldschooljs';
 
+export { stringMatches, calcPerHour, formatDuration, makeComponents, isWeekend };
+
 // @ts-ignore ignore
 BigInt.prototype.toJSON = function () {
 	return this.toString();
@@ -201,17 +209,6 @@ export function formatPohBoosts(boosts: POHBoosts) {
 	return slotStr.join(', ');
 }
 
-export function isValidNickname(str?: string) {
-	return Boolean(
-		str &&
-			typeof str === 'string' &&
-			str.length >= 2 &&
-			str.length <= 30 &&
-			['\n', '`', '@', '<', ':'].every(char => !str.includes(char)) &&
-			stripEmojis(str).length === str.length
-	);
-}
-
 export type PaginatedMessagePage = MessageEditOptions | (() => Promise<MessageEditOptions>);
 
 export async function makePaginatedMessage(channel: TextChannel, pages: PaginatedMessagePage[], target?: string) {
@@ -368,7 +365,7 @@ export function isModOrAdmin(user: MUser) {
 
 export { assert } from './util/logError';
 export * from './util/smallUtils';
-export { channelIsSendable } from '@oldschoolgg/toolkit';
+export { channelIsSendable } from '@oldschoolgg/toolkit/util';
 
 export function checkRangeGearWeapon(gear: Gear) {
 	const weapon = gear.equippedWeapon();

src/lib/util/canvasUtil.ts

@@ -1,5 +1,5 @@
 import { readFile } from 'node:fs/promises';
-import { formatItemStackQuantity, generateHexColorForCashStack } from '@oldschoolgg/toolkit';
+import { formatItemStackQuantity, generateHexColorForCashStack } from '@oldschoolgg/toolkit/util';
 import { CanvasRenderingContext2D as CanvasContext, FontLibrary, Image, Canvas as RawCanvas } from 'skia-canvas';
 
 import { assert } from '../util';

src/lib/util/chart.ts

@@ -1,4 +1,4 @@
-import { deepMerge } from '@oldschoolgg/toolkit';
+import { deepMerge } from '@oldschoolgg/toolkit/util';
 import fetch from 'node-fetch';
 
 const colors = [

src/lib/util/clLeaderboard.ts

@@ -1,4 +1,4 @@
-import { stringMatches } from '@oldschoolgg/toolkit';
+import { stringMatches } from '@oldschoolgg/toolkit/util';
 import { userEventsToMap } from './userEvents';
 
 export async function fetchMultipleCLLeaderboards(