Skip to content

Commit c7a72f7

Browse files
authored
Merge pull request #445 from Wolfsblvt/develop
Merge for release v0.1.3
2 parents fae2f90 + a047cff commit c7a72f7

File tree

77 files changed

+4935
-2691
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+4935
-2691
lines changed

.codeclimate.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ languages:
44

55
# Ignore files that are not relevant for the check
66
exclude_paths:
7+
- .git/
8+
- .idea/
9+
- .settings/
710
- out/
811
- target/
912
- "**/thirdparty/"

.gitignore

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1-
# Windows image file caches
2-
Thumbs.db
3-
ehthumbs.db
4-
5-
# Folder config file
6-
Desktop.ini
7-
8-
# Recycle Bin used on file shares
9-
$RECYCLE.BIN/
10-
11-
# Windows Installer files
12-
*.cab
13-
*.msi
14-
*.msm
15-
*.msp
16-
17-
*.class
18-
19-
# Windows shortcuts
20-
*.lnk
1+
# =========================
2+
# Project specific files
3+
# =========================
4+
/target
5+
*.log
6+
/config.json
7+
/locations.json
218

229

2310
# =========================
@@ -51,6 +38,30 @@ $RECYCLE.BIN/
5138
# Operating System Files
5239
# =========================
5340

41+
# Windows
42+
# =========================
43+
44+
# Windows image file caches
45+
Thumbs.db
46+
ehthumbs.db
47+
48+
# Folder config file
49+
Desktop.ini
50+
51+
# Recycle Bin used on file shares
52+
$RECYCLE.BIN/
53+
54+
# Windows Installer files
55+
*.cab
56+
*.msi
57+
*.msm
58+
*.msp
59+
60+
*.class
61+
62+
# Windows shortcuts
63+
*.lnk
64+
5465
# OSX
5566
# =========================
5667

@@ -75,8 +86,3 @@ $RECYCLE.BIN/
7586
Network Trash Folder
7687
Temporary Items
7788
.apdisk
78-
79-
# Project specific files
80-
/target/
81-
*.log
82-
config.json

.idea/checkstyle-idea.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyleSettings.xml

Lines changed: 43 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.settings/org.eclipse.jdt.core.prefs

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1010
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1111
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
1212
org.eclipse.jdt.core.compiler.source=1.8
13+
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
1314
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
1415
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
1516
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -23,8 +24,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=52
2324
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48
2425
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=81
2526
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
27+
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
2628
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
2729
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
30+
org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
2831
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
2932
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
3033
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -34,6 +37,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
3437
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=64
3538
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
3639
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
40+
org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
41+
org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
3742
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
3843
org.eclipse.jdt.core.formatter.blank_lines_after_imports=0
3944
org.eclipse.jdt.core.formatter.blank_lines_after_package=0
@@ -68,11 +73,11 @@ org.eclipse.jdt.core.formatter.comment.format_line_comments=true
6873
org.eclipse.jdt.core.formatter.comment.format_source_code=true
6974
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
7075
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
71-
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
76+
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
7277
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
73-
org.eclipse.jdt.core.formatter.comment.line_length=80
78+
org.eclipse.jdt.core.formatter.comment.line_length=200
7479
org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=false
75-
org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=false
80+
org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
7681
org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
7782
org.eclipse.jdt.core.formatter.compact_else_if=true
7883
org.eclipse.jdt.core.formatter.continuation_indentation=2
@@ -92,6 +97,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
9297
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
9398
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
9499
org.eclipse.jdt.core.formatter.indentation.size=4
100+
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
95101
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
96102
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
97103
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -276,7 +282,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
276282
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
277283
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
278284
org.eclipse.jdt.core.formatter.join_lines_in_comments=true
279-
org.eclipse.jdt.core.formatter.join_wrapped_lines=true
285+
org.eclipse.jdt.core.formatter.join_wrapped_lines=false
280286
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
281287
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
282288
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
@@ -286,12 +292,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
286292
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
287293
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
288294
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
295+
org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
296+
org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
297+
org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
298+
org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
299+
org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
300+
org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
301+
org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
302+
org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
303+
org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
304+
org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
289305
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
290306
org.eclipse.jdt.core.formatter.tabulation.char=space
291307
org.eclipse.jdt.core.formatter.tabulation.size=4
292308
org.eclipse.jdt.core.formatter.use_on_off_tags=false
293309
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
310+
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
294311
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
312+
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
295313
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
296314
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
297315
org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

.settings/org.eclipse.jdt.ui.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
eclipse.preferences.version=1
2-
formatter_profile=_GitHub Codacy [built-in]
3-
formatter_settings_version=12
1+
eclipse.preferences.version=1
2+
formatter_profile=_GitHub Codacy [built-in]
3+
formatter_settings_version=12

BlossomsPokemonGoManager.iml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,9 @@
1212
</content>
1313
<orderEntry type="inheritedJdk" />
1414
<orderEntry type="sourceFolder" forTests="false" />
15-
<orderEntry type="library" name="Maven: com.pokegoapi:PokeGOAPI-library:0.4.1" level="project" />
16-
<orderEntry type="library" name="Maven: svarzee.gps:gpsoauth:0.3" level="project" />
17-
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.4.1" level="project" />
18-
<orderEntry type="library" name="Maven: io.reactivex:rxjava:1.1.8" level="project" />
19-
<orderEntry type="library" name="Maven: net.jpountz.lz4:lz4:1.3.0" level="project" />
20-
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
21-
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
22-
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.10.19" level="project" />
15+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
16+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
17+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
2318
<orderEntry type="library" name="Maven: com.pokegoapi:PokeGOAPI-library:0.4.1" level="project" />
2419
<orderEntry type="library" name="Maven: svarzee.gps:gpsoauth:0.3" level="project" />
2520
<orderEntry type="library" name="Maven: net.iharder:base64:2.3.9" level="project" />
@@ -35,5 +30,6 @@
3530
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
3631
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
3732
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.10.19" level="project" />
33+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
3834
</component>
3935
</module>

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# Important Note on Using this Tool
2+
Niantic forced the apps to update to latest 0.39 version. All old official apps will not start anymore. That means they will only have new API calls from smartphones, making it very likely to get flagged if you use the old API with unofficial tool, like ours too.
3+
4+
**IMPORTANT: Chances are high for getting flagged and banned if you continue using this tool at the moment!**
5+
6+
Devs are already working on a new API version so that tools can continue to exist, we hope.
7+
Use BlossomsPokemonGoManager at your own risk. It's more likely than ever to get banned for it.
8+
(No reported bans so far though)
9+
10+
<hr />
11+
12+
113
[![Travis Build Badge](https://img.shields.io/travis/Wolfsblvt/BlossomsPokemonGoManager.svg)](https://travis-ci.org/Wolfsblvt/BlossomsPokemonGoManager)
214
[![Codacy](https://img.shields.io/codacy/grade/14b05062286f448fb5b59708c4936e42.svg)](https://www.codacy.com/app/wolfsblvt/BlossomsPokemonGoManager?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Wolfsblvt/BlossomsPokemonGoManager&amp;utm_campaign=Badge_Grade)
315
[![Codacy Coverage](https://img.shields.io/codacy/coverage/14b05062286f448fb5b59708c4936e42.svg)](https://www.codacy.com/app/wolfsblvt/BlossomsPokemonGoManager?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Wolfsblvt/BlossomsPokemonGoManager&amp;utm_campaign=Badge_Grade)

0 commit comments

Comments
 (0)