Skip to content

Commit e4ae2bd

Browse files
dec4234dec4234
committed
Update all raid hashes
1 parent 384df58 commit e4ae2bd

File tree

3 files changed

+38
-29
lines changed

3 files changed

+38
-29
lines changed

‎src/main/java/net/dec4234/javadestinyapi/material/DestinyAPI.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
import java.util.LinkedList;
2525
import java.util.List;
2626

27+
/**
28+
* This is the base class for the entire API. It MUST be initialized with an API key before <u>any part</u>
29+
* of the API is used.
30+
*/
2731
public class DestinyAPI {
2832

2933
private static String apiKey = null;
@@ -399,14 +403,6 @@ public static List<BungieUser> searchGlobalDisplayNames(String prefix) throws AP
399403
return bungieUsers;
400404
}
401405

402-
public static Clan getClan(long id) {
403-
return new Clan(id);
404-
}
405-
406-
public static Clan getClan(String name) {
407-
return new Clan(name);
408-
}
409-
410406
public static String getApiKey() {
411407
return apiKey;
412408
}

‎src/main/java/net/dec4234/javadestinyapi/stats/activities/ActivityHistoryReview.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,15 @@ public boolean hasPlayedInActivity(BungieUser bungieUser, String pgcrId) throws
154154
return false;
155155
}
156156

157-
public void getUndiscoveredActivityHashes(BungieUser bungieUser, ActivityIdentifier activityIdentifier) throws APIException {
157+
/**
158+
* This is a utility function to assist in development
159+
* <br>
160+
* This prints a list of hashes and the names to put inside {@link ActivityIdentifier}
161+
* @param activityIdentifier Finds all unknown hashes that share the same mode as this activity. Like Raid/Strike/etc.
162+
*/
163+
public void getUndiscoveredActivityHashes(ActivityIdentifier activityIdentifier) throws APIException {
164+
BungieUser bungieUser = new BungieUser("4611686018467284386"); // just use a tryhard player that does every activity (Datto)
165+
158166
for (DestinyCharacter destinyCharacter : bungieUser.getCharacters()) {
159167
for (int i = 0; i < 25; i++) {
160168
JsonObject jo = httpUtils.urlRequestGET("https://www.bungie.net/Platform/Destiny2/" + bungieUser.getMembershipType() + "/Account/" + bungieUser.getID() + "/Character/" + destinyCharacter.getCharacterID() + "/Stats/Activities/?page=" + i + "&count=250&mode=" + activityIdentifier.getMode().getBungieValue());

‎src/main/java/net/dec4234/javadestinyapi/stats/activities/ActivityIdentifier.java‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
package net.dec4234.javadestinyapi.stats.activities;
99

1010
/**
11-
* A collection of 2 to 4 letter identifiers for Activities
12-
* Also Hash Identifiers
13-
*
14-
* e.g. DSC for Deep Stone Crypt
11+
* This a list of known activity hash identifiers mapped to their names, activity mode and short name. Some activities
12+
* such as raids are also mapped to an image in case you want it. <br>
13+
* Note that each hash represents something different, like the different rotations or challenges of Leviathan.
14+
* I have not investigated this very deeply but that's what I suspect. You can probably use the manifest to find out
15+
* more information.
1516
*/
1617
public enum ActivityIdentifier {
1718

@@ -111,16 +112,29 @@ public enum ActivityIdentifier {
111112
GARDEN_OF_SALVATION("GOS", "https://www.bungie.net/img/destiny_content/pgcr/raid_garden_of_salvation.jpg", ActivityMode.RAID, "2659723068", "3458480158"),
112113

113114
DEEP_STONE_CRYPT("DSC", "https://www.bungie.net/img/destiny_content/pgcr/europa-raid-deep-stone-crypt.jpg", ActivityMode.RAID, "910380154"),
115+
114116
VAULT_OF_GLASS("VOG", "https://www.bungie.net/pubassets/pkgs/150/150569/FrontpageBanner_1920x590.jpg?cv=3983621215&av=1926358162", ActivityMode.RAID, "3881495763"),
115-
VAULT_OF_GLASS_MASTER("VOGM", "https://www.bungie.net/pubassets/pkgs/150/150569/FrontpageBanner_1920x590.jpg?cv=3983621215&av=1926358162", ActivityMode.RAID, ""),
117+
VAULT_OF_GLASS_MASTER("VOGM", "https://www.bungie.net/pubassets/pkgs/150/150569/FrontpageBanner_1920x590.jpg?cv=3983621215&av=1926358162", ActivityMode.RAID, "1681562271", "3022541210"),
118+
VAULT_OF_GLASS_CHALLENGE_MODE("VOGCM", "https://www.bungie.net/pubassets/pkgs/150/150569/FrontpageBanner_1920x590.jpg?cv=3983621215&av=1926358162", ActivityMode.RAID, "1485585878"),
119+
120+
VOW_OF_THE_DISCIPLE("VOTD", "https://www.bungie.net/pubassets/pkgs/157/157111/FrontPageBanner_1920x590.jpg", ActivityMode.RAID, "1441982566"),
121+
VOW_OF_THE_DISCIPLE_MASTER("VOTDM", "https://www.bungie.net/pubassets/pkgs/157/157111/FrontPageBanner_1920x590.jpg", ActivityMode.RAID, "4217492330"),
122+
123+
KF("KF", "https://www.bungie.net/pubassets/pkgs/170/170501/ArticleBanner_997x500.jpg", ActivityMode.RAID, "1374392663"),
124+
KF_MASTER("KFM", "https://www.bungie.net/pubassets/pkgs/170/170501/ArticleBanner_997x500.jpg", ActivityMode.RAID, "2964135793", "3257594522"),
125+
KF_LEGEND("KFL", "https://www.bungie.net/pubassets/pkgs/170/170501/ArticleBanner_997x500.jpg", ActivityMode.RAID, "1063970578"),
126+
127+
RON("RON", "https://images.contentstack.io/v3/assets/blte410e3b15535c144/blt745cb94aef1d49fd/640a30abe16bc77f58332cc4/FrontPageBanner_PC_1920x590.jpg", ActivityMode.RAID, "2381413764"),
128+
RON_MASTER("RONM", "https://images.contentstack.io/v3/assets/blte410e3b15535c144/blt745cb94aef1d49fd/640a30abe16bc77f58332cc4/FrontPageBanner_PC_1920x590.jpg", ActivityMode.RAID, "2918919505"),
116129

117-
VOW_OF_THE_DISCIPLE("VOTD", "https://www.bungie.net/pubassets/pkgs/157/157111/FrontPageBanner_1920x590.jpg", ActivityMode.RAID, ""),
118-
VOW_OF_THE_DISCIPLE_MASTER("VOTDM", "https://www.bungie.net/pubassets/pkgs/157/157111/FrontPageBanner_1920x590.jpg", ActivityMode.RAID, ""),
130+
CROTAS_END("CE", "https://images.contentstack.io/v3/assets/blte410e3b15535c144/blt8023dab456754205/64f0c82d8c8fe96dfe98bbf8/16x9Standard_1920x1080.jpg", ActivityMode.RAID, "4179289725"),
131+
CROTAS_END_MASTER("CEM", "https://images.contentstack.io/v3/assets/blte410e3b15535c144/blt8023dab456754205/64f0c82d8c8fe96dfe98bbf8/16x9Standard_1920x1080.jpg", ActivityMode.RAID, "1507509200"),
132+
CROTAS_END_LEGEND("CEL", "https://images.contentstack.io/v3/assets/blte410e3b15535c144/blt8023dab456754205/64f0c82d8c8fe96dfe98bbf8/16x9Standard_1920x1080.jpg", ActivityMode.RAID, "156253568"),
119133

120-
KF("KF", "https://www.bungie.net/pubassets/pkgs/170/170501/ArticleBanner_997x500.jpg", ActivityMode.RAID, ""), // TODO: Hashes for VoG Master - Present
121-
KF_MASTER("KFM", "https://www.bungie.net/pubassets/pkgs/170/170501/ArticleBanner_997x500.jpg", ActivityMode.RAID, ""),
122-
RON("RON", "https://images.contentstack.io/v3/assets/blte410e3b15535c144/blt745cb94aef1d49fd/640a30abe16bc77f58332cc4/FrontPageBanner_PC_1920x590.jpg", ActivityMode.RAID, ""),
123-
RON_MASTER("RONM", "https://images.contentstack.io/v3/assets/blte410e3b15535c144/blt745cb94aef1d49fd/640a30abe16bc77f58332cc4/FrontPageBanner_PC_1920x590.jpg", ActivityMode.RAID, "");
134+
PANTHEON_ATRAKS("PANA", "https://images.contentstack.io/v3/assets/blte410e3b15535c144/blt5394fcdccef3f5ac/66290d35a9b0ab6193b925f0/thisweekatbungie-7_28_22.png", ActivityMode.RAID, "4169648179"),
135+
PANTHEON_ORYX("PANO", "https://images.contentstack.io/v3/assets/blte410e3b15535c144/blt5394fcdccef3f5ac/66290d35a9b0ab6193b925f0/thisweekatbungie-7_28_22.png", ActivityMode.RAID, ""),
136+
PANTHEON_RHULK("PANR", "https://images.contentstack.io/v3/assets/blte410e3b15535c144/blt5394fcdccef3f5ac/66290d35a9b0ab6193b925f0/thisweekatbungie-7_28_22.png", ActivityMode.RAID, ""),
137+
PANTHEON_NEZAREC("PANN", "https://images.contentstack.io/v3/assets/blte410e3b15535c144/blt5394fcdccef3f5ac/66290d35a9b0ab6193b925f0/thisweekatbungie-7_28_22.png", ActivityMode.RAID, "");
124138

125139
private String identifier;
126140
private String[] hashes;
@@ -177,13 +191,4 @@ public static ActivityIdentifier fromHash(String hash) {
177191

178192
return null;
179193
}
180-
181-
/**
182-
* Print a list of unknown hashes, and their corresponding activity name <br>
183-
* Note: This is a utility method that is typically only used in development.
184-
* @param mode The mode category to search under
185-
*/
186-
public static void printUnknownIdentifiers(ActivityMode mode) {
187-
188-
}
189194
}

0 commit comments

Comments
 (0)