Skip to content

Commit 5df126c

Browse files
committed
Update to lasted protos 115.3 and fix structure
2 parents 36b4f6e + 09f11c7 commit 5df126c

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

library/src/main/java/com/pokegoapi/api/gym/Battle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private void beginDefenderBattle(final BattleHandler handler)
217217
}
218218
try {
219219
StartGymBattleMessage message = builder.build();
220-
ServerRequest request = new ServerRequest(RequestType.START_GYM_BATTLE, message);
220+
ServerRequest request = new ServerRequest(RequestType.GYM_START_SESSION, message);
221221

222222
api.getRequestHandler().sendServerRequests(request, true);
223223
StartGymBattleResponse response = StartGymBattleResponse.parseFrom(request.getData());
@@ -577,7 +577,7 @@ private boolean sendActions(BattleHandler handler)
577577
}
578578
if (builder.getAttackActionsCount() > 0) {
579579
AttackGymMessage message = builder.build();
580-
ServerRequest request = new ServerRequest(RequestType.ATTACK_GYM, message);
580+
ServerRequest request = new ServerRequest(RequestType.GYM_BATTLE_ATTACK, message);
581581
api.getRequestHandler().sendServerRequests(request, true);
582582
boolean nextDefender;
583583
try {

library/src/main/java/com/pokegoapi/api/inventory/Inventories.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public GetHoloInventoryResponse updateInventories(boolean forceUpdate)
119119
GetHoloInventoryMessage invReqMsg = GetHoloInventoryMessage.newBuilder()
120120
.setLastTimestampMs(lastInventoryUpdate)
121121
.build();
122-
ServerRequest inventoryRequest = new ServerRequest(RequestType.GET_HOLO_INVENTORY, invReqMsg);
122+
ServerRequest inventoryRequest = new ServerRequest(RequestType.GET_HOLOHOLO_INVENTORY, invReqMsg);
123123
api.getRequestHandler().sendServerRequests(inventoryRequest, false);
124124

125125
GetHoloInventoryResponse response;

library/src/main/java/com/pokegoapi/api/inventory/PokeBank.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public Map<PokemonFamilyId, Integer> releasePokemon(Pokemon... releasePokemon) t
167167
Map<PokemonFamilyId, Integer> lastCandies = new HashMap<>(api.getInventories().getCandyjar().getCandies());
168168
ServerResponse response = api.getRequestHandler().sendServerRequests(envelope);
169169
try {
170-
ByteString inventoryData = response.get(RequestType.GET_HOLO_INVENTORY);
170+
ByteString inventoryData = response.get(RequestType.GET_HOLOHOLO_INVENTORY);
171171
GetHoloInventoryResponse inventoryResponse = GetHoloInventoryResponse.parseFrom(inventoryData);
172172
ReleasePokemonResponse releaseResponse = ReleasePokemonResponse.parseFrom(releaseRequest.getData());
173173
Map<PokemonFamilyId, Integer> candyCount = new HashMap<>();

library/src/main/java/com/pokegoapi/main/CommonRequests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ public static void handleCommons(PokemonGo api, ServerResponse response)
129129
CheckChallengeResponse checkChallenge = CheckChallengeResponse.parseFrom(data);
130130
api.updateChallenge(checkChallenge.getChallengeUrl(), checkChallenge.getShowChallenge());
131131
}
132-
if (response.has(RequestType.GET_HOLO_INVENTORY)) {
133-
ByteString data = response.get(RequestType.GET_HOLO_INVENTORY);
132+
if (response.has(RequestType.GET_HOLOHOLO_INVENTORY)) {
133+
ByteString data = response.get(RequestType.GET_HOLOHOLO_INVENTORY);
134134
GetHoloInventoryResponse inventory = GetHoloInventoryResponse.parseFrom(data);
135135
api.getInventories().updateInventories(inventory);
136136
}
@@ -189,7 +189,7 @@ public static ServerRequest getHatchedEggs() {
189189
public static ServerRequest getInventory(PokemonGo api) {
190190
long lastUpdate = api.getInventories().getLastInventoryUpdate();
191191
GetHoloInventoryMessage message = GetHoloInventoryMessage.newBuilder().setLastTimestampMs(lastUpdate).build();
192-
return new ServerRequest(RequestType.GET_HOLO_INVENTORY, message);
192+
return new ServerRequest(RequestType.GET_HOLOHOLO_INVENTORY, message);
193193
}
194194

195195
/**

library/src/resources/protobuf

Submodule protobuf updated 60 files

0 commit comments

Comments
 (0)