Adapted to changes in Core. Updated to Java Version 20. Updated readme

Author: Petersil1998

README.md

@@ -1,12 +1,12 @@
 # Thresh
 
 Thresh is an Object-Oriented Java Library, which takes over the Communication
-with the League of Legends API. It makes retrieving Summoner Data, Match History,
+with the League of Legends API. It supports In-Memory caching and uses a (blocking) Rate Limiter. It makes retrieving Summoner Data, Match History,
 etc. much easier. For Teamfight Tactics take a look at [Spatula](https://github.com/Petersil1998/Spatula)
 
 ## Usage
 
-In Order for Thresh to work properly there are a few things you need to set up/call
+In Order for Thresh to work properly there are a few things you need to set up
 at the beginning of your application.
 
 ```JAVA
@@ -16,11 +16,10 @@ public class Example {
         Settings.setAPIKey(() -> EncryptionUtil.encrypt(System.getenv("API_KEY")));
         // If the provided API Key is encrypted, we need to provide a function to decrypt the API Key
         Settings.setDecryptor(EncryptionUtil::decrypt);
-        // We also need to set a Server Configuration consisting of a platform (e.g. EUW) and a region (e.g. EUROPE).
-        // Some predefined Configurations can be found in the ServerConfig class
-        Settings.setServerConfig(ServerConfig.EUW_CONFIG);
         // We also need to provide a language. The language is used to static Data like Champions, Item, etc.
         Settings.setLanguage(Language.EN_US);
+        // If we want to use caching we can enable it in the Settings. Caching is disabled by default
+        Settings.useCache(true);
         // We also need to add the Loader for the static LoL Data
         Loader.addLoader(new LoLLoader());
         // Lastly we need to initialize the static Data
@@ -40,12 +39,12 @@ Now Thresh is ready and set up!
         public static void main(String[] args) {
             // Setup code...
 
-            Summoner faker = Summoner.getSummonerByName("Faker");
+            Summoner faker = Summoner.getSummonerByName("Faker", Platform.KR);
             int summonerLevel = faker.getSummonerLevel();
             // Get the URL for the profile Icon
             String profileIconURL = Util.getProfileIconURL(faker.getProfileIcon());
             // Get Account
-            Account account = faker.getAccount();
+            Account account = Account.getAccountByPuuid(faker.getPuuid(), Region.ASIA);
             // Get the Tag (e.g. Faker#KR1)
             String tag = account.toString();
         }
@@ -59,8 +58,8 @@ Now Thresh is ready and set up!
         public static void main(String[] args) {
             // Setup code...
 
-            Summoner faker = Summoner.getSummonerByName("Faker");
-            ChampionMasteries masteries = ChampionMasteries.getChampionMasteriesOfSummoner(faker.getId());
+            Summoner faker = Summoner.getSummonerByName("Faker", Platform.KR);
+            ChampionMasteries masteries = ChampionMasteries.getChampionMasteriesOfSummoner(faker.getId(), Platform.KR);
             // Get Mastery Score
             int masteryScore = masteries.getTotalMasteryPoints();
             // Get Mastery Points on all Champions Combined
@@ -86,24 +85,24 @@ Now Thresh is ready and set up!
         public static void main(String[] args) {
             // Setup code...
 
-            Summoner faker = Summoner.getSummonerByName("Faker");
+            Summoner faker = Summoner.getSummonerByName("Faker", Platform.KR);
             // Get Solo/Duo and Flex Rank
-            LoLRanked ranked = LoLRanked.getLoLRanksOfSummoner(faker.getId());
+            LoLRanked ranked = LoLRanked.getLoLRanksOfSummoner(faker.getId(), Platform.KR);
             RankEntry soloDuo = ranked.getRankSoloDuo();
             int lp = soloDuo.getLeaguePoints();
             RankEntry flex = ranked.getRankFlex5v5();
 
             // Get Challenger Solo Queue Players
-            League challengers = LoLRanked.getChallengerLeague(RankedQueue.SOLO_DUO);
+            League challengers = LoLRanked.getChallengerLeague(RankedQueue.SOLO_DUO, Platform.EUW);
             for(LeagueEntry leagueEntry: challengers.getEntries()) {
                 // Get all players and their LP
-                Summoner player = leagueEntry.getSummoner();
+                Summoner player = Summoner.getSummonerByID(leagueEntry.getSummonerId(), Platform.EUW)
                 int playerLp = leagueEntry.getLeaguePoints();
             }
 
             // Get a list of Gold 1 Flex Players
-            List<RankEntry> firstPage = LoLRanked.getRankEntries(RankedDivision.I, RankedTier.GOLD, RankedQueue.FLEX);
-            List<RankEntry> secondPage = LoLRanked.getRankEntries(RankedDivision.I, RankedTier.GOLD, RankedQueue.FLEX, 2);
+            List<RankEntry> firstPage = LoLRanked.getRankEntries(RankedDivision.I, RankedTier.GOLD, RankedQueue.FLEX, Platform.NA);
+            List<RankEntry> secondPage = LoLRanked.getRankEntries(RankedDivision.I, RankedTier.GOLD, RankedQueue.FLEX, Platform.NA, 2);
         }
     } 
     ```
@@ -115,14 +114,14 @@ Now Thresh is ready and set up!
         public static void main(String[] args) {
             // Setup code...
 
-            Summoner faker = Summoner.getSummonerByName("Faker");
+            Summoner faker = Summoner.getSummonerByName("Faker", Platform.NA);
             // Get Active Game of a given Summoner
-            ActiveGame game = ActiveGame.ofSummoner(faker.getId());
+            ActiveGame game = ActiveGame.ofSummoner(faker.getId(), Platform.NA);
             Map map = game.getMap();
             String gameMode = game.getGameMode();
             int duration = game.getDuration();
             // Get all Players of the blue Side Team
-            List<Participants> blueTeam = game.getBlueSideTeam();
+            List<Participant> blueTeam = game.getBlueSideTeam();
             // Get a String, that can be entered in the Windows Commandline to spectate the Game
             String cmd = game.getSpectatorCommandWindows("C:\\");
         } 
@@ -136,9 +135,9 @@ Now Thresh is ready and set up!
         public static void main(String[] args) {
             // Setup code...
 
-            Summoner faker = Summoner.getSummonerByName("Faker");
+            Summoner faker = Summoner.getSummonerByName("Faker", Platform.NA);
             // Get the Player's Match History. The Seconds Parameter is a Filter.
-            List<MatchDetails> matchHistory = MatchDetails.getMatchHistory(me, Map.of());
+            List<MatchDetails> matchHistory = MatchDetails.getMatchHistory(faker.getId(), Region.ASIA, Map.of());
             MatchDetails latestGame = matchHistory.get(0);
             int duration = latestGame.getGameDuration();
             // Get Team-based Info like bans, barons killed, turrets killed, etc.

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.petersil98'
-version '1.0'
+version '1.1'
 
 allprojects {
     repositories {

data/lol/champions.json

@@ -1 +1 @@
-{"type":"map","version":"13.12.1","data":{"11":{"MapName":"Summoner's Rift","MapId":"11","image":{"full":"map11.png","sprite":"map0.png","group":"map","x":0,"y":0,"w":48,"h":48}},"12":{"MapName":"Howling Abyss","MapId":"12","image":{"full":"map12.png","sprite":"map0.png","group":"map","x":48,"y":0,"w":48,"h":48}},"21":{"MapName":"Nexus Blitz","MapId":"21","image":{"full":"map21.png","sprite":"map0.png","group":"map","x":96,"y":0,"w":48,"h":48}},"22":{"MapName":"Teamfight Tactics","MapId":"22","image":{"full":"map22.png","sprite":"map0.png","group":"map","x":144,"y":0,"w":48,"h":48}}}}
+{"type":"map","version":"13.13.1","data":{"11":{"MapName":"Summoner's Rift","MapId":"11","image":{"full":"map11.png","sprite":"map0.png","group":"map","x":0,"y":0,"w":48,"h":48}},"12":{"MapName":"Howling Abyss","MapId":"12","image":{"full":"map12.png","sprite":"map0.png","group":"map","x":48,"y":0,"w":48,"h":48}},"21":{"MapName":"Nexus Blitz","MapId":"21","image":{"full":"map21.png","sprite":"map0.png","group":"map","x":96,"y":0,"w":48,"h":48}},"22":{"MapName":"Teamfight Tactics","MapId":"22","image":{"full":"map22.png","sprite":"map0.png","group":"map","x":144,"y":0,"w":48,"h":48}}}}

data/lol/items.json

@@ -1 +1 @@
-{"ddragonVersion":"13.12.1","language":"en_US"}
+{"ddragonVersion":"13.13.1","language":"en_US"}

data/lol/maps.json

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

data/settings.json

@@ -1,12 +1,9 @@
 package net.petersil98.thresh;
 
-import net.petersil98.core.constant.RankedDivision;
-import net.petersil98.core.constant.RankedQueue;
-import net.petersil98.core.constant.RankedTier;
+import net.petersil98.core.constant.*;
 import net.petersil98.core.util.EncryptionUtil;
 import net.petersil98.core.util.Loader;
 import net.petersil98.core.util.settings.Language;
-import net.petersil98.core.util.settings.ServerConfig;
 import net.petersil98.core.util.settings.Settings;
 import net.petersil98.stcommons.model.Summoner;
 import net.petersil98.stcommons.model.league.League;
@@ -31,29 +28,26 @@ public class Thresh {
     public static void main(String[] args) {
         Settings.setAPIKey(() -> EncryptionUtil.encrypt(System.getenv("API_KEY")));
         Settings.setDecryptor(EncryptionUtil::decrypt);
-        Settings.setServerConfig(ServerConfig.EUW_CONFIG);
         Settings.setLanguage(Language.EN_US);
+        Settings.useCache(true);
         Loader.addLoader(new LoLLoader());
         Loader.init();
-        Summoner me = Summoner.getSummonerByName("Petersil98");
-        List<MatchDetails> matchHistory = MatchDetails.getMatchHistory(me, Map.of());
+        Summoner me = Summoner.getSummonerByName("Petersil98", Platform.EUW);
+        List<MatchDetails> matchHistory = MatchDetails.getMatchHistory(me.getPuuid(), Region.EUROPE, Map.of());
         matchHistory.stream().map(MatchDetails::getQueueType).forEach(System.out::println);
-        System.out.println(me.getPuuid());
-        ChampionMasteries masteries = ChampionMasteries.getChampionMasteriesOfSummoner(me.getId());
+        ChampionMasteries masteries = ChampionMasteries.getChampionMasteriesOfSummoner(me.getId(), Platform.EUW);
         System.out.println(masteries.getTotalMasteryPoints());
         System.out.println(masteries.getTotalMasteryPointsCombined());
         System.out.println(masteries.getChampionMasteries());
-        LoLRanked ranked = LoLRanked.getLoLRanksOfSummoner(me.getId());
+        LoLRanked ranked = LoLRanked.getLoLRanksOfSummoner(me.getId(), Platform.EUW);
         System.out.println(ranked.getRankFlex5v5());
         System.out.println(ranked.getRankSoloDuo());
-        System.out.println(me.getAccount());
-        System.out.println(me);
-        League league = LoLRanked.getLeagueById(ranked.getRankSoloDuo().getLeagueId());
-        League challengers = LoLRanked.getChallengerLeague(RankedQueue.FLEX);
-        List<RankEntry> leagueEntries = LoLRanked.getRankEntries(RankedDivision.I, RankedTier.BRONZE, RankedQueue.FLEX, 2);
-        MatchDetails details = MatchDetails.getMatchDetails("EUW1_987654321");
+        League league = LoLRanked.getLeagueById(ranked.getRankSoloDuo().getLeagueId(), Platform.EUW);
+        League challengers = LoLRanked.getChallengerLeague(RankedQueue.SOLO_DUO, Platform.EUW);
+        List<RankEntry> leagueEntries = LoLRanked.getRankEntries(RankedDivision.I, RankedTier.BRONZE, RankedQueue.FLEX, Platform.EUW);
+        MatchDetails details = MatchDetails.getMatchDetails("EUW1_987654321", Region.EUROPE);
         System.out.println(Util.getChallengeIconURL(Challenges.getChallenges().stream().filter(challenge -> !challenge.getLevelToIconPath().isEmpty()).findAny().get(), RankedTier.BRONZE));
-        ActiveGame game = ActiveGame.ofSummoner(Summoner.getSummonerByName("madlife"));
+        ActiveGame game = ActiveGame.ofSummoner(Summoner.getSummonerByName("katikaze", Platform.EUW).getId(), Platform.EUW);
         System.out.println(game.getSpectatorCommandWindows("C:\\"));
         System.out.println(Util.getProfileIconURL(me.getProfileIcon()));
         System.out.println(Util.getChampionIconURL(Champions.getChampionByName("Thresh")));

gradle/wrapper/gradle-wrapper.properties

@@ -2,7 +2,8 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-import net.petersil98.core.http.RiotAPIRequest;
+import net.petersil98.core.constant.Platform;
+import net.petersil98.core.http.RiotAPI;
 import net.petersil98.thresh.data.champion.Champion;
 
 import java.util.List;
@@ -11,27 +12,29 @@
 public class ChampionMasteries {
 
     private final String summonerId;
+    private final Platform platform;
     private List<Mastery> masteries;
     private int totalMasteryPoints = -1;
 
-    private ChampionMasteries(String summonerId) {
+    private ChampionMasteries(String summonerId, Platform platform) {
         this.summonerId = summonerId;
+        this.platform = platform;
     }
 
-    public static ChampionMasteries getChampionMasteriesOfSummoner(String summonerId) {
-        return new ChampionMasteries(summonerId);
+    public static ChampionMasteries getChampionMasteriesOfSummoner(String summonerId, Platform platform) {
+        return new ChampionMasteries(summonerId, platform);
     }
 
     public int getTotalMasteryPoints() {
         if(this.totalMasteryPoints == -1) {
-            this.totalMasteryPoints = RiotAPIRequest.requestLoLChampionMasteryEndpoint("scores/by-summoner/" + this.summonerId, Integer.class);
+            this.totalMasteryPoints = RiotAPI.requestLoLChampionMasteryEndpoint("scores/by-summoner/", this.summonerId, this.platform, Integer.class);
         }
         return this.totalMasteryPoints;
     }
 
     public List<Mastery> getChampionMasteries() {
         if(this.masteries == null) {
-            this.masteries = RiotAPIRequest.requestLoLChampionMasteryEndpoint("champion-masteries/by-summoner/" + this.summonerId, TypeFactory.defaultInstance().constructCollectionType(List.class, Mastery.class));
+            this.masteries = RiotAPI.requestLoLChampionMasteryEndpoint("champion-masteries/by-summoner/", this.summonerId, this.platform, TypeFactory.defaultInstance().constructCollectionType(List.class, Mastery.class));
         }
         return this.masteries;
     }

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

@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import net.petersil98.core.constant.Platform;
-import net.petersil98.stcommons.model.Summoner;
 import net.petersil98.thresh.collection.*;
 import net.petersil98.thresh.data.champion.Champion;
 import net.petersil98.thresh.data.rune.BaseRune;
@@ -53,7 +52,7 @@ public Participant deserialize(JsonParser jp, DeserializationContext ctxt) throw
                 if (rune == null) rune = RuneStats.getRuneStat(node.asInt());
                 runes.add(rune);
             }
-            return new Participant(Summoner.getSummonerByID(root.get("summonerId").asText()), root.get("bot").asBoolean(),
+            return new Participant(root.get("summonerId").asText(), root.get("bot").asBoolean(),
                     Champions.getChampion(root.get("championId").asInt()), root.get("teamId").asInt(),
                     SummonerSpells.getSummonerSpell(root.get("spell1Id").asInt()), SummonerSpells.getSummonerSpell(root.get("spell2Id").asInt()),
                     runes, RuneStyles.getRuneStyle(perks.get("perkStyle").asInt()), RuneStyles.getRuneStyle(perks.get("perkSubStyle").asInt()));
@@ -80,8 +79,9 @@ public ActiveGame deserialize(JsonParser jp, DeserializationContext ctxt) throws
                     root.get("gameType").asText(), QueueTypes.getQueueType(root.get("gameQueueConfigId").asInt()),
                     participants.stream().filter(participant -> participant.getTeamId() == 100).toList(),
                     participants.stream().filter(participant -> participant.getTeamId() == 200).toList(),
-                    participants.size() / 2, bans, root.get("observers").get("encryptionKey").asText(), root.get("platformId").asText(),
-                    root.get("gameStartTime").asInt(), root.get("gameLength").asInt());
+                    participants.size() / 2, bans, root.get("observers").get("encryptionKey").asText(),
+                    Platform.getPlatform(root.get("platformId").asText()), root.get("gameStartTime").asInt(),
+                    root.get("gameLength").asInt());
         }
     }