Skip to content

Commit 2302e79

Browse files
committed
Moved Player Ranks to seperate class
1 parent 8ba5048 commit 2302e79

4 files changed

Lines changed: 44 additions & 29 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Now Thresh is ready and set up!
8686

8787
Summoner faker = Summoner.getSummonerByName("Faker", LeaguePlatform.KR);
8888
// Get Solo/Duo and Flex Rank
89-
LoLRanked ranked = LoLRanked.getLoLRanksOfSummoner(faker.getId(), LeaguePlatform.KR);
89+
PlayerRanks ranked = LoLRanked.getLoLRanksOfSummoner(faker.getId(), LeaguePlatform.KR);
9090
RankEntry soloDuo = ranked.getRankSoloDuo();
9191
int lp = soloDuo.getLeaguePoints();
9292
RankEntry flex = ranked.getRankFlex5v5();

src/main/java/net/petersil98/thresh/Thresh.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.petersil98.thresh.collection.*;
1212
import net.petersil98.thresh.model.ChampionMasteries;
1313
import net.petersil98.thresh.model.LoLRanked;
14+
import net.petersil98.thresh.model.PlayerRanks;
1415
import net.petersil98.thresh.model.match.MatchDetails;
1516
import net.petersil98.thresh.model.spectator.ActiveGame;
1617
import net.petersil98.thresh.util.LoLLoader;
@@ -39,7 +40,7 @@ public static void main(String[] args) {
3940
System.out.println(masteries.getTotalMasteryPoints());
4041
System.out.println(masteries.getTotalMasteryPointsCombined());
4142
System.out.println(masteries.getChampionMasteries());
42-
LoLRanked ranked = LoLRanked.getLoLRanksOfSummoner(me.getId(), LeaguePlatform.EUW);
43+
PlayerRanks ranked = LoLRanked.getLoLRanksOfSummoner(me.getId(), LeaguePlatform.EUW);
4344
System.out.println(ranked.getRankFlex5v5());
4445
System.out.println(ranked.getRankSoloDuo());
4546
League league = LoLRanked.getLeagueById(ranked.getRankSoloDuo().getLeagueId(), LeaguePlatform.EUW);

src/main/java/net/petersil98/thresh/model/LoLRanked.java

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,9 @@
1313
import java.util.Map;
1414

1515
public class LoLRanked {
16-
private final String summonerId;
17-
private final LeaguePlatform platform;
18-
private RankEntry rankSoloDuo, rankFlex5v5;
1916

20-
private LoLRanked(String summonerId, LeaguePlatform platform) {
21-
this.summonerId = summonerId;
22-
this.platform = platform;
23-
}
24-
25-
public static LoLRanked getLoLRanksOfSummoner(String summonerId, LeaguePlatform platform) {
26-
return new LoLRanked(summonerId, platform);
17+
public static PlayerRanks getLoLRanksOfSummoner(String summonerId, LeaguePlatform platform) {
18+
return new PlayerRanks(summonerId, platform);
2719
}
2820

2921
public static League getLeagueById(String id, LeaguePlatform platform) {
@@ -50,21 +42,4 @@ public static List<RankEntry> getRankEntries(RankedDivision division, RankedTier
5042
return LoLAPI.requestLoLLeagueEndpoint("entries/", String.format("%s/%s/%s", queue.getJsonPropertyValue(), tier.name(), division.name()),
5143
platform, TypeFactory.defaultInstance().constructCollectionType(List.class, RankEntry.class), Map.of("page", String.valueOf(pageNumber)));
5244
}
53-
private void initRanks() {
54-
if(this.rankSoloDuo == null || this.rankFlex5v5 == null) {
55-
List<RankEntry> ranks = LoLAPI.requestLoLLeagueEndpoint("entries/by-summoner/", this.summonerId, this.platform, TypeFactory.defaultInstance().constructCollectionType(List.class, RankEntry.class));
56-
this.rankSoloDuo = ranks.stream().filter(rank -> rank.getQueueType().equals(RankedQueue.SOLO_DUO)).findFirst().orElse(RankEntry.UNRANKED);
57-
this.rankFlex5v5 = ranks.stream().filter(rank -> rank.getQueueType().equals(RankedQueue.FLEX)).findFirst().orElse(RankEntry.UNRANKED);
58-
}
59-
}
60-
61-
public RankEntry getRankSoloDuo() {
62-
this.initRanks();
63-
return this.rankSoloDuo;
64-
}
65-
66-
public RankEntry getRankFlex5v5() {
67-
this.initRanks();
68-
return this.rankFlex5v5;
69-
}
7045
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package net.petersil98.thresh.model;
2+
3+
import com.fasterxml.jackson.databind.type.TypeFactory;
4+
import net.petersil98.stcommons.constants.LeaguePlatform;
5+
import net.petersil98.stcommons.constants.RankedQueue;
6+
import net.petersil98.stcommons.model.league.RankEntry;
7+
import net.petersil98.thresh.http.LoLAPI;
8+
9+
import java.util.List;
10+
11+
public class PlayerRanks {
12+
13+
private final String summonerId;
14+
private final LeaguePlatform platform;
15+
private RankEntry rankSoloDuo, rankFlex5v5;
16+
17+
public PlayerRanks(String summonerId, LeaguePlatform platform) {
18+
this.summonerId = summonerId;
19+
this.platform = platform;
20+
}
21+
22+
private void initRanks() {
23+
if(this.rankSoloDuo == null || this.rankFlex5v5 == null) {
24+
List<RankEntry> ranks = LoLAPI.requestLoLLeagueEndpoint("entries/by-summoner/", this.summonerId, this.platform, TypeFactory.defaultInstance().constructCollectionType(List.class, RankEntry.class));
25+
this.rankSoloDuo = ranks.stream().filter(rank -> rank.getQueueType().equals(RankedQueue.SOLO_DUO)).findFirst().orElse(RankEntry.UNRANKED);
26+
this.rankFlex5v5 = ranks.stream().filter(rank -> rank.getQueueType().equals(RankedQueue.FLEX)).findFirst().orElse(RankEntry.UNRANKED);
27+
}
28+
}
29+
30+
public RankEntry getRankSoloDuo() {
31+
this.initRanks();
32+
return this.rankSoloDuo;
33+
}
34+
35+
public RankEntry getRankFlex5v5() {
36+
this.initRanks();
37+
return this.rankFlex5v5;
38+
}
39+
}

0 commit comments

Comments
 (0)