SkyblockMember Rewrite

src/API/getSkyblockAuction.test.ts

@@ -2,7 +2,7 @@ import Auction from '../structures/SkyBlock/Auctions/Auction';
 import Bid from '../structures/SkyBlock/Auctions/Bid';
 import Client from '../Client';
 import ItemBytes from '../structures/ItemBytes';
-import { Rarity } from '../structures/SkyBlock/SkyblockMemberTypes';
+import { Rarity } from '../structures/SkyBlock/Member/Types';
 import { expect, expectTypeOf, test } from 'vitest';
 
 test('getSkyblockAuction (raw)', async () => {

src/API/getSkyblockAuctions.test.ts

@@ -3,7 +3,7 @@ import AuctionInfo from '../structures/SkyBlock/Auctions/AuctionInfo';
 import Bid from '../structures/SkyBlock/Auctions/Bid';
 import Client from '../Client';
 import ItemBytes from '../structures/ItemBytes';
-import { Rarity } from '../structures/SkyBlock/SkyblockMemberTypes';
+import { Rarity } from '../structures/SkyBlock/Member/Types';
 import { expect, expectTypeOf, test } from 'vitest';
 
 test('getSkyblockAuctions (raw)', async () => {
@@ -266,7 +266,7 @@ test('getSkyblockAuctions (One Page Include Item Bytes)', async () => {
   client.destroy();
 });
 
-test.skip('getSkyblockAuctions (All Pages)', async () => {
+test('getSkyblockAuctions (All Pages)', async () => {
   const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false });
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-expect-error

src/API/getSkyblockAuctionsByPlayer.test.ts

@@ -2,7 +2,7 @@ import Auction from '../structures/SkyBlock/Auctions/Auction';
 import Bid from '../structures/SkyBlock/Auctions/Bid';
 import Client from '../Client';
 import ItemBytes from '../structures/ItemBytes';
-import { Rarity } from '../structures/SkyBlock/SkyblockMemberTypes';
+import { Rarity } from '../structures/SkyBlock/Member/Types';
 import { expect, expectTypeOf, test } from 'vitest';
 
 test('getSkyblockAuctionsByPlayer (raw)', async () => {

src/API/getSkyblockGarden.test.ts

@@ -5,7 +5,7 @@ import SkyblockGarden, {
   SkyblockGardenVisitor,
   SkyblockGarenCrops
 } from '../structures/SkyBlock/SkyblockGarden';
-import { SkillLevel } from '../structures/SkyBlock/SkyblockMemberTypes';
+import { SkillLevel } from '../structures/SkyBlock/Member/Types';
 import { expect, expectTypeOf, test } from 'vitest';
 
 test('getSkyblockGarden (no input)', () => {

src/API/getSkyblockMember.ts

@@ -1,6 +1,6 @@
 import Client from '../Client';
 import Endpoint from '../Private/Endpoint';
-import SkyblockMember from '../structures/SkyBlock/SkyblockMember';
+import SkyblockMember from '../structures/SkyBlock/Member/Member';
 import { SkyblockRequestOptions } from './API';
 
 class getSkyblockMember extends Endpoint {

src/API/getSkyblockMuseum.test.ts

@@ -2,7 +2,7 @@ import Client from '../Client';
 import SkyblockInventoryItem from '../structures/SkyBlock/SkyblockInventoryItem';
 import SkyblockMuseum from '../structures/SkyBlock/SkyblockMuseum';
 import SkyblockMuseumItem from '../structures/SkyBlock/SkyblockMuseumItem';
-import SkyblockProfile from '../structures/SkyBlock/SkyblockProfile';
+import SkyblockProfile from '../structures/SkyBlock/Profile/Profile';
 import { expect, expectTypeOf, test } from 'vitest';
 
 test('getSkyblockMuseum (no input)', () => {

src/API/getSkyblockProfiles.test.ts

@@ -1,6 +1,10 @@
+import Banking from '../structures/SkyBlock/Profile/Banking';
 import Client from '../Client';
-import SkyblockMember from '../structures/SkyBlock/SkyblockMember';
-import SkyblockProfile from '../structures/SkyBlock/SkyblockProfile';
+import CommunityUpgrades from '../structures/SkyBlock/Profile/CommunityUpgrades';
+import SkyblockGarden from '../structures/SkyBlock/SkyblockGarden';
+import SkyblockMember from '../structures/SkyBlock/Member/Member';
+import SkyblockProfile from '../structures/SkyBlock/Profile/Profile';
+import { SkyblockProfileName } from '../structures/SkyBlock/Profile/Types';
 import { expect, expectTypeOf, test } from 'vitest';
 
 test('getSkyblockProfiles (raw)', async () => {
@@ -47,16 +51,20 @@ test('getSkyblockProfiles', async () => {
     expectTypeOf(profile.profileId).toEqualTypeOf<string>();
 
     expect(profile.profileName).toBeDefined();
-    expectTypeOf(profile.profileName).toEqualTypeOf<string>();
+    expectTypeOf(profile.profileName).toEqualTypeOf<SkyblockProfileName>();
 
     expect(profile.gameMode).toBeDefined();
     expectTypeOf(profile.gameMode).toEqualTypeOf<string | null>();
 
     expect(profile.banking).toBeDefined();
-    expectTypeOf(profile.banking).toEqualTypeOf<object>();
+    expectTypeOf(profile.banking).toEqualTypeOf<Banking>();
+
+    expect(profile.garden).toBeDefined();
+    expect(profile.garden).toBeNull();
+    expectTypeOf(profile.garden).toEqualTypeOf<SkyblockGarden | null>();
 
     expect(profile.communityUpgrades).toBeDefined();
-    expectTypeOf(profile.communityUpgrades).toEqualTypeOf<object>();
+    expectTypeOf(profile.communityUpgrades).toEqualTypeOf<CommunityUpgrades>();
 
     expect(profile.selected).toBeDefined();
     expectTypeOf(profile.selected).toEqualTypeOf<boolean>();
@@ -69,7 +77,7 @@ test('getSkyblockProfiles', async () => {
 
     expect(profile.toString()).toBeDefined();
     expectTypeOf(profile.toString()).toEqualTypeOf<string>();
-    expect(profile.toString()).toBe(profile.profileName);
+    expect(profile.toString()).toBe(profile.profileId);
   });
 
   client.destroy();
@@ -91,16 +99,19 @@ test('getSkyblockProfiles (garden)', async () => {
     expectTypeOf(profile.profileId).toEqualTypeOf<string>();
 
     expect(profile.profileName).toBeDefined();
-    expectTypeOf(profile.profileName).toEqualTypeOf<string>();
+    expectTypeOf(profile.profileName).toEqualTypeOf<SkyblockProfileName>();
 
     expect(profile.gameMode).toBeDefined();
     expectTypeOf(profile.gameMode).toEqualTypeOf<string | null>();
 
     expect(profile.banking).toBeDefined();
-    expectTypeOf(profile.banking).toEqualTypeOf<object>();
+    expectTypeOf(profile.banking).toEqualTypeOf<Banking>();
+
+    expect(profile.garden).toBeDefined();
+    expectTypeOf(profile.garden).toEqualTypeOf<SkyblockGarden | null>();
 
     expect(profile.communityUpgrades).toBeDefined();
-    expectTypeOf(profile.communityUpgrades).toEqualTypeOf<object>();
+    expectTypeOf(profile.communityUpgrades).toEqualTypeOf<CommunityUpgrades>();
 
     expect(profile.selected).toBeDefined();
     expectTypeOf(profile.selected).toEqualTypeOf<boolean>();
@@ -113,7 +124,7 @@ test('getSkyblockProfiles (garden)', async () => {
 
     expect(profile.toString()).toBeDefined();
     expectTypeOf(profile.toString()).toEqualTypeOf<string>();
-    expect(profile.toString()).toBe(profile.profileName);
+    expect(profile.toString()).toBe(profile.profileId);
   });
 
   client.destroy();
@@ -135,16 +146,20 @@ test('getSkyblockProfiles (museum)', async () => {
     expectTypeOf(profile.profileId).toEqualTypeOf<string>();
 
     expect(profile.profileName).toBeDefined();
-    expectTypeOf(profile.profileName).toEqualTypeOf<string>();
+    expectTypeOf(profile.profileName).toEqualTypeOf<SkyblockProfileName>();
 
     expect(profile.gameMode).toBeDefined();
     expectTypeOf(profile.gameMode).toEqualTypeOf<string | null>();
 
     expect(profile.banking).toBeDefined();
-    expectTypeOf(profile.banking).toEqualTypeOf<object>();
+    expectTypeOf(profile.banking).toEqualTypeOf<Banking>();
+
+    expect(profile.garden).toBeDefined();
+    expect(profile.garden).toBeNull();
+    expectTypeOf(profile.garden).toEqualTypeOf<SkyblockGarden | null>();
 
     expect(profile.communityUpgrades).toBeDefined();
-    expectTypeOf(profile.communityUpgrades).toEqualTypeOf<object>();
+    expectTypeOf(profile.communityUpgrades).toEqualTypeOf<CommunityUpgrades>();
 
     expect(profile.selected).toBeDefined();
     expectTypeOf(profile.selected).toEqualTypeOf<boolean>();
@@ -157,7 +172,7 @@ test('getSkyblockProfiles (museum)', async () => {
 
     expect(profile.toString()).toBeDefined();
     expectTypeOf(profile.toString()).toEqualTypeOf<string>();
-    expect(profile.toString()).toBe(profile.profileName);
+    expect(profile.toString()).toBe(profile.profileId);
   });
 
   client.destroy();

src/API/getSkyblockProfiles.ts

@@ -1,6 +1,6 @@
 import Client from '../Client';
 import Endpoint from '../Private/Endpoint';
-import SkyblockProfile from '../structures/SkyBlock/SkyblockProfile';
+import SkyblockProfile from '../structures/SkyBlock/Profile/Profile';
 import { SkyblockRequestOptions } from './API';
 
 class getSkyblockProfiles extends Endpoint {

src/index.ts

@@ -80,11 +80,11 @@ export * from './structures/SkyBlock/Bazaar/Product';
 export * from './structures/SkyBlock/News/SkyblockNews';
 export * from './structures/SkyBlock/SkyblockGarden';
 export * from './structures/SkyBlock/SkyblockInventoryItem';
-export * from './structures/SkyBlock/SkyblockMember';
+export * from './structures/SkyBlock/Member/Member';
 export * from './structures/SkyBlock/SkyblockMuseum';
 export * from './structures/SkyBlock/SkyblockMuseumItem';
 export * from './structures/SkyBlock/SkyblockPet';
-export * from './structures/SkyBlock/SkyblockProfile';
+export * from './structures/SkyBlock/Profile/Profile';
 export * from './structures/SkyBlock/Static/Bingo';
 export * from './structures/SkyBlock/Static/BingoData';
 export * from './structures/SkyBlock/Static/Candidate';

src/structures/SkyBlock/Auctions/Auction.ts

@@ -1,6 +1,6 @@
 import BaseAuction from './BaseAuction';
 import Bid from './Bid';
-import { Rarity } from '../SkyblockMemberTypes';
+import { Rarity } from '../Member/Types';
 
 class Auction extends BaseAuction {
   coop: string[];

src/structures/SkyBlock/Member/ChocolateFactory.test.ts

@@ -0,0 +1,122 @@
+import ChocolateFactory, {
+  ChocolateFactoryChocolate,
+  ChocolateFactoryEmployees,
+  ChocolateFactoryGoldenClick,
+  ChocolateFactoryTimeTower,
+  ChocolateFactoryUpgrades
+} from './ChocolateFactory';
+import { expect, expectTypeOf, test } from 'vitest';
+
+test('ChocolateFactory (Employees)', () => {
+  const data = new ChocolateFactoryEmployees({ stats: 'meow' });
+  expect(data).toBeDefined();
+  expect(data).instanceOf(ChocolateFactoryEmployees);
+  expectTypeOf(data).toEqualTypeOf<ChocolateFactoryEmployees>();
+  expect(data.bro).toBeDefined();
+  expect(data.bro).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.bro).toEqualTypeOf<number>();
+  expect(data.cousin).toBeDefined();
+  expect(data.cousin).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.cousin).toEqualTypeOf<number>();
+  expect(data.sis).toBeDefined();
+  expect(data.sis).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.sis).toEqualTypeOf<number>();
+  expect(data.father).toBeDefined();
+  expect(data.father).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.father).toEqualTypeOf<number>();
+  expect(data.grandma).toBeDefined();
+  expect(data.grandma).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.grandma).toEqualTypeOf<number>();
+  expect(data.dog).toBeDefined();
+  expect(data.dog).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.dog).toEqualTypeOf<number>();
+  expect(data.uncle).toBeDefined();
+  expect(data.uncle).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.uncle).toEqualTypeOf<number>();
+});
+
+test('ChocolateFactory (Chocolate)', () => {
+  const data = new ChocolateFactoryChocolate({ stats: 'meow' });
+  expect(data).toBeDefined();
+  expect(data).instanceOf(ChocolateFactoryChocolate);
+  expectTypeOf(data).toEqualTypeOf<ChocolateFactoryChocolate>();
+  expect(data.current).toBeDefined();
+  expect(data.current).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.current).toEqualTypeOf<number>();
+  expect(data.total).toBeDefined();
+  expect(data.total).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.total).toEqualTypeOf<number>();
+  expect(data.sincePrestige).toBeDefined();
+  expect(data.sincePrestige).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.sincePrestige).toEqualTypeOf<number>();
+});
+
+test('ChocolateFactory (TimeTower)', () => {
+  const data = new ChocolateFactoryTimeTower({ stats: 'meow' });
+  expect(data).toBeDefined();
+  expect(data).instanceOf(ChocolateFactoryTimeTower);
+  expectTypeOf(data).toEqualTypeOf<ChocolateFactoryTimeTower>();
+  expect(data.charges).toBeDefined();
+  expect(data.charges).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.charges).toEqualTypeOf<number>();
+  expect(data.level).toBeDefined();
+  expect(data.level).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.level).toEqualTypeOf<number>();
+});
+
+test('ChocolateFactory (Upgrades)', () => {
+  const data = new ChocolateFactoryUpgrades({ stats: 'meow' });
+  expect(data).toBeDefined();
+  expect(data).instanceOf(ChocolateFactoryUpgrades);
+  expectTypeOf(data).toEqualTypeOf<ChocolateFactoryUpgrades>();
+  expect(data.click).toBeDefined();
+  expect(data.click).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.click).toEqualTypeOf<number>();
+  expect(data.multiplier).toBeDefined();
+  expect(data.multiplier).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.multiplier).toEqualTypeOf<number>();
+  expect(data.rabbitRarity).toBeDefined();
+  expect(data.rabbitRarity).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.rabbitRarity).toEqualTypeOf<number>();
+});
+
+test('ChocolateFactory (GoldenClick)', () => {
+  const data = new ChocolateFactoryGoldenClick({ stats: 'meow' });
+  expect(data).toBeDefined();
+  expect(data).instanceOf(ChocolateFactoryGoldenClick);
+  expectTypeOf(data).toEqualTypeOf<ChocolateFactoryGoldenClick>();
+  expect(data.amount).toBeDefined();
+  expect(data.amount).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.amount).toEqualTypeOf<number>();
+  expect(data.year).toBeDefined();
+  expect(data.year).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.year).toEqualTypeOf<number>();
+});
+
+test('ChocolateFactory', () => {
+  const data = new ChocolateFactory({ stats: 'meow' });
+  expect(data).toBeDefined();
+  expect(data).instanceOf(ChocolateFactory);
+  expectTypeOf(data).toEqualTypeOf<ChocolateFactory>();
+  expect(data.employees).toBeDefined();
+  expect(data.employees).instanceof(ChocolateFactoryEmployees);
+  expectTypeOf(data.employees).toEqualTypeOf<ChocolateFactoryEmployees>();
+  expect(data.chocolate).toBeDefined();
+  expect(data.chocolate).instanceof(ChocolateFactoryChocolate);
+  expectTypeOf(data.chocolate).toEqualTypeOf<ChocolateFactoryChocolate>();
+  expect(data.timeTower).toBeDefined();
+  expect(data.timeTower).instanceof(ChocolateFactoryTimeTower);
+  expectTypeOf(data.timeTower).toEqualTypeOf<ChocolateFactoryTimeTower>();
+  expect(data.upgrades).toBeDefined();
+  expect(data.upgrades).instanceof(ChocolateFactoryUpgrades);
+  expectTypeOf(data.upgrades).toEqualTypeOf<ChocolateFactoryUpgrades>();
+  expect(data.goldenClick).toBeDefined();
+  expect(data.goldenClick).instanceof(ChocolateFactoryGoldenClick);
+  expectTypeOf(data.goldenClick).toEqualTypeOf<ChocolateFactoryGoldenClick>();
+  expect(data.barnCapacity).toBeDefined();
+  expect(data.barnCapacity).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.barnCapacity).toEqualTypeOf<number>();
+  expect(data.prestige).toBeDefined();
+  expect(data.prestige).toBeGreaterThanOrEqual(0);
+  expectTypeOf(data.prestige).toEqualTypeOf<number>();
+});