Skip to content

Commit 91ec7d3

Browse files
StavZStavZ
committed
Merge branch 'master' into pr/437
2 parents 273a040 + 5746336 commit 91ec7d3

File tree

15 files changed

+566
-826
lines changed

15 files changed

+566
-826
lines changed

‎.github/workflows/ci-cd-16x.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
- name: Run Tests
4646
env:
47-
HYPIXEL_KEY: ${{ env.HYPIXEL_KEY }}
47+
HYPIXEL_KEY: ${{ secrets.HYPIXEL_KEY }}
4848
run: npm test
4949

5050
build:

‎.github/workflows/ci-cd-18x.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Run Tests
4646
run: npm test
4747
env:
48-
HYPIXEL_KEY: ${{ env.HYPIXEL_KEY }}
48+
HYPIXEL_KEY: ${{ secrets.HYPIXEL_KEY }}
4949

5050
build:
5151
runs-on: ubuntu-latest

‎docs/index.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,3 @@
3636
path: getSkyblockAuctionsByPlayer.md
3737
- name: getEndedSkyblockAuctions
3838
path: getEndedSkyblockAuctions.md
39-
- name: getRankedSkyWars
40-
path: getRankedSkyWars.md

‎docs/methods/getRankedSkyWars.md‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎src/API/getPlayer.js‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ const Errors = require('../Errors');
22
const toUuid = require('../utils/toUuid');
33
const getGuild = require('./getGuild');
44
const getRecentGames = require('./getRecentGames');
5-
const getRankedSkyWars = require('./getRankedSkyWars');
6-
module.exports = async function (query, options = { guild: false, recentGames: false, currentRankedSW: false }) {
5+
module.exports = async function (query, options = { guild: false, recentGames: false }) {
76
if (!query) throw new Error(Errors.NO_NICKNAME_UUID);
87
const Player = require('../structures/Player');
98
query = await toUuid(query);
@@ -12,16 +11,12 @@ module.exports = async function (query, options = { guild: false, recentGames: f
1211
if (query && !res.player) throw new Error(Errors.PLAYER_HAS_NEVER_LOGGED);
1312
let guild = null;
1413
let recentGames = null;
15-
let rankedSW = null;
1614
if (options.guild) {
1715
guild = getGuild.call(this, 'player', query);
1816
}
1917
if (options.recentGames) {
2018
recentGames = getRecentGames.call(this, query);
2119
}
22-
if (options.currentRankedSW) {
23-
rankedSW = getRankedSkyWars.call(this, query);
24-
}
25-
[guild, recentGames, rankedSW] = await Promise.all([guild, recentGames, rankedSW]);
26-
return new Player(res.player, { guild, recentGames, rankedSW });
20+
[guild, recentGames] = await Promise.all([guild, recentGames]);
21+
return new Player(res.player, { guild, recentGames });
2722
};

‎src/API/getRankedSkyWars.js‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/API/index.js‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
module.exports = {
2-
getAPIStatus: require('./getAPIStatus'),
3-
getBoosters: require('./getBoosters'),
4-
getGameCounts: require('./getGameCounts'),
5-
getGuild: require('./getGuild'),
6-
getLeaderboards: require('./getLeaderboards'),
7-
getPlayer: require('./getPlayer'),
8-
getRankedSkyWars: require('./getRankedSkyWars'),
9-
getRecentGames: require('./getRecentGames'),
10-
getServerInfo: require('./getServerInfo'),
11-
getStatus: require('./getStatus'),
12-
getWatchdogStats: require('./getWatchdogStats'),
13-
getEndedSkyblockAuctions: require('./skyblock/getEndedSkyblockAuctions'),
14-
getSkyblockAuctions: require('./skyblock/getSkyblockAuctions'),
15-
getSkyblockAuctionsByPlayer: require('./skyblock/getSkyblockAuctionsByPlayer'),
16-
getSkyblockBazaar: require('./skyblock/getSkyblockBazaar'),
17-
getSkyblockMember: require('./skyblock/getSkyblockMember'),
18-
getSkyblockNews: require('./skyblock/getSkyblockNews'),
19-
getSkyblockProfiles: require('./skyblock/getSkyblockProfiles')
20-
};
1+
module.exports = {
2+
getAPIStatus: require('./getAPIStatus'),
3+
getBoosters: require('./getBoosters'),
4+
getGameCounts: require('./getGameCounts'),
5+
getGuild: require('./getGuild'),
6+
getLeaderboards: require('./getLeaderboards'),
7+
getPlayer: require('./getPlayer'),
8+
getRecentGames: require('./getRecentGames'),
9+
getServerInfo: require('./getServerInfo'),
10+
getStatus: require('./getStatus'),
11+
getWatchdogStats: require('./getWatchdogStats'),
12+
getEndedSkyblockAuctions: require('./skyblock/getEndedSkyblockAuctions'),
13+
getSkyblockAuctions: require('./skyblock/getSkyblockAuctions'),
14+
getSkyblockAuctionsByPlayer: require('./skyblock/getSkyblockAuctionsByPlayer'),
15+
getSkyblockBazaar: require('./skyblock/getSkyblockBazaar'),
16+
getSkyblockMember: require('./skyblock/getSkyblockMember'),
17+
getSkyblockNews: require('./skyblock/getSkyblockNews'),
18+
getSkyblockProfiles: require('./skyblock/getSkyblockProfiles')
19+
};

‎src/Client.js‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -337,23 +337,6 @@ class Client extends EventEmitter {
337337
* })
338338
* .catch(console.log)
339339
*/
340-
/**
341-
* Allows you to get Ranked SkyWars data for current season of a player
342-
* @method
343-
* @name Client#getRankedSkyWars
344-
* @param {string} query Player nickname or uuid
345-
* @param {MethodOptions} [options={}] Options
346-
* @return {Promise<SkyWarsRanked>}
347-
* @example
348-
* hypixel.getRankedSkyWars('gypu').then((ranked) => {
349-
* console.log(ranked.position); // 4
350-
* }).catch(console.log);
351-
* @example
352-
* // if player has no stats for current ranked season
353-
* hypixel.getRankedSkyWars('StavZDev').then((ranked) => {
354-
* console.log(ranked); // null
355-
* }).catch(console.log) // throws 404 error;
356-
*/
357340
/**
358341
* Delete x (by default all) cache entries
359342
* @param {?number} amount Amount of cache to delete
@@ -397,7 +380,6 @@ const defaultCache = require('./Private/defaultCache.js');
397380
* @property {boolean} [noCaching=false] Disable/Enable writing to cache
398381
* @property {boolean} [guild=false] Disable/Enable request for player's guild
399382
* @property {boolean} [recentGames=false] Disable/Enable request for player's recent game
400-
* @property {boolean} [currentRankedSW=false] Disable/Enable request for player's current ranked SkyWars rating. Previous ratings will always show mindless of this option.
401383
* @prop {object} [headers={}] Extra Headers ( like User-Agent ) to add to request. Overrides the headers globally provided.
402384
*/
403385
/**

‎src/index.js‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
1-
module.exports = {
2-
Client: require('./Client.js'),
3-
version: require('../package.json').version,
4-
5-
/* API Status */
6-
APIStatus: require('./structures/APIStatus.js'),
7-
APIIncident: require('./structures/APIIncident.js'),
8-
9-
Player: require('./structures/Player.js'),
10-
Game: require('./structures/Game.js'),
11-
Status: require('./structures/Status.js'),
12-
Color: require('./structures/Color.js'),
13-
KeyInfo: require('./structures/KeyInfo.js'),
14-
Pet: require('./structures/Pet'),
15-
Pets: require('./structures/Pets'),
16-
PlayerCosmetics: require('./structures/PlayerCosmetics'),
17-
18-
/* Watchdog */
19-
WatchdogStats: require('./structures/Watchdog/Stats.js'),
20-
21-
/* Guild */
22-
Guild: require('./structures/Guild/Guild.js'),
23-
GuildMember: require('./structures/Guild/GuildMember.js'),
24-
GuildRank: require('./structures/Guild/GuildRank.js'),
25-
26-
/* SkyBlock */
27-
SkyblockProfile: require('./structures/SkyBlock/SkyblockProfile.js'),
28-
SkyblockMember: require('./structures/SkyBlock/SkyblockMember.js'),
29-
SkyblockInventoryItem: require('./structures/SkyBlock/SkyblockInventoryItem.js'),
30-
SkyblockPet: require('./structures/SkyBlock/SkyblockPet'),
31-
32-
/* Skyblock Auctions */
33-
BaseAuction: require('./structures/SkyBlock/Auctions/BaseAuction.js'),
34-
PartialAuction: require('./structures/SkyBlock/Auctions/PartialAuction.js'),
35-
Auction: require('./structures/SkyBlock/Auctions/Auction.js'),
36-
AuctionInfo: require('./structures/SkyBlock/Auctions/AuctionInfo.js'),
37-
Bid: require('./structures/SkyBlock/Auctions/Bid.js'),
38-
39-
/* Skyblock Bazaar */
40-
Product: require('./structures/SkyBlock/Bazzar/Product.js'),
41-
Order: require('./structures/SkyBlock/Bazzar/Order.js'),
42-
43-
/** Skyblock News */
44-
SkyblockNews: require('./structures/SkyBlock/News/SkyblockNews'),
45-
46-
/* Booster */
47-
Booster: require('./structures/Boosters/Booster.js'),
48-
49-
/* MiniGames */
50-
Arcade: require('./structures/MiniGames/Arcade.js'),
51-
ArenaBrawl: require('./structures/MiniGames/ArenaBrawl.js'),
52-
BedWars: require('./structures/MiniGames/BedWars.js'),
53-
BlitzSurvivalGames: require('./structures/MiniGames/BlitzSurvivalGames.js'),
54-
BuildBattle: require('./structures/MiniGames/BuildBattle.js'),
55-
CopsAndCrims: require('./structures/MiniGames/CopsAndCrims.js'),
56-
Duels: require('./structures/MiniGames/Duels.js'),
57-
MegaWalls: require('./structures/MiniGames/MegaWalls.js'),
58-
MurderMystery: require('./structures/MiniGames/MurderMystery.js'),
59-
Paintball: require('./structures/MiniGames/Paintball.js'),
60-
Quakecraft: require('./structures/MiniGames/Quakecraft.js'),
61-
SkyWars: require('./structures/MiniGames/SkyWars.js'),
62-
SmashHeroes: require('./structures/MiniGames/SmashHeroes.js'),
63-
SpeedUHC: require('./structures/MiniGames/SpeedUHC.js'),
64-
TNTGames: require('./structures/MiniGames/TNTGames.js'),
65-
TurboKartRacers: require('./structures/MiniGames/TurboKartRacers.js'),
66-
UHC: require('./structures/MiniGames/UHC.js'),
67-
VampireZ: require('./structures/MiniGames/VampireZ.js'),
68-
Walls: require('./structures/MiniGames/Walls.js'),
69-
Warlords: require('./structures/MiniGames/Warlords.js'),
70-
71-
/* Leaderboards */
72-
Leaderboard: require('./structures/Leaderboard.js'),
73-
74-
/** Server Info */
75-
ServerInfo: require('./structures/ServerInfo'),
76-
77-
/* Errors */
78-
Errors: require('./Errors.js'),
79-
80-
/* Utils */
81-
Utils: require('./utils')
82-
};
1+
module.exports = {
2+
Client: require('./Client.js'),
3+
version: require('../package.json').version,
4+
5+
/* API Status */
6+
APIStatus: require('./structures/APIStatus.js'),
7+
APIIncident: require('./structures/APIIncident.js'),
8+
9+
Player: require('./structures/Player.js'),
10+
Game: require('./structures/Game.js'),
11+
Status: require('./structures/Status.js'),
12+
Color: require('./structures/Color.js'),
13+
Pet: require('./structures/Pet'),
14+
Pets: require('./structures/Pets'),
15+
PlayerCosmetics: require('./structures/PlayerCosmetics'),
16+
17+
/* Watchdog */
18+
WatchdogStats: require('./structures/Watchdog/Stats.js'),
19+
20+
/* Guild */
21+
Guild: require('./structures/Guild/Guild.js'),
22+
GuildMember: require('./structures/Guild/GuildMember.js'),
23+
GuildRank: require('./structures/Guild/GuildRank.js'),
24+
25+
/* SkyBlock */
26+
SkyblockProfile: require('./structures/SkyBlock/SkyblockProfile.js'),
27+
SkyblockMember: require('./structures/SkyBlock/SkyblockMember.js'),
28+
SkyblockInventoryItem: require('./structures/SkyBlock/SkyblockInventoryItem.js'),
29+
SkyblockPet: require('./structures/SkyBlock/SkyblockPet'),
30+
31+
/* Skyblock Auctions */
32+
BaseAuction: require('./structures/SkyBlock/Auctions/BaseAuction.js'),
33+
PartialAuction: require('./structures/SkyBlock/Auctions/PartialAuction.js'),
34+
Auction: require('./structures/SkyBlock/Auctions/Auction.js'),
35+
AuctionInfo: require('./structures/SkyBlock/Auctions/AuctionInfo.js'),
36+
Bid: require('./structures/SkyBlock/Auctions/Bid.js'),
37+
38+
/* Skyblock Bazaar */
39+
Product: require('./structures/SkyBlock/Bazzar/Product.js'),
40+
Order: require('./structures/SkyBlock/Bazzar/Order.js'),
41+
42+
/** Skyblock News */
43+
SkyblockNews: require('./structures/SkyBlock/News/SkyblockNews'),
44+
45+
/* Booster */
46+
Booster: require('./structures/Boosters/Booster.js'),
47+
48+
/* MiniGames */
49+
Arcade: require('./structures/MiniGames/Arcade.js'),
50+
ArenaBrawl: require('./structures/MiniGames/ArenaBrawl.js'),
51+
BedWars: require('./structures/MiniGames/BedWars.js'),
52+
BlitzSurvivalGames: require('./structures/MiniGames/BlitzSurvivalGames.js'),
53+
BuildBattle: require('./structures/MiniGames/BuildBattle.js'),
54+
CopsAndCrims: require('./structures/MiniGames/CopsAndCrims.js'),
55+
Duels: require('./structures/MiniGames/Duels.js'),
56+
MegaWalls: require('./structures/MiniGames/MegaWalls.js'),
57+
MurderMystery: require('./structures/MiniGames/MurderMystery.js'),
58+
Paintball: require('./structures/MiniGames/Paintball.js'),
59+
Quakecraft: require('./structures/MiniGames/Quakecraft.js'),
60+
SkyWars: require('./structures/MiniGames/SkyWars.js'),
61+
SmashHeroes: require('./structures/MiniGames/SmashHeroes.js'),
62+
SpeedUHC: require('./structures/MiniGames/SpeedUHC.js'),
63+
TNTGames: require('./structures/MiniGames/TNTGames.js'),
64+
TurboKartRacers: require('./structures/MiniGames/TurboKartRacers.js'),
65+
UHC: require('./structures/MiniGames/UHC.js'),
66+
VampireZ: require('./structures/MiniGames/VampireZ.js'),
67+
Walls: require('./structures/MiniGames/Walls.js'),
68+
Warlords: require('./structures/MiniGames/Warlords.js'),
69+
WoolWars: require('./structures/MiniGames/WoolWars.js'),
70+
71+
/* Leaderboards */
72+
Leaderboard: require('./structures/Leaderboard.js'),
73+
74+
/** Server Info */
75+
ServerInfo: require('./structures/ServerInfo'),
76+
77+
/* Errors */
78+
Errors: require('./Errors.js'),
79+
80+
/* Utils */
81+
Utils: require('./utils')
82+
};

‎src/structures/KeyInfo.js‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)