Skip to content

Commit fd28d99

Browse files
jabbinkjabbink
committed
Reformat all code to be the same, everywhere
1 parent 69c9b26 commit fd28d99

31 files changed

Lines changed: 478 additions & 562 deletions

‎.gitmodules‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[submodule "src/resources/protobuf"]
22
path = src/resources/protobuf
33
url = git@github.com:AeonLucid/POGOProtos.git
4-
branch = master

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>PokeGOAPI-Java</groupId>

‎src/com/pokegoapi/api/ContactSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
import lombok.Data;
44

55
@Data
6-
public class ContactSettings
7-
{
6+
public class ContactSettings {
87
private boolean sendMarketingEmails;
98
private boolean sendPushNotifications;
109
}

‎src/com/pokegoapi/api/DailyBonus.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import lombok.Data;
44

55
@Data
6-
public class DailyBonus
7-
{
6+
public class DailyBonus {
87
private long nextCollectionTimestamp;
98
private long nextDefenderBonusCollectTimestamp;
10-
9+
1110
}

‎src/com/pokegoapi/api/FortDetails.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,57 @@
99

1010
import java.util.List;
1111

12-
public class FortDetails
13-
{
12+
public class FortDetails {
1413
private FortDetailsResponseOuterClass.FortDetailsResponse proto;
15-
public FortDetails(FortDetailsResponseOuterClass.FortDetailsResponse proto)
16-
{
14+
15+
public FortDetails(FortDetailsResponseOuterClass.FortDetailsResponse proto) {
1716
this.proto = proto;
1817
}
18+
1919
public String getId() {
2020
return proto.getFortId();
2121
}
22+
2223
public TeamColorOuterClass.TeamColor getTeam() {
2324
return proto.getTeamColor();
2425
}
26+
2527
public String getName() {
2628
return proto.getName();
2729
}
30+
2831
public ProtocolStringList getImageUrl() {
2932
return proto.getImageUrlsList();
3033
}
34+
3135
public int getFp() {
3236
return proto.getFp();
3337
}
38+
3439
public int getStamina() {
3540
return proto.getStamina();
3641
}
42+
3743
public int getMaxStamina() {
3844
return proto.getMaxStamina();
3945
}
46+
4047
public FortTypeOuterClass.FortType getFortType() {
4148
return proto.getType();
4249
}
50+
4351
public double getLatitude() {
4452
return proto.getLatitude();
4553
}
54+
4655
public double getLongitude() {
4756
return proto.getLongitude();
4857
}
58+
4959
public String getDescription() {
5060
return proto.getDescription();
5161
}
62+
5263
public List<FortModifierOuterClass.FortModifier> getModifier() {
5364
return proto.getModifiersList();
5465
}

‎src/com/pokegoapi/api/PlayerAvatar.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import lombok.Data;
55

66
@Data
7-
public class PlayerAvatar
8-
{
7+
public class PlayerAvatar {
98
private GenderOuterClass.Gender gender;
109
private int skin;
1110
private int hair;
@@ -15,5 +14,5 @@ public class PlayerAvatar
1514
private int shoes;
1615
private int eyes;
1716
private int backpack;
18-
17+
1918
}

‎src/com/pokegoapi/api/PlayerProfile.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,42 @@
11
package com.pokegoapi.api;
22

3-
import java.util.HashMap;
4-
import java.util.Map;
5-
63
import POGOProtos.Player.EquippedBadgeOuterClass;
74
import com.pokegoapi.exceptions.InvalidCurrencyException;
8-
95
import lombok.Data;
106

7+
import java.util.HashMap;
8+
import java.util.Map;
9+
1110
@Data
12-
public class PlayerProfile
13-
{
11+
public class PlayerProfile {
1412
private long creationTime;
1513
private String username;
1614
private Team team;
1715
private int pokemonStorage;
1816
private int itemStorage;
1917
private EquippedBadgeOuterClass.EquippedBadge badge;
20-
18+
2119
private PlayerAvatar avatar;
2220
private DailyBonus dailyBonus;
2321
private ContactSettings contactSettings;
2422
private Map<Currency, Integer> currencies = new HashMap<Currency, Integer>();
25-
26-
27-
public void addCurrency(String name, int amount) throws InvalidCurrencyException
28-
{
23+
24+
25+
public void addCurrency(String name, int amount) throws InvalidCurrencyException {
2926
try {
3027
currencies.put(Currency.valueOf(name), amount);
3128
} catch (Exception e) {
3229
;
3330
}
3431
}
35-
32+
3633
public int getCurrency(Currency currency) throws InvalidCurrencyException {
3734
if (currencies.containsKey(currency))
3835
return currencies.get(currency);
3936
else
4037
throw new InvalidCurrencyException();
4138
}
42-
39+
4340
public enum Currency {
4441
STARDUST, POKECOIN;
4542
}

‎src/com/pokegoapi/api/PokemonGo.java‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -9,70 +9,70 @@
99
import com.pokegoapi.requests.GetMapObjectsRequest;
1010
import com.pokegoapi.requests.InventoryRequest;
1111
import com.pokegoapi.requests.ProfileRequest;
12-
1312
import lombok.Getter;
1413

1514
import java.util.List;
1615

1716
public class PokemonGo {
1817

19-
@Getter RequestHandler requestHandler;
20-
private PlayerProfile playerProfile;
21-
@Getter PokeBank pokebank;
22-
23-
private long lastInventoryUpdate;
24-
25-
public PokemonGo(EnvelopesOuterClass.Envelopes.RequestEnvelope.AuthInfo auth) {
26-
playerProfile = null;
27-
// send profile request to get the ball rolling
28-
29-
requestHandler = new RequestHandler(auth);
30-
ProfileRequest pr = new ProfileRequest();
31-
requestHandler.addRequest(pr);
32-
requestHandler.sendRequests();
33-
// should have proper end point now.
34-
35-
pokebank = new PokeBank(this);
36-
37-
lastInventoryUpdate = 0;
38-
getInventory();
39-
}
40-
41-
42-
public PlayerProfile getPlayerProfile() {
43-
ProfileRequest pr = new ProfileRequest();
44-
requestHandler.addRequest(pr);
45-
requestHandler.sendRequests();
46-
47-
return pr.getProfile();
48-
}
49-
50-
51-
private void getInventory() {
52-
InventoryRequest invRequest = new InventoryRequest();
53-
invRequest.setTimestamp(lastInventoryUpdate);
54-
requestHandler.addRequest(invRequest);
55-
requestHandler.sendRequests();
56-
for (Pokemon newPokemon : invRequest.getPokemon()) {
57-
this.pokebank.addPokemon(newPokemon);
58-
}
59-
}
60-
61-
62-
public FortDetails getFortDetails(String id, long lon, long lat) {
63-
FortDetailsRequest request = new FortDetailsRequest(id, lon, lat);
64-
requestHandler.addRequest(request);
65-
requestHandler.sendRequests();
66-
return new FortDetails(request.getOutput());
67-
}
68-
69-
70-
public void getMapObjects(List<Long> cellIds, double latitude, double longitude) {
71-
requestHandler.setLatitude(latitude);
72-
requestHandler.setLongitude(longitude);
73-
requestHandler.setAltitude(0);
74-
GetMapObjectsRequest request = new GetMapObjectsRequest(cellIds, latitude, longitude);
75-
requestHandler.addRequest(request);
76-
requestHandler.sendRequests();
77-
}
18+
@Getter
19+
RequestHandler requestHandler;
20+
@Getter
21+
PokeBank pokebank;
22+
private PlayerProfile playerProfile;
23+
private long lastInventoryUpdate;
24+
25+
public PokemonGo(EnvelopesOuterClass.Envelopes.RequestEnvelope.AuthInfo auth) {
26+
playerProfile = null;
27+
// send profile request to get the ball rolling
28+
29+
requestHandler = new RequestHandler(auth);
30+
ProfileRequest pr = new ProfileRequest();
31+
requestHandler.addRequest(pr);
32+
requestHandler.sendRequests();
33+
// should have proper end point now.
34+
35+
pokebank = new PokeBank(this);
36+
37+
lastInventoryUpdate = 0;
38+
getInventory();
39+
}
40+
41+
42+
public PlayerProfile getPlayerProfile() {
43+
ProfileRequest pr = new ProfileRequest();
44+
requestHandler.addRequest(pr);
45+
requestHandler.sendRequests();
46+
47+
return pr.getProfile();
48+
}
49+
50+
51+
private void getInventory() {
52+
InventoryRequest invRequest = new InventoryRequest();
53+
invRequest.setTimestamp(lastInventoryUpdate);
54+
requestHandler.addRequest(invRequest);
55+
requestHandler.sendRequests();
56+
for (Pokemon newPokemon : invRequest.getPokemon()) {
57+
this.pokebank.addPokemon(newPokemon);
58+
}
59+
}
60+
61+
62+
public FortDetails getFortDetails(String id, long lon, long lat) {
63+
FortDetailsRequest request = new FortDetailsRequest(id, lon, lat);
64+
requestHandler.addRequest(request);
65+
requestHandler.sendRequests();
66+
return new FortDetails(request.getOutput());
67+
}
68+
69+
70+
public void getMapObjects(List<Long> cellIds, double latitude, double longitude) {
71+
requestHandler.setLatitude(latitude);
72+
requestHandler.setLongitude(longitude);
73+
requestHandler.setAltitude(0);
74+
GetMapObjectsRequest request = new GetMapObjectsRequest(cellIds, latitude, longitude);
75+
requestHandler.addRequest(request);
76+
requestHandler.sendRequests();
77+
}
7878
}

‎src/com/pokegoapi/api/Team.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22

33
import lombok.Getter;
44

5-
public enum Team
6-
{
5+
public enum Team {
76
// VALUES UNCONFIRMED
8-
TEAM_NONE (0),
9-
TEAM_MYSTIC (1),
10-
TEAM_INSTINCT (2),
11-
TEAM_VALOR (3);
12-
13-
@Getter private int value;
14-
15-
private Team(int value)
16-
{
7+
TEAM_NONE(0),
8+
TEAM_MYSTIC(1),
9+
TEAM_INSTINCT(2),
10+
TEAM_VALOR(3);
11+
12+
@Getter
13+
private int value;
14+
15+
private Team(int value) {
1716
this.value = value;
1817
}
1918
}

‎src/com/pokegoapi/api/inventory/EvolutionResult.java‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.pokegoapi.api.inventory;
22

33
import POGOProtos.Networking.Responses.EvolvePokemonResponseOuterClass;
4-
import com.pokegoapi.requests.PokemonEvolveRequest;
54

65

7-
public class EvolutionResult
8-
{
6+
public class EvolutionResult {
97
private EvolvePokemonResponseOuterClass.EvolvePokemonResponse proto;
108
private Pokemon pokemon;
119

12-
public EvolutionResult(EvolvePokemonResponseOuterClass.EvolvePokemonResponse proto)
13-
{
10+
public EvolutionResult(EvolvePokemonResponseOuterClass.EvolvePokemonResponse proto) {
1411
this.proto = proto;
1512
this.pokemon = new Pokemon(proto.getEvolvedPokemon());
1613
}
@@ -21,7 +18,7 @@ public int getResult() {
2118

2219
public Pokemon getEvolvedPokemon() {
2320
return pokemon;
24-
}
21+
}
2522

2623
public int getExpAwarded() {
2724
return proto.getExperienceAwarded();
@@ -30,13 +27,11 @@ public int getExpAwarded() {
3027
public int getCandyAwarded() {
3128
return proto.getCandyAwarded();
3229
}
33-
34-
35-
public boolean isSuccessful()
36-
{
30+
31+
32+
public boolean isSuccessful() {
3733
return (this.getResult() == 1);
3834
}
39-
40-
41-
35+
36+
4237
}

0 commit comments

Comments
 (0)