hypixel-api-reborn 11.2.1 → 11.3.0

package/src/structures/Player.js

@@ -219,28 +219,28 @@ class Player {
      */
     this.stats = data.stats
       ? {
-          skywars: data.stats.SkyWars ? new SkyWars(data.stats.SkyWars) : null,
+          arcade: data.stats.Arcade ? new Arcade({ ...data.stats.Arcade, ...data.achievements }) : null,
+          arena: data.stats.Arena ? new ArenaBrawl(data.stats.Arena) : null,
           bedwars: data.stats.Bedwars ? new BedWars(data.stats.Bedwars) : null,
-          uhc: data.stats.UHC ? new UHC(data.stats.UHC) : null,
-          speeduhc: data.stats.SpeedUHC ? new SpeedUHC(data.stats.SpeedUHC) : null,
-          murdermystery: data.stats.MurderMystery ? new MurderMystery(data.stats.MurderMystery) : null,
-          duels: data.stats.Duels ? new Duels(data.stats.Duels) : null,
+          blitzsg: data.stats.HungerGames ? new BlitzSurvivalGames(data.stats.HungerGames) : null,
           buildbattle: data.stats.BuildBattle ? new BuildBattle(data.stats.BuildBattle) : null,
-          megawalls: data.stats.Walls3 ? new MegaWalls(data.stats.Walls3) : null,
           copsandcrims: data.stats.MCGO ? new CopsAndCrims(data.stats.MCGO) : null,
-          tntgames: data.stats.TNTGames ? new TNTGames(data.stats.TNTGames) : null,
-          smashheroes: data.stats.SuperSmash ? new SmashHeroes(data.stats.SuperSmash) : null,
-          vampirez: data.stats.VampireZ ? new VampireZ(data.stats.VampireZ) : null,
-          blitzsg: data.stats.HungerGames ? new BlitzSurvivalGames(data.stats.HungerGames) : null,
-          arena: data.stats.Arena ? new ArenaBrawl(data.stats.Arena) : null,
-          arcade: data.stats.Arcade ? new Arcade({ ...data.stats.Arcade, ...data.achievements }) : null,
+          duels: data.stats.Duels ? new Duels(data.stats.Duels) : null,
+          megawalls: data.stats.Walls3 ? new MegaWalls(data.stats.Walls3) : null,
+          murdermystery: data.stats.MurderMystery ? new MurderMystery(data.stats.MurderMystery) : null,
           paintball: data.stats.Paintball ? new Paintball(data.stats.Paintball) : null,
+          pit: data.stats.Pit ? new Pit(data.stats.Pit) : null,
           quakecraft: data.stats.Quake ? new Quakecraft(data.stats.Quake) : null,
+          skywars: data.stats.SkyWars ? new SkyWars(data.stats.SkyWars) : null,
+          smashheroes: data.stats.SuperSmash ? new SmashHeroes(data.stats.SuperSmash) : null,
+          speeduhc: data.stats.SpeedUHC ? new SpeedUHC(data.stats.SpeedUHC) : null,
+          tntgames: data.stats.TNTGames ? new TNTGames(data.stats.TNTGames) : null,
           turbokartracers: data.stats.GingerBread ? new TurboKartRacers(data.stats.GingerBread) : null,
+          uhc: data.stats.UHC ? new UHC(data.stats.UHC) : null,
+          vampirez: data.stats.VampireZ ? new VampireZ(data.stats.VampireZ) : null,
           walls: data.stats.Walls ? new Walls(data.stats.Walls) : null,
           warlords: data.stats.Battleground ? new Warlords(data.stats.Battleground) : null,
-          woolwars: data.stats.WoolGames ? new WoolWars(data.stats.WoolGames) : null,
-          pit: data.stats.Pit ? new Pit(data.stats.Pit) : null
+          woolwars: data.stats.WoolGames ? new WoolWars(data.stats.WoolGames) : null
         }
       : null;
     /**
@@ -302,21 +302,27 @@ class Player {
  * Player stats for each mini-game. `null` if player has no stats.
  * <br>
  * Usage: `<Player>.stats.skywars`
- * @property {SkyWars|null} skywars SkyWars
+ * @property {Arcade|null} arcade Arcade
+ * @property {ArenaBrawl|null} arena Arena Brawl
  * @property {BedWars|null} bedwars BedWars
- * @property {UHC|null} uhc UHC
- * @property {SpeedUHC|null} speedUHC Speed UHC
- * @property {MurderMystery|null} murdermystery Murder Mystery
- * @property {Duels|null} duels Duels
+ * @property {BlitzSurvivalGames|null} blitzsg Blitz Survival Games
  * @property {BuildBattle|null} buildbattle BuildBattle
- * @property {MegaWalls|null} megawalls MegaWalls
  * @property {CopsAndCrims|null} copsandcrims Cops and Crims
- * @property {TNTGames|null} tntgames The TNT Games
+ * @property {Duels|null} duels Duels
+ * @property {MegaWalls|null} megawalls MegaWalls
+ * @property {MurderMystery|null} murdermystery Murder Mystery
+ * @property {Paintball|null} paintball Paint Ball
+ * @property {Pit|null} pit Pit
+ * @property {Quakecraft|null} quakecraft Quake Craft
+ * @property {SkyWars|null} skywars SkyWars
  * @property {SmashHeroes|null} smashheroes Smash Heroes
+ * @property {SpeedUHC|null} speedUHC Speed UHC
+ * @property {TNTGames|null} tntgames The TNT Games
+ * @property {TurboKartRacers|null} turbokartracers Turbo Kart Racers
+ * @property {UHC|null} uhc UHC
  * @property {VampireZ|null} vampirez VampireZ
- * @property {BlitzSurvivalGames|null} blitzsg Blitz Survival Games
- * @property {ArenaBrawl|null} arena Arena Brawl
- * @property {Arcade|null} arcade Arcade
+ * @property {Walls|null} walls Walls
+ * @property {Warlords|null} warlords Warlords
  * @property {WoolWars|null} woolwars Wool Wars
  */
 /**

package/src/structures/SkyBlock/SkyblockGarden.js

@@ -0,0 +1,146 @@
+const { getLevelByXp } = require('../../utils/SkyblockUtils');
+
+/**
+ * Skyblock Garden class
+ */
+class SkyblockGarden {
+  /**
+   * @param {object} data Skyblock member data
+   */
+  constructor(data) {
+    /**
+     * level
+     * @type {SkyblockSkillLevel}
+     */
+    this.level = getLevelByXp(data?.garden?.garden_experience || 0, 'garden');
+    /**
+     * Current Barn Skin
+     * @type {string}
+     */
+    this.barnSkin = data.garden?.selected_barn_skin || '';
+    /**
+     * Unlocked Plots
+     * @type {string[]}
+     */
+    this.unlockedPlots = data.garden?.unlocked_plots_ids || [];
+    /**
+     * Visitor Stats
+     * @type {SkyblockGardenVisitor}
+     */
+    this.visitors = {
+      visited: data.garden?.commission_data?.visits || {},
+      completed: data.garden?.commission_data?.completed || {},
+      served: {
+        total: data.garden?.commission_data?.total_completed || 0,
+        unique: data.garden?.commission_data?.unique_npcs_served || 0
+      }
+    };
+    /**
+     * Crop Milestones
+     * @type {SkyblockGarenCropMilestones}
+     */
+    this.cropMilestones = {
+      wheat: getLevelByXp(data.garden?.resources_collected?.WHEAT || 0, 'wheat'),
+      carrot: getLevelByXp(data.garden?.resources_collected?.CARROT_ITEM || 0, 'carrot'),
+      sugarCane: getLevelByXp(data.garden?.resources_collected?.SUGAR_CANE || 0, 'sugarCane'),
+      potato: getLevelByXp(data.garden?.resources_collected?.POTATO_ITEM || 0, 'potato'),
+      pumpkin: getLevelByXp(data.garden?.resources_collected?.PUMPKIN || 0, 'pumpkin'),
+      melon: getLevelByXp(data.garden?.resources_collected?.MELON || 0, 'melon'),
+      cactus: getLevelByXp(data.garden?.resources_collected?.CACTUS || 0, 'cactus'),
+      cocoBeans: getLevelByXp(data.garden?.resources_collected?.['INK_SACK:3'] || 0, 'cocoBeans'),
+      mushroom: getLevelByXp(data.garden?.resources_collected?.MUSHROOM_COLLECTION || 0, 'mushroom'),
+      netherWart: getLevelByXp(data.garden?.resources_collected?.NETHER_STALK || 0, 'netherWart')
+    };
+    /**
+     * Composter
+     * @type {SkyblockGardenComposter}
+     */
+    this.composter = {
+      organicMatter: data.garden?.composter_data?.organic_matter || 0,
+      fuelUnits: data.garden?.composter_data?.fuel_units || 0,
+      compostUnits: data.garden?.composter_data?.compost_units || 0,
+      compostItems: data.garden?.composter_data?.compost_items || 0,
+      conversionTicks: data.garden?.composter_data?.conversion_ticks || 0,
+      upgrades: {
+        speed: data.garden?.composter_data?.upgrades?.speed || 0,
+        multiDrop: data.garden?.composter_data?.upgrades?.multi_drop || 0,
+        fuelCap: data.garden?.composter_data?.upgrades?.fuel_cap || 0,
+        organicMatterCap: data.garden?.composter_data?.upgrades?.organic_matter_cap || 0,
+        costReduction: data.garden?.composter_data?.upgrades?.cost_reduction || 0
+      }
+    };
+    /**
+     * Crop Upgrades
+     * @type {SkyblockGarenCrops}
+     */
+    this.cropUpgrades = {
+      wheat: data.garden?.crop_upgrade_levels?.WHEAT || 0,
+      carrot: data.garden?.crop_upgrade_levels?.CARROT_ITEM || 0,
+      sugarCane: data.garden?.crop_upgrade_levels?.SUGAR_CANE || 0,
+      potato: data.garden?.crop_upgrade_levels?.POTATO_ITEM || 0,
+      pumpkin: data.garden?.crop_upgrade_levels?.PUMPKIN || 0,
+      melon: data.garden?.crop_upgrade_levels?.MELON || 0,
+      cactus: data.garden?.crop_upgrade_levels?.CACTUS || 0,
+      cocoBeans: data.garden?.crop_upgrade_levels?.['INK_SACK:3'] || 0,
+      mushroom: data.garden?.crop_upgrade_levels?.MUSHROOM_COLLECTION || 0,
+      netherWart: data.garden?.crop_upgrade_levels?.NETHER_STALK || 0
+    };
+  }
+}
+
+/**
+ * @typedef {object} SkyblockGardenVisitor
+ * @property {Record<string, number>} visited Visited
+ * @property {Record<string, number>} completed Completed
+ * @property {SkyblockGardenVisitorServed} served served
+ */
+/**
+ * @typedef {object} SkyblockGardenVisitorServed
+ * @property {number} total total
+ * @property {number} unique unique
+ */
+/**
+ * @typedef {object} SkyblockGardenComposter
+ * @property {number} organicMatter Organic Matter
+ * @property {number} fuelUnits Fuel Units
+ * @property {number} compostUnits Compost Units
+ * @property {number} compostItems Compost Items
+ * @property {number} conversionTicks Conversion Ticks
+ * @property {SkyblockGardenComposterUpgrades} upgrades upgrades
+ */
+/**
+ * @typedef {object} SkyblockGardenComposterUpgrades
+ * @property {number} speed Speed
+ * @property {number} multiDrop Multi Drop
+ * @property {number} fuelCap Fuel Cap
+ * @property {number} organicMatterCap Organic Matter Cap
+ * @property {number} costReduction Cost Reduction
+ */
+/**
+ * @typedef {object} SkyblockGarenCrops
+ * @property {number} wheat Wheat
+ * @property {number} carrot Carrot
+ * @property {number} sugarCane Sugar Cane
+ * @property {number} potato Potato
+ * @property {number} pumpkin Pumpkin
+ * @property {number} melon Melon
+ * @property {number} cactus Cactus
+ * @property {number} cocoBeans Coco Beans
+ * @property {number} mushroom Mushroom
+ * @property {number} netherWart Nether Wart
+ */
+/**
+ * @typedef {object} SkyblockGarenCropMilestones
+ * @property {SkyblockSkillLevel} wheat Wheat
+ * @property {SkyblockSkillLevel} carrot Carrot
+ * @property {SkyblockSkillLevel} sugarCane Sugar Cane
+ * @property {SkyblockSkillLevel} potato Potato
+ * @property {SkyblockSkillLevel} pumpkin Pumpkin
+ * @property {SkyblockSkillLevel} melon Melon
+ * @property {SkyblockSkillLevel} cactus Cactus
+ * @property {SkyblockSkillLevel} cocoBeans Coco Beans
+ * @property {SkyblockSkillLevel} mushroom Mushroom
+ * @property {SkyblockSkillLevel} netherWart Nether Wart
+ */
+
+module.exports = SkyblockGarden;

package/src/structures/SkyBlock/SkyblockMember.js

@@ -12,6 +12,8 @@ const {
   getPetLevel
 } = require('../../utils/SkyblockUtils');
 const SkyblockInventoryItem = require('./SkyblockInventoryItem');
+const SkyblockMuseum = require('./SkyblockMuseum');
+const SkyblockGarden = require('./SkyblockGarden');
 const Constants = require('../../utils/Constants');
 const skyhelper = require('skyhelper-networth');
 const SkyblockPet = require('./SkyblockPet');
@@ -38,9 +40,14 @@ class SkyblockMember {
     this.player = data.m.player || null;
     /**
      * If `getMuseum` option is `true`.
-     * @type {object|null}
+     * @type {SkyblockMuseum|null}
      */
-    this.museum = data.museum ?? null;
+    this.museum = data.museum || null;
+    /**
+     * If `getGarden` option is `true`.
+     * @type {SkyblockGarden|null}
+     */
+    this.garden = data.garden || null;
     /**
      * Profile's gamemode
      * @type {string|null}
@@ -85,12 +92,12 @@ class SkyblockMember {
      * Heart of the Mountain - MiningSkill
      * @type {number}
      */
-    this.hotm = getLevelByXp(data.m.mining_core?.experience, 'hotm', 7);
+    this.hotm = getLevelByXp(data.m.mining_core?.experience, 'hotm');
     /**
      * Trophy fish amount of rewards
      * @type {number}
      */
-    this.trophyFish = getTrophyFishRank(data.m.trophy_fish?.rewards.length ?? 0);
+    this.trophyFish = getTrophyFishRank(data.m.trophy_fish?.rewards?.length ?? 0);
     /**
      * The highest magical power **Not current one**
      * @type {number}
@@ -307,7 +314,7 @@ class SkyblockMember {
      */
     this.getNetworth = async () => {
       try {
-        const nw = await skyhelper.getNetworth(data.m, data.banking.balance ?? 0, {
+        const nw = await skyhelper.getNetworth(data.m, data.banking?.balance ?? 0, {
           onlyNetworth: true,
           v2Endpoint: true,
           cache: true,