Skip to content

Commit e42f978

Browse files
Petersil1998Petersil1998
committed
Added CDragon constant
1 parent bb2e1dd commit e42f978

5 files changed

Lines changed: 55 additions & 43 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import net.petersil98.thresh.model.match.MatchDetails;
1515
import net.petersil98.thresh.model.spectator.ActiveGame;
1616
import net.petersil98.thresh.util.LoLLoader;
17-
import net.petersil98.thresh.util.Util;
1817
import org.apache.logging.log4j.LogManager;
1918
import org.apache.logging.log4j.Logger;
2019

@@ -48,6 +47,5 @@ public static void main(String[] args) {
4847
MatchDetails details = MatchDetails.getMatchDetails("EUW1_987654321", LeagueRegion.EUROPE);
4948
ActiveGame game = ActiveGame.ofSummoner(Summoner.getSummonerByName("prinzessin", LeaguePlatform.EUW).getId(), LeaguePlatform.EUW);
5049
System.out.println(game.getSpectatorCommandWindows("C:\\"));
51-
System.out.println(Util.getProfileIconURL(me.getProfileIcon()));
5250
}
5351
}

‎src/main/java/net/petersil98/thresh/constants/LoLConstants.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.petersil98.thresh.constants;
22

33
public class LoLConstants {
4-
public static final String STATIC_DATA_BASE_PATH = "http://static.developer.riotgames.com/docs/lol/";
54
public static final String SPECTATOR_URL = "spectator.{platform}.lol.riotgames.com:80";
65
}

‎src/main/java/net/petersil98/thresh/model/Deserializers.java‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ public RuneStyle deserialize(JsonParser jp, DeserializationContext ctxt) throws
548548
JsonNode root = jp.getCodec().readTree(jp);
549549

550550
return new RuneStyle(root.get("id").asInt(), root.get("name").asText(),
551-
String.format("%scdn/img/%s", STConstants.DDRAGON_BASE_PATH, root.get("icon").asText()), root.get("key").asText());
551+
String.format("%s/cdn/img/%s", STConstants.DDRAGON_BASE_PATH, root.get("icon").asText()), root.get("key").asText());
552552
}
553553
}
554554

@@ -559,7 +559,7 @@ public RuneStat deserialize(JsonParser jp, DeserializationContext ctxt) throws I
559559
JsonNode root = jp.getCodec().readTree(jp);
560560

561561
return new RuneStat(root.get("id").asInt(), root.get("name").asText(),
562-
String.format("%scdn/img/%s", STConstants.DDRAGON_BASE_PATH, root.get("iconPath").asText()),
562+
String.format("%s/cdn/img/%s", STConstants.DDRAGON_BASE_PATH, root.get("iconPath").asText()),
563563
root.get("shortDesc").asText(), root.get("longDesc").asText());
564564
}
565565
}
@@ -572,7 +572,7 @@ public net.petersil98.thresh.data.Map deserialize(JsonParser jp, Deserialization
572572

573573
Sprite sprite = deserializeSprite(root.get("image"));
574574
return new net.petersil98.thresh.data.Map(root.get("MapId").asInt(), root.get("MapName").asText(),
575-
String.format("%scdn/%s/img/%s/%s", STConstants.DDRAGON_BASE_PATH, STConstants.DDRAGON_VERSION,
575+
String.format("%s/cdn/%s/img/%s/%s", STConstants.DDRAGON_BASE_PATH, STConstants.DDRAGON_VERSION,
576576
sprite.getGroup(), root.get("image").get("full").asText()), sprite);
577577
}
578578
}
@@ -606,12 +606,15 @@ public Skin deserialize(JsonParser jp, DeserializationContext ctxt) throws IOExc
606606
.toList();
607607

608608
return new Skin(root.get("id").asInt(), root.get("isBase").asBoolean(), root.get("name").asText(),
609-
"https://raw.communitydragon.org/latest/plugins/rcp-be-lol-game-data/global/default/" +
610-
root.get("uncenteredSplashPath").asText().replace("/lol-game-data/assets/", ""),
611-
"https://raw.communitydragon.org/latest/plugins/rcp-be-lol-game-data/global/default/" +
612-
root.get("tilePath").asText().replace("/lol-game-data/assets/", ""),
613-
"https://raw.communitydragon.org/latest/plugins/rcp-be-lol-game-data/global/default/" +
614-
root.get("loadScreenPath").asText().replace("/lol-game-data/assets/", ""),
609+
String.format("%s/latest/plugins/rcp-be-lol-game-data/global/default/%s",
610+
STConstants.CDRAGON_BASE_PATH,
611+
root.get("uncenteredSplashPath").asText().replace("/lol-game-data/assets/", "")),
612+
String.format("%s/latest/plugins/rcp-be-lol-game-data/global/default/%s",
613+
STConstants.CDRAGON_BASE_PATH,
614+
root.get("tilePath").asText().replace("/lol-game-data/assets/", "")),
615+
String.format("%s/latest/plugins/rcp-be-lol-game-data/global/default/%s",
616+
STConstants.CDRAGON_BASE_PATH,
617+
root.get("loadScreenPath").asText().replace("/lol-game-data/assets/", "")),
615618
MAPPER.readerFor(Rarity.class).readValue(root.get("rarity")),
616619
root.get("isLegacy").asBoolean(), root.has("chromas") ?
617620
MAPPER.readerForListOf(Chroma.class).readValue(root.get("chromas")) : null,
@@ -630,8 +633,9 @@ public Chroma deserialize(JsonParser jp, DeserializationContext ctxt) throws IOE
630633
.map(s -> new Color(Integer.parseInt(s.substring(1), 16)))
631634
.toList();
632635
return new Chroma(root.get("id").asInt(), root.get("name").asText(null),
633-
"https://raw.communitydragon.org/latest/plugins/rcp-be-lol-game-data/global/default/" +
634-
root.get("chromaPath").asText().replace("/lol-game-data/assets/", ""), colors);
636+
String.format("%s/latest/plugins/rcp-be-lol-game-data/global/default/%s",
637+
STConstants.CDRAGON_BASE_PATH,
638+
root.get("chromaPath").asText().replace("/lol-game-data/assets/", "")), colors);
635639
}
636640
}
637641

@@ -659,7 +663,7 @@ public Item deserialize(JsonParser jp, DeserializationContext ctxt) throws IOExc
659663
MAPPER.readerForMapOf(Float.class).readValue(root.get("stats")),
660664
MAPPER.readerForListOf(String.class).readValue(root.get("tags")),
661665
maps.entrySet().stream().filter(java.util.Map.Entry::getValue).map(Map.Entry::getKey).collect(Collectors.toList()),
662-
sprite, String.format("%scdn/%s/img/%s/%s", STConstants.DDRAGON_BASE_PATH, STConstants.DDRAGON_VERSION,
666+
sprite, String.format("%s/cdn/%s/img/%s/%s", STConstants.DDRAGON_BASE_PATH, STConstants.DDRAGON_VERSION,
663667
sprite.getGroup(), root.get("image").get("full").asText()),
664668
root.has("effect") ? MAPPER.readerForMapOf(String.class).readValue(root.get("effect")) : java.util.Map.of());
665669
}
@@ -676,7 +680,7 @@ public SummonerSpell deserialize(JsonParser jp, DeserializationContext ctxt) thr
676680
return new SummonerSpell(root.get("key").asInt(), root.get("name").asText(), root.get("description").asText(),
677681
root.get("cooldown").get(0).asInt(), root.get("summonerLevel").asInt(), root.get("range").get(0).asInt(),
678682
MAPPER.readerForListOf(String.class).readValue(root.get("modes")), sprite,
679-
String.format("%scdn/%s/img/%s/%s", STConstants.DDRAGON_BASE_PATH, STConstants.DDRAGON_VERSION,
683+
String.format("%s/cdn/%s/img/%s/%s", STConstants.DDRAGON_BASE_PATH, STConstants.DDRAGON_VERSION,
680684
sprite.getGroup(), root.get("image").get("full").asText()));
681685
}
682686
}
@@ -694,8 +698,8 @@ public ArenaAugment deserialize(JsonParser jp, DeserializationContext ctxt) thro
694698

695699
return new ArenaAugment(root.get("id").asInt(), root.get("name").asText(), root.get("rarity").asInt(),
696700
root.get("tooltip").asText(), root.get("desc").asText(),
697-
"https://raw.communitydragon.org/latest/game/" + root.get("iconLarge").asText(),
698-
"https://raw.communitydragon.org/latest/game/" + root.get("iconSmall").asText(),
701+
STConstants.CDRAGON_BASE_PATH + "/latest/game/" + root.get("iconLarge").asText(),
702+
STConstants.CDRAGON_BASE_PATH + "/latest/game/" + root.get("iconSmall").asText(),
699703
MAPPER.readerForMapOf(Double.class).readValue(root.get("dataValues")));
700704
}
701705
}
@@ -708,7 +712,7 @@ public Challenge deserialize(JsonParser jp, DeserializationContext ctxt) throws
708712

709713
Map<RankedTier, String> levelToIconPaths = MAPPER.readerFor(TypeFactory.defaultInstance()
710714
.constructMapType(Map.class, RankedTier.class, String.class)).readValue(root.get("levelToIconPath"));
711-
levelToIconPaths.entrySet().forEach(entry -> entry.setValue(String.format("%scdn/img%s", STConstants.DDRAGON_BASE_PATH, entry.getValue())));
715+
levelToIconPaths.entrySet().forEach(entry -> entry.setValue(String.format("%s/cdn/img%s", STConstants.DDRAGON_BASE_PATH, entry.getValue())));
712716

713717
return new Challenge(root.get("id").asInt(), root.get("name").asText(), root.get("description").asText(),
714718
root.get("shortDescription").asText(), root.get("hasLeaderboard").asBoolean(), levelToIconPaths,

0 commit comments

Comments
 (0)