Skip to content

Commit 6b10e83

Browse files
FurtifFurtif
committed
Merge branch 'other' into Development
2 parents afc5c50 + 6b4c3b3 commit 6b10e83

File tree

11 files changed

+78
-79
lines changed

11 files changed

+78
-79
lines changed

‎library/src/main/java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
public class CatchablePokemon implements MapPoint {
3636
private final PokemonGo api;
3737
@Getter
38-
private final String spawnPointId;
38+
public final String spawnPointId;
3939
@Getter
40-
private final long encounterId;
40+
public final long encounterId;
4141
@Getter
4242
private final PokemonId pokemonId;
4343
@Getter

‎library/src/main/java/com/pokegoapi/api/map/pokemon/DiskEncounter.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ protected DiskEncounter(PokemonGo api, CatchablePokemon pokemon) {
2323
@Override
2424
public EncounterResult encounter() throws RequestFailedException {
2525
DiskEncounterMessage message = DiskEncounterMessage.newBuilder()
26-
.setEncounterId(pokemon.getEncounterId())
27-
.setFortId(pokemon.getSpawnPointId())
28-
.setPlayerLatitude(api.getLatitude())
29-
.setPlayerLongitude(api.getLongitude())
26+
.setEncounterId(pokemon.encounterId)
27+
.setFortId(pokemon.spawnPointId)
28+
.setPlayerLatitude(api.latitude)
29+
.setPlayerLongitude(api.longitude)
3030
.build();
3131

3232
ServerRequest request = new ServerRequest(RequestType.DISK_ENCOUNTER, message);
33-
ByteString responseData = api.getRequestHandler().sendServerRequests(request, true);
33+
ByteString responseData = api.requestHandler.sendServerRequests(request, true);
3434

3535
try {
3636
DiskEncounterResponse response = DiskEncounterResponse.parseFrom(responseData);

‎library/src/main/java/com/pokegoapi/api/map/pokemon/Encounter.java

+24-24
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ protected Encounter(PokemonGo api, CatchablePokemon pokemon) {
7777
*/
7878
protected EncounterResult encounter() throws RequestFailedException {
7979
EncounterMessage message = EncounterMessage.newBuilder()
80-
.setEncounterId(pokemon.getEncounterId())
81-
.setSpawnPointId(pokemon.getSpawnPointId())
82-
.setPlayerLatitude(api.getLatitude())
83-
.setPlayerLongitude(api.getLongitude())
80+
.setEncounterId(pokemon.encounterId)
81+
.setSpawnPointId(pokemon.spawnPointId)
82+
.setPlayerLatitude(api.latitude)
83+
.setPlayerLongitude(api.longitude)
8484
.build();
8585

8686
ServerRequest request = new ServerRequest(RequestType.ENCOUNTER, message);
87-
ByteString responseData = api.getRequestHandler().sendServerRequests(request, true);
87+
ByteString responseData = api.requestHandler.sendServerRequests(request, true);
8888

8989
try {
9090
EncounterResponse response = EncounterResponse.parseFrom(responseData);
@@ -110,10 +110,10 @@ protected EncounterResult encounter() throws RequestFailedException {
110110
*/
111111
public CatchPokemonResponse.CatchStatus throwPokeball(PokeballSelector selector, ThrowProperties throwProperties)
112112
throws RequestFailedException, NoSuchItemException {
113-
List<Pokeball> pokeballs = api.getInventories().getItemBag().getUsablePokeballs();
113+
List<Pokeball> pokeballs = api.inventories.itemBag.getUsablePokeballs();
114114
if (pokeballs.size() > 0) {
115115
Pokeball pokeball = selector.select(pokeballs, getCaptureProbability());
116-
return throwPokeball(pokeball.getBallType(), throwProperties);
116+
return throwPokeball(pokeball.ballType, throwProperties);
117117
} else {
118118
throw new NoSuchItemException();
119119
}
@@ -131,21 +131,21 @@ public CatchPokemonResponse.CatchStatus throwPokeball(PokeballSelector selector,
131131
public CatchPokemonResponse.CatchStatus throwPokeball(ItemId pokeball, ThrowProperties throwProperties)
132132
throws RequestFailedException, NoSuchItemException {
133133
if (isActive()) {
134-
ItemBag bag = api.getInventories().getItemBag();
134+
ItemBag bag = api.inventories.itemBag;
135135
Item item = bag.getItem(pokeball);
136-
if (item.getCount() > 0) {
136+
if (item.count > 0) {
137137
CatchPokemonMessage message = CatchPokemonMessage.newBuilder()
138-
.setEncounterId(pokemon.getEncounterId())
139-
.setSpawnPointId(pokemon.getSpawnPointId())
138+
.setEncounterId(pokemon.encounterId)
139+
.setSpawnPointId(pokemon.spawnPointId)
140140
.setPokeball(pokeball)
141-
.setNormalizedHitPosition(throwProperties.getNormalizedHitPosition())
142-
.setNormalizedReticleSize(throwProperties.getNormalizedReticleSize())
143-
.setSpinModifier(throwProperties.getSpinModifier())
141+
.setNormalizedHitPosition(throwProperties.normalizedHitPosition)
142+
.setNormalizedReticleSize(throwProperties.normalizedReticleSize)
143+
.setSpinModifier(throwProperties.spinModifier)
144144
.setHitPokemon(throwProperties.shouldHitPokemon())
145145
.build();
146146

147147
ServerRequest request = new ServerRequest(RequestType.CATCH_POKEMON, message);
148-
ByteString responseData = api.getRequestHandler().sendServerRequests(request, true);
148+
ByteString responseData = api.requestHandler.sendServerRequests(request, true);
149149

150150
try {
151151
CatchPokemonResponse response = CatchPokemonResponse.parseFrom(responseData);
@@ -158,16 +158,16 @@ public CatchPokemonResponse.CatchStatus throwPokeball(ItemId pokeball, ThrowProp
158158
}
159159

160160
if (status == CatchStatus.CATCH_SUCCESS || status == CatchStatus.CATCH_FLEE) {
161-
pokemon.setDespawned(true);
162-
api.getPlayerProfile().updateProfile();
161+
pokemon.despawned = true;
162+
api.playerProfile.updateProfile();
163163
}
164164

165165
if (status == CatchStatus.CATCH_ESCAPE) {
166166
activeItem = ItemId.UNRECOGNIZED;
167167
}
168168

169169
if (status != CatchStatus.CATCH_ERROR) {
170-
item.setCount(item.getCount() - 1);
170+
item.setCount(item.count - 1);
171171
}
172172
} catch (InvalidProtocolBufferException e) {
173173
throw new RequestFailedException(e);
@@ -188,25 +188,25 @@ public CatchPokemonResponse.CatchStatus throwPokeball(ItemId pokeball, ThrowProp
188188
*/
189189
public UseItemEncounterResponse.Status useItem(ItemId itemId) throws RequestFailedException {
190190
if (isActive()) {
191-
ItemBag bag = api.getInventories().getItemBag();
191+
ItemBag bag = api.inventories.itemBag;
192192
Item item = bag.getItem(itemId);
193-
if (item.getCount() > 0) {
193+
if (item.count > 0) {
194194
if (getActiveItem() == null) {
195195
UseItemEncounterMessage message = UseItemEncounterMessage.newBuilder()
196-
.setEncounterId(pokemon.getEncounterId())
197-
.setSpawnPointGuid(pokemon.getSpawnPointId())
196+
.setEncounterId(pokemon.encounterId)
197+
.setSpawnPointGuid(pokemon.spawnPointId)
198198
.setItem(itemId)
199199
.build();
200200

201201
ServerRequest request = new ServerRequest(RequestType.USE_ITEM_ENCOUNTER, message);
202-
ByteString responseData = api.getRequestHandler().sendServerRequests(request, true);
202+
ByteString responseData = api.requestHandler.sendServerRequests(request, true);
203203

204204
try {
205205
UseItemEncounterResponse response = UseItemEncounterResponse.parseFrom(responseData);
206206
activeItem = response.getActiveItem();
207207
captureProbabilities = response.getCaptureProbability();
208208
if (response.getStatus() == Status.SUCCESS) {
209-
item.setCount(item.getCount() - 1);
209+
item.setCount(item.count - 1);
210210
}
211211
return response.getStatus();
212212
} catch (InvalidProtocolBufferException e) {

‎library/src/main/java/com/pokegoapi/api/map/pokemon/IncenseEncounter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ protected IncenseEncounter(PokemonGo api, CatchablePokemon pokemon) {
2323
@Override
2424
public EncounterResult encounter() throws RequestFailedException {
2525
IncenseEncounterMessage message = IncenseEncounterMessage.newBuilder()
26-
.setEncounterId(pokemon.getEncounterId())
27-
.setEncounterLocation(pokemon.getSpawnPointId())
26+
.setEncounterId(pokemon.encounterId)
27+
.setEncounterLocation(pokemon.spawnPointId)
2828
.build();
2929

3030
ServerRequest request = new ServerRequest(RequestType.INCENSE_ENCOUNTER, message);
31-
ByteString responseData = api.getRequestHandler().sendServerRequests(request, true);
31+
ByteString responseData = api.requestHandler.sendServerRequests(request, true);
3232

3333
try {
3434
IncenseEncounterResponse response = IncenseEncounterResponse.parseFrom(responseData);

‎library/src/main/java/com/pokegoapi/api/map/pokemon/ThrowProperties.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
public class ThrowProperties {
66
@Getter
7-
private double normalizedHitPosition;
7+
public double normalizedHitPosition;
88
@Getter
9-
private double normalizedReticleSize;
9+
public double normalizedReticleSize;
1010
@Getter
11-
private double spinModifier;
11+
public double spinModifier;
1212
private boolean hitPokemon = true;
1313

1414
private ThrowProperties() {

‎library/src/main/java/com/pokegoapi/api/player/PlayerProfile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public class PlayerProfile {
8080
private long startTime;
8181

8282
@Getter
83-
private Buddy buddy;
83+
public Buddy buddy;
8484

8585
private Stats stats;
8686
private TutorialState tutorialState;

‎library/src/main/java/com/pokegoapi/api/pokemon/Evolution.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525

2626
public class Evolution {
2727
@Getter
28-
private PokemonId parent;
28+
public PokemonId parent;
2929
@Getter
3030
private PokemonId pokemon;
3131
@Getter
32-
private List<PokemonId> evolutions = new ArrayList<>();
32+
public List<PokemonId> evolutions = new ArrayList<>();
3333
@Getter
3434
public List<EvolutionBranch> evolutionBranch;
3535

‎library/src/main/java/com/pokegoapi/api/pokemon/Evolutions.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class Evolutions {
3737
public Evolutions(ItemTemplates templates) {
3838
itemTemplates = templates;
3939
evolutions.clear();
40-
for (ItemTemplate template : templates.getTemplates()) {
40+
for (ItemTemplate template : templates.templates) {
4141
if (template.hasPokemonSettings()) {
4242
PokemonSettings settings = template.getPokemonSettings();
4343
PokemonId pokemon = settings.getPokemonId();
@@ -57,7 +57,7 @@ public Evolutions(ItemTemplates templates) {
5757
private void addEvolution(PokemonId parent, PokemonId pokemon) {
5858
Evolution evolution = new Evolution(itemTemplates, parent, pokemon);
5959
evolutions.put(pokemon, evolution);
60-
for (PokemonId poke : evolution.getEvolutions()) {
60+
for (PokemonId poke : evolution.evolutions) {
6161
addEvolution(pokemon, poke);
6262
}
6363
}
@@ -81,7 +81,7 @@ public Evolution getEvolution(PokemonId pokemon) {
8181
public List<PokemonId> getEvolutions(PokemonId pokemon) {
8282
Evolution evolution = getEvolution(pokemon);
8383
if (evolution != null) {
84-
return evolution.getEvolutions();
84+
return evolution.evolutions;
8585
}
8686
return new ArrayList<>();
8787
}
@@ -96,8 +96,8 @@ public List<PokemonId> getBasic(PokemonId pokemon) {
9696
List<PokemonId> basic = new ArrayList<>();
9797
Evolution evolution = getEvolution(pokemon);
9898
if (evolution != null) {
99-
if (evolution.getParent() != null) {
100-
basic.add(evolution.getParent());
99+
if (evolution.parent != null) {
100+
basic.add(evolution.parent);
101101
} else {
102102
basic.add(pokemon);
103103
}
@@ -118,8 +118,8 @@ public List<PokemonId> getHighest(PokemonId pokemon) {
118118
List<PokemonId> highest = new ArrayList<>();
119119
Evolution evolution = getEvolution(pokemon);
120120
if (evolution != null) {
121-
if (evolution.getEvolutions() != null && evolution.getEvolutions().size() > 0) {
122-
for (PokemonId child : evolution.getEvolutions()) {
121+
if (evolution.evolutions != null && evolution.evolutions.size() > 0) {
122+
for (PokemonId child : evolution.evolutions) {
123123
highest.addAll(getHighest(child));
124124
}
125125
} else {
@@ -140,6 +140,6 @@ public List<PokemonId> getHighest(PokemonId pokemon) {
140140
*/
141141
public boolean canEvolve(PokemonId pokemon) {
142142
Evolution evolution = getEvolution(pokemon);
143-
return evolution != null && evolution.getEvolutions() != null && evolution.getEvolutions().size() > 0;
143+
return evolution != null && evolution.evolutions != null && evolution.evolutions.size() > 0;
144144
}
145145
}

0 commit comments

Comments
 (0)