diff --git a/.gitignore b/.gitignore index d9fc908e1..787d3e13f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ # Protoc files out/ -tmp/ \ No newline at end of file +tmp/ +/pogo/assist.py +*.pyc \ No newline at end of file diff --git a/README.md b/README.md index fc7d2b6c2..e41ceb80c 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,21 @@ Use `homebrew` to install `protobuf ` with `brew install --devel protobuf`. There are two ways to compile **POGOProtos**. ### Single file compilation (Recommended) +Single file compilation merges every directory to it's own `.proto` file. +As an example: + + - Networking/Requests/Messages/*.proto + - Networking/Responses/*.proto + +Becomes: + + - POGOProtos.**Networking.Requests.Messages.proto** + - POGOProtos.**Networking.Responses.proto** + +These new files are then compiled by `protoc` and placed in the output directory. This greatly reduces the amount of output files. + +#### Command + Run `python compile_single.py` to compile everything to a single file. #### Flags @@ -35,6 +50,11 @@ Run `python compile_single.py` to compile everything to a single file. - Add the `-d` or `--desc_file` flag to only generate a descriptor file, `POGOProtos.desc` will be written to the specified output directory. ### Recursive compilation + +Recursive compilation loops through all directories and compiles every `.proto` file it finds to the specified output directory. + +#### Command + Run `python compile.py` to recursively compile everything. #### Flags diff --git a/compile.py b/compile.py index 82052f897..debc4ae16 100755 --- a/compile.py +++ b/compile.py @@ -6,6 +6,7 @@ import sys import os import shutil +from helpers import compile_helper from subprocess import call @@ -58,17 +59,22 @@ def query_yes_no(question, default="yes"): # Determine where to store proj_root = os.path.abspath("../") -proto_path = os.path.abspath("pogo/") +proto_path = os.path.abspath("src/") out_path = os.path.abspath(out_path) +tmp_out_path = out_path + +# Output dir is actually different csharp because we modify it before compiling. +if lang == "csharp": + tmp_out_path = os.path.join(tmp_out_path, "POGOProtos") if not default_out_path: - print 'Can we remove "%s"?' % out_path + print 'Can we remove "%s"?' % tmp_out_path may_remove = query_yes_no("Please answer.", default="no") else: may_remove = True -if may_remove and os.path.exists(out_path): - shutil.rmtree(out_path) +if may_remove and os.path.exists(tmp_out_path): + shutil.rmtree(tmp_out_path) # Find protofiles and compile for root, dirnames, filenames in os.walk(proto_path): @@ -104,8 +110,6 @@ def query_yes_no(question, default="yes"): call(command, shell=True) -if lang == 'python': - for root, dirnames, filenames in os.walk(out_path): - open(os.path.join(root, '__init__.py'), 'w').close() +compile_helper.finish_compile(out_path, lang) print("Done!") diff --git a/compile_single.py b/compile_single.py index cd02bc71d..ce23a6436 100644 --- a/compile_single.py +++ b/compile_single.py @@ -4,6 +4,7 @@ import os import shutil import re +from helpers import compile_helper from subprocess import call # Add this to your path @@ -23,7 +24,7 @@ default_out_path = out_path == "out" # Determine where to store -proto_path = os.path.abspath("pogo") +proto_path = os.path.abspath("src") tmp_path = os.path.abspath("tmp") out_path = os.path.abspath(out_path) @@ -56,6 +57,12 @@ def walk_files(main_file, path, package, imports=None): if imports is None: imports = [] + if package == "POGOProtos": + print("Can't compile..") + print("File: '%s'" % path) + print("Please place the file in 'src/POGOProtos/' in a sub-directory.") + exit() + main_file.write('syntax = "proto3";\n') main_file.write('package %s;\n\n' % package) @@ -82,12 +89,6 @@ def walk_files(main_file, path, package, imports=None): import_from_package = import_from_package_re.group(2).replace("/", ".") - if import_from_package == "": - import_from_package = "POGOProtos" - - if not import_from_package == "POGOProtos": - import_from_package = "POGOProtos." + import_from_package - if import_from_package not in imports: imports.append(import_from_package) @@ -150,10 +151,7 @@ def walk_directory(path): ) call(command, shell=True) - - if lang == 'python': - for root, dirnames, filenames in os.walk(os.path.join(out_path, "POGOProtos")): - open(os.path.join(root, '__init__.py'), 'w').close() + compile_helper.finish_compile(out_path, lang) print("Done!") diff --git a/helpers/__init__.py b/helpers/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/helpers/compile_helper.py b/helpers/compile_helper.py new file mode 100644 index 000000000..4936efdd8 --- /dev/null +++ b/helpers/compile_helper.py @@ -0,0 +1,15 @@ +#!/usr/bin/env python + +import os + + +def finish_compile(out_path, lang): + if lang == 'python': + pogo_protos_path = os.path.join(out_path, "POGOProtos") + + for root, dirnames, filenames in os.walk(pogo_protos_path): + init_path = os.path.join(root, '__init__.py') + + with open(init_path, 'w') as init_file: + if pogo_protos_path is root: + init_file.write("'Generated'; import os; import sys; sys.path.append(os.path.dirname(os.path.realpath(__file__)))") diff --git a/pogo/Data/AssetDigestEntry.proto b/src/POGOProtos/Data/AssetDigestEntry.proto similarity index 100% rename from pogo/Data/AssetDigestEntry.proto rename to src/POGOProtos/Data/AssetDigestEntry.proto diff --git a/pogo/Data/Battle/BattleAction.proto b/src/POGOProtos/Data/Battle/BattleAction.proto similarity index 78% rename from pogo/Data/Battle/BattleAction.proto rename to src/POGOProtos/Data/Battle/BattleAction.proto index 2d7dc80f4..8c6a79795 100644 --- a/pogo/Data/Battle/BattleAction.proto +++ b/src/POGOProtos/Data/Battle/BattleAction.proto @@ -1,9 +1,9 @@ syntax = "proto3"; package POGOProtos.Data.Battle; -import "Data/Battle/BattleResults.proto"; -import "Data/Battle/BattleActionType.proto"; -import "Data/Battle/BattleParticipant.proto"; +import "POGOProtos/Data/Battle/BattleResults.proto"; +import "POGOProtos/Data/Battle/BattleActionType.proto"; +import "POGOProtos/Data/Battle/BattleParticipant.proto"; message BattleAction { .POGOProtos.Data.Battle.BattleActionType Type = 1; diff --git a/pogo/Data/Battle/BattleActionType.proto b/src/POGOProtos/Data/Battle/BattleActionType.proto similarity index 100% rename from pogo/Data/Battle/BattleActionType.proto rename to src/POGOProtos/Data/Battle/BattleActionType.proto diff --git a/pogo/Data/Battle/BattleLog.proto b/src/POGOProtos/Data/Battle/BattleLog.proto similarity index 61% rename from pogo/Data/Battle/BattleLog.proto rename to src/POGOProtos/Data/Battle/BattleLog.proto index d0f020af0..006828876 100644 --- a/pogo/Data/Battle/BattleLog.proto +++ b/src/POGOProtos/Data/Battle/BattleLog.proto @@ -1,11 +1,9 @@ syntax = "proto3"; package POGOProtos.Data.Battle; -import "Data/Battle/BattlePokemonInfo.proto"; -import "Data/Battle/BattleState.proto"; -import "Data/Battle/BattleType.proto"; -import "Data/Battle/BattleAction.proto"; -import "Data/Player/PlayerPublicProfile.proto"; +import "POGOProtos/Data/Battle/BattleState.proto"; +import "POGOProtos/Data/Battle/BattleType.proto"; +import "POGOProtos/Data/Battle/BattleAction.proto"; message BattleLog { .POGOProtos.Data.Battle.BattleState state = 1; diff --git a/pogo/Data/Battle/BattleParticipant.proto b/src/POGOProtos/Data/Battle/BattleParticipant.proto similarity index 76% rename from pogo/Data/Battle/BattleParticipant.proto rename to src/POGOProtos/Data/Battle/BattleParticipant.proto index c406e4e4c..9a6db71ee 100644 --- a/pogo/Data/Battle/BattleParticipant.proto +++ b/src/POGOProtos/Data/Battle/BattleParticipant.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Data.Battle; -import "Data/Battle/BattlePokemonInfo.proto"; -import "Data/Player/PlayerPublicProfile.proto"; +import "POGOProtos/Data/Battle/BattlePokemonInfo.proto"; +import "POGOProtos/Data/Player/PlayerPublicProfile.proto"; message BattleParticipant { .POGOProtos.Data.Battle.BattlePokemonInfo active_pokemon = 1; diff --git a/pogo/Data/Battle/BattlePokemonInfo.proto b/src/POGOProtos/Data/Battle/BattlePokemonInfo.proto similarity index 80% rename from pogo/Data/Battle/BattlePokemonInfo.proto rename to src/POGOProtos/Data/Battle/BattlePokemonInfo.proto index 797d2d33b..124a276d3 100644 --- a/pogo/Data/Battle/BattlePokemonInfo.proto +++ b/src/POGOProtos/Data/Battle/BattlePokemonInfo.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Data.Battle; -import "Data/PokemonData.proto"; +import "POGOProtos/Data/PokemonData.proto"; message BattlePokemonInfo { .POGOProtos.Data.PokemonData pokemon_data = 1; diff --git a/pogo/Data/Battle/BattleResults.proto b/src/POGOProtos/Data/Battle/BattleResults.proto similarity index 71% rename from pogo/Data/Battle/BattleResults.proto rename to src/POGOProtos/Data/Battle/BattleResults.proto index a88bc0594..5d1d96457 100644 --- a/pogo/Data/Battle/BattleResults.proto +++ b/src/POGOProtos/Data/Battle/BattleResults.proto @@ -1,9 +1,8 @@ syntax = "proto3"; package POGOProtos.Data.Battle; -import "Data/Gym/GymState.proto"; -import "Data/Battle/BattleActionType.proto"; -import "Data/Battle/BattleParticipant.proto"; +import "POGOProtos/Data/Gym/GymState.proto"; +import "POGOProtos/Data/Battle/BattleParticipant.proto"; message BattleResults { .POGOProtos.Data.Gym.GymState gym_state = 1; diff --git a/pogo/Data/Battle/BattleState.proto b/src/POGOProtos/Data/Battle/BattleState.proto similarity index 100% rename from pogo/Data/Battle/BattleState.proto rename to src/POGOProtos/Data/Battle/BattleState.proto diff --git a/pogo/Data/Battle/BattleType.proto b/src/POGOProtos/Data/Battle/BattleType.proto similarity index 100% rename from pogo/Data/Battle/BattleType.proto rename to src/POGOProtos/Data/Battle/BattleType.proto diff --git a/pogo/Data/Capture/CaptureAward.proto b/src/POGOProtos/Data/Capture/CaptureAward.proto similarity index 82% rename from pogo/Data/Capture/CaptureAward.proto rename to src/POGOProtos/Data/Capture/CaptureAward.proto index 560429780..80d8163b1 100644 --- a/pogo/Data/Capture/CaptureAward.proto +++ b/src/POGOProtos/Data/Capture/CaptureAward.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Data.Capture; -import "Enums/ActivityType.proto"; +import "POGOProtos/Enums/ActivityType.proto"; message CaptureAward { repeated .POGOProtos.Enums.ActivityType activity_type = 1; diff --git a/pogo/Data/Capture/CaptureProbability.proto b/src/POGOProtos/Data/Capture/CaptureProbability.proto similarity index 83% rename from pogo/Data/Capture/CaptureProbability.proto rename to src/POGOProtos/Data/Capture/CaptureProbability.proto index d5c4a2e8a..eb85e9b4e 100644 --- a/pogo/Data/Capture/CaptureProbability.proto +++ b/src/POGOProtos/Data/Capture/CaptureProbability.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Data.Capture; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message CaptureProbability { repeated .POGOProtos.Inventory.ItemId pokeball_type = 1; diff --git a/pogo/Data/DownloadUrlEntry.proto b/src/POGOProtos/Data/DownloadUrlEntry.proto similarity index 100% rename from pogo/Data/DownloadUrlEntry.proto rename to src/POGOProtos/Data/DownloadUrlEntry.proto diff --git a/pogo/Data/Gym/GymMembership.proto b/src/POGOProtos/Data/Gym/GymMembership.proto similarity index 65% rename from pogo/Data/Gym/GymMembership.proto rename to src/POGOProtos/Data/Gym/GymMembership.proto index 9a795d947..0b53d8b56 100644 --- a/pogo/Data/Gym/GymMembership.proto +++ b/src/POGOProtos/Data/Gym/GymMembership.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Data.Gym; -import "Data/PokemonData.proto"; -import "Data/Player/PlayerPublicProfile.proto"; +import "POGOProtos/Data/PokemonData.proto"; +import "POGOProtos/Data/Player/PlayerPublicProfile.proto"; message GymMembership { .POGOProtos.Data.PokemonData pokemon_data = 1; diff --git a/pogo/Data/Gym/GymState.proto b/src/POGOProtos/Data/Gym/GymState.proto similarity index 65% rename from pogo/Data/Gym/GymState.proto rename to src/POGOProtos/Data/Gym/GymState.proto index 9568c6c62..40c977574 100644 --- a/pogo/Data/Gym/GymState.proto +++ b/src/POGOProtos/Data/Gym/GymState.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Data.Gym; -import "Map/Fort/FortData.proto"; -import "Data/Gym/GymMembership.proto"; +import "POGOProtos/Map/Fort/FortData.proto"; +import "POGOProtos/Data/Gym/GymMembership.proto"; message GymState { .POGOProtos.Map.Fort.FortData fort_data = 1; diff --git a/pogo/Data/Player/ContactSettings.proto b/src/POGOProtos/Data/Player/ContactSettings.proto similarity index 100% rename from pogo/Data/Player/ContactSettings.proto rename to src/POGOProtos/Data/Player/ContactSettings.proto diff --git a/pogo/Data/Player/Currency.proto b/src/POGOProtos/Data/Player/Currency.proto similarity index 100% rename from pogo/Data/Player/Currency.proto rename to src/POGOProtos/Data/Player/Currency.proto diff --git a/pogo/Data/Player/DailyBonus.proto b/src/POGOProtos/Data/Player/DailyBonus.proto similarity index 100% rename from pogo/Data/Player/DailyBonus.proto rename to src/POGOProtos/Data/Player/DailyBonus.proto diff --git a/pogo/Data/Player/EquippedBadge.proto b/src/POGOProtos/Data/Player/EquippedBadge.proto similarity index 81% rename from pogo/Data/Player/EquippedBadge.proto rename to src/POGOProtos/Data/Player/EquippedBadge.proto index a7e37a54f..fd91b53a0 100644 --- a/pogo/Data/Player/EquippedBadge.proto +++ b/src/POGOProtos/Data/Player/EquippedBadge.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Data.Player; -import "Enums/BadgeType.proto"; +import "POGOProtos/Enums/BadgeType.proto"; message EquippedBadge { .POGOProtos.Enums.BadgeType badge_type = 1; diff --git a/pogo/Data/Player/PlayerAvatar.proto b/src/POGOProtos/Data/Player/PlayerAvatar.proto similarity index 86% rename from pogo/Data/Player/PlayerAvatar.proto rename to src/POGOProtos/Data/Player/PlayerAvatar.proto index 4b271982f..74a41eb81 100644 --- a/pogo/Data/Player/PlayerAvatar.proto +++ b/src/POGOProtos/Data/Player/PlayerAvatar.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Data.Player; -import "Enums/Gender.proto"; +import "POGOProtos/Enums/Gender.proto"; message PlayerAvatar { int32 skin = 2; diff --git a/pogo/Data/Player/PlayerCamera.proto b/src/POGOProtos/Data/Player/PlayerCamera.proto similarity index 100% rename from pogo/Data/Player/PlayerCamera.proto rename to src/POGOProtos/Data/Player/PlayerCamera.proto diff --git a/pogo/Data/Player/PlayerCurrency.proto b/src/POGOProtos/Data/Player/PlayerCurrency.proto similarity index 100% rename from pogo/Data/Player/PlayerCurrency.proto rename to src/POGOProtos/Data/Player/PlayerCurrency.proto diff --git a/pogo/Data/Player/PlayerPublicProfile.proto b/src/POGOProtos/Data/Player/PlayerPublicProfile.proto similarity index 76% rename from pogo/Data/Player/PlayerPublicProfile.proto rename to src/POGOProtos/Data/Player/PlayerPublicProfile.proto index 4f7a3401c..aa2034f76 100644 --- a/pogo/Data/Player/PlayerPublicProfile.proto +++ b/src/POGOProtos/Data/Player/PlayerPublicProfile.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Data.Player; -import "Data/Player/PlayerAvatar.proto"; +import "POGOProtos/Data/Player/PlayerAvatar.proto"; message PlayerPublicProfile { string name = 1; diff --git a/pogo/Data/Player/PlayerStats.proto b/src/POGOProtos/Data/Player/PlayerStats.proto similarity index 100% rename from pogo/Data/Player/PlayerStats.proto rename to src/POGOProtos/Data/Player/PlayerStats.proto diff --git a/pogo/Data/PlayerBadge.proto b/src/POGOProtos/Data/PlayerBadge.proto similarity index 82% rename from pogo/Data/PlayerBadge.proto rename to src/POGOProtos/Data/PlayerBadge.proto index aedfbd5de..1dcb84a83 100644 --- a/pogo/Data/PlayerBadge.proto +++ b/src/POGOProtos/Data/PlayerBadge.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Data; -import "Enums/BadgeType.proto"; +import "POGOProtos/Enums/BadgeType.proto"; message PlayerBadge { .POGOProtos.Enums.BadgeType badge_type = 1; diff --git a/pogo/Data/PlayerData.proto b/src/POGOProtos/Data/PlayerData.proto similarity index 64% rename from pogo/Data/PlayerData.proto rename to src/POGOProtos/Data/PlayerData.proto index d71e9bb22..ef5d44422 100644 --- a/pogo/Data/PlayerData.proto +++ b/src/POGOProtos/Data/PlayerData.proto @@ -1,12 +1,12 @@ syntax = "proto3"; package POGOProtos.Data; -import "Enums/TutorialState.proto"; -import "Data/Player/PlayerAvatar.proto"; -import "Data/Player/DailyBonus.proto"; -import "Data/Player/EquippedBadge.proto"; -import "Data/Player/ContactSettings.proto"; -import "Data/Player/Currency.proto"; +import "POGOProtos/Enums/TutorialState.proto"; +import "POGOProtos/Data/Player/PlayerAvatar.proto"; +import "POGOProtos/Data/Player/DailyBonus.proto"; +import "POGOProtos/Data/Player/EquippedBadge.proto"; +import "POGOProtos/Data/Player/ContactSettings.proto"; +import "POGOProtos/Data/Player/Currency.proto"; message PlayerData { int64 creation_timestamp_ms = 1; diff --git a/pogo/Data/PokedexEntry.proto b/src/POGOProtos/Data/PokedexEntry.proto similarity index 100% rename from pogo/Data/PokedexEntry.proto rename to src/POGOProtos/Data/PokedexEntry.proto diff --git a/pogo/Data/PokemonData.proto b/src/POGOProtos/Data/PokemonData.proto similarity index 91% rename from pogo/Data/PokemonData.proto rename to src/POGOProtos/Data/PokemonData.proto index cc89ed2a9..32060ba80 100644 --- a/pogo/Data/PokemonData.proto +++ b/src/POGOProtos/Data/PokemonData.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Data; -import "Enums/PokemonId.proto"; -import "Enums/PokemonMove.proto"; +import "POGOProtos/Enums/PokemonId.proto"; +import "POGOProtos/Enums/PokemonMove.proto"; message PokemonData { fixed64 id = 1; diff --git a/pogo/Enums/ActivityType.proto b/src/POGOProtos/Enums/ActivityType.proto similarity index 100% rename from pogo/Enums/ActivityType.proto rename to src/POGOProtos/Enums/ActivityType.proto diff --git a/pogo/Enums/BadgeType.proto b/src/POGOProtos/Enums/BadgeType.proto similarity index 100% rename from pogo/Enums/BadgeType.proto rename to src/POGOProtos/Enums/BadgeType.proto diff --git a/pogo/Enums/CameraInterpolation.proto b/src/POGOProtos/Enums/CameraInterpolation.proto similarity index 100% rename from pogo/Enums/CameraInterpolation.proto rename to src/POGOProtos/Enums/CameraInterpolation.proto diff --git a/pogo/Enums/CameraTarget.proto b/src/POGOProtos/Enums/CameraTarget.proto similarity index 100% rename from pogo/Enums/CameraTarget.proto rename to src/POGOProtos/Enums/CameraTarget.proto diff --git a/pogo/Enums/Gender.proto b/src/POGOProtos/Enums/Gender.proto similarity index 100% rename from pogo/Enums/Gender.proto rename to src/POGOProtos/Enums/Gender.proto diff --git a/pogo/Enums/IapItemCategory.proto b/src/POGOProtos/Enums/IapItemCategory.proto similarity index 100% rename from pogo/Enums/IapItemCategory.proto rename to src/POGOProtos/Enums/IapItemCategory.proto diff --git a/pogo/Enums/ItemCategory.proto b/src/POGOProtos/Enums/ItemCategory.proto similarity index 100% rename from pogo/Enums/ItemCategory.proto rename to src/POGOProtos/Enums/ItemCategory.proto diff --git a/pogo/Enums/ItemEffect.proto b/src/POGOProtos/Enums/ItemEffect.proto similarity index 100% rename from pogo/Enums/ItemEffect.proto rename to src/POGOProtos/Enums/ItemEffect.proto diff --git a/pogo/Enums/Platform.proto b/src/POGOProtos/Enums/Platform.proto similarity index 100% rename from pogo/Enums/Platform.proto rename to src/POGOProtos/Enums/Platform.proto diff --git a/pogo/Enums/PokemonClass.proto b/src/POGOProtos/Enums/PokemonClass.proto similarity index 100% rename from pogo/Enums/PokemonClass.proto rename to src/POGOProtos/Enums/PokemonClass.proto diff --git a/pogo/Enums/PokemonFamilyId.proto b/src/POGOProtos/Enums/PokemonFamilyId.proto similarity index 100% rename from pogo/Enums/PokemonFamilyId.proto rename to src/POGOProtos/Enums/PokemonFamilyId.proto diff --git a/pogo/Enums/PokemonId.proto b/src/POGOProtos/Enums/PokemonId.proto similarity index 100% rename from pogo/Enums/PokemonId.proto rename to src/POGOProtos/Enums/PokemonId.proto diff --git a/pogo/Enums/PokemonMove.proto b/src/POGOProtos/Enums/PokemonMove.proto similarity index 100% rename from pogo/Enums/PokemonMove.proto rename to src/POGOProtos/Enums/PokemonMove.proto diff --git a/pogo/Enums/PokemonMovementType.proto b/src/POGOProtos/Enums/PokemonMovementType.proto similarity index 100% rename from pogo/Enums/PokemonMovementType.proto rename to src/POGOProtos/Enums/PokemonMovementType.proto diff --git a/pogo/Enums/PokemonType.proto b/src/POGOProtos/Enums/PokemonType.proto similarity index 100% rename from pogo/Enums/PokemonType.proto rename to src/POGOProtos/Enums/PokemonType.proto diff --git a/pogo/Enums/TeamColor.proto b/src/POGOProtos/Enums/TeamColor.proto similarity index 100% rename from pogo/Enums/TeamColor.proto rename to src/POGOProtos/Enums/TeamColor.proto diff --git a/pogo/Enums/TutorialState.proto b/src/POGOProtos/Enums/TutorialState.proto similarity index 100% rename from pogo/Enums/TutorialState.proto rename to src/POGOProtos/Enums/TutorialState.proto diff --git a/pogo/Inventory/AppliedItem.proto b/src/POGOProtos/Inventory/AppliedItem.proto similarity index 70% rename from pogo/Inventory/AppliedItem.proto rename to src/POGOProtos/Inventory/AppliedItem.proto index 906ac7d33..1a217cb84 100644 --- a/pogo/Inventory/AppliedItem.proto +++ b/src/POGOProtos/Inventory/AppliedItem.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Inventory/ItemId.proto"; -import "Inventory/ItemType.proto"; +import "POGOProtos/Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemType.proto"; message AppliedItem { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Inventory/AppliedItems.proto b/src/POGOProtos/Inventory/AppliedItems.proto similarity index 72% rename from pogo/Inventory/AppliedItems.proto rename to src/POGOProtos/Inventory/AppliedItems.proto index 14e5559aa..aebaf5a2b 100644 --- a/pogo/Inventory/AppliedItems.proto +++ b/src/POGOProtos/Inventory/AppliedItems.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Inventory/AppliedItem.proto"; +import "POGOProtos/Inventory/AppliedItem.proto"; message AppliedItems { repeated .POGOProtos.Inventory.AppliedItem item = 4; diff --git a/pogo/Inventory/EggIncubator.proto b/src/POGOProtos/Inventory/EggIncubator.proto similarity index 77% rename from pogo/Inventory/EggIncubator.proto rename to src/POGOProtos/Inventory/EggIncubator.proto index 8640bea96..98c4f9dda 100644 --- a/pogo/Inventory/EggIncubator.proto +++ b/src/POGOProtos/Inventory/EggIncubator.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Inventory/ItemId.proto"; -import "Inventory/EggIncubatorType.proto"; +import "POGOProtos/Inventory/ItemId.proto"; +import "POGOProtos/Inventory/EggIncubatorType.proto"; message EggIncubator { string id = 1; diff --git a/pogo/Inventory/EggIncubatorType.proto b/src/POGOProtos/Inventory/EggIncubatorType.proto similarity index 100% rename from pogo/Inventory/EggIncubatorType.proto rename to src/POGOProtos/Inventory/EggIncubatorType.proto diff --git a/pogo/Inventory/EggIncubators.proto b/src/POGOProtos/Inventory/EggIncubators.proto similarity index 72% rename from pogo/Inventory/EggIncubators.proto rename to src/POGOProtos/Inventory/EggIncubators.proto index b313c583b..917b10597 100644 --- a/pogo/Inventory/EggIncubators.proto +++ b/src/POGOProtos/Inventory/EggIncubators.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Inventory/EggIncubator.proto"; +import "POGOProtos/Inventory/EggIncubator.proto"; message EggIncubators { .POGOProtos.Inventory.EggIncubator egg_incubator = 1; diff --git a/pogo/Inventory/InventoryDelta.proto b/src/POGOProtos/Inventory/InventoryDelta.proto similarity index 80% rename from pogo/Inventory/InventoryDelta.proto rename to src/POGOProtos/Inventory/InventoryDelta.proto index 1d31d2a0c..7a6f1425e 100644 --- a/pogo/Inventory/InventoryDelta.proto +++ b/src/POGOProtos/Inventory/InventoryDelta.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Inventory/InventoryItem.proto"; +import "POGOProtos/Inventory/InventoryItem.proto"; message InventoryDelta { int64 original_timestamp_ms = 1; diff --git a/pogo/Inventory/InventoryItem.proto b/src/POGOProtos/Inventory/InventoryItem.proto similarity index 78% rename from pogo/Inventory/InventoryItem.proto rename to src/POGOProtos/Inventory/InventoryItem.proto index e259de911..8085216a6 100644 --- a/pogo/Inventory/InventoryItem.proto +++ b/src/POGOProtos/Inventory/InventoryItem.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Inventory/InventoryItemData.proto"; +import "POGOProtos/Inventory/InventoryItemData.proto"; message InventoryItem { int64 modified_timestamp_ms = 1; diff --git a/pogo/Inventory/InventoryItemData.proto b/src/POGOProtos/Inventory/InventoryItemData.proto similarity index 55% rename from pogo/Inventory/InventoryItemData.proto rename to src/POGOProtos/Inventory/InventoryItemData.proto index 87fdf34d2..8eda43f70 100644 --- a/pogo/Inventory/InventoryItemData.proto +++ b/src/POGOProtos/Inventory/InventoryItemData.proto @@ -1,16 +1,16 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Inventory/Item.proto"; -import "Inventory/AppliedItems.proto"; -import "Inventory/EggIncubators.proto"; -import "Inventory/PokemonFamily.proto"; -import "Inventory/InventoryUpgrades.proto"; -import "Data/PokemonData.proto"; -import "Data/PokedexEntry.proto"; -import "Data/Player/PlayerStats.proto"; -import "Data/Player/PlayerCurrency.proto"; -import "Data/Player/PlayerCamera.proto"; +import "POGOProtos/Inventory/Item.proto"; +import "POGOProtos/Inventory/AppliedItems.proto"; +import "POGOProtos/Inventory/EggIncubators.proto"; +import "POGOProtos/Inventory/PokemonFamily.proto"; +import "POGOProtos/Inventory/InventoryUpgrades.proto"; +import "POGOProtos/Data/PokemonData.proto"; +import "POGOProtos/Data/PokedexEntry.proto"; +import "POGOProtos/Data/Player/PlayerStats.proto"; +import "POGOProtos/Data/Player/PlayerCurrency.proto"; +import "POGOProtos/Data/Player/PlayerCamera.proto"; message InventoryItemData { .POGOProtos.Data.PokemonData pokemon_data = 1; diff --git a/pogo/Inventory/InventoryUpgrade.proto b/src/POGOProtos/Inventory/InventoryUpgrade.proto similarity index 67% rename from pogo/Inventory/InventoryUpgrade.proto rename to src/POGOProtos/Inventory/InventoryUpgrade.proto index bf6f7da35..48d1aeb85 100644 --- a/pogo/Inventory/InventoryUpgrade.proto +++ b/src/POGOProtos/Inventory/InventoryUpgrade.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Inventory/ItemId.proto"; -import "Inventory/InventoryUpgradeType.proto"; +import "POGOProtos/Inventory/ItemId.proto"; +import "POGOProtos/Inventory/InventoryUpgradeType.proto"; message InventoryUpgrade { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Inventory/InventoryUpgradeType.proto b/src/POGOProtos/Inventory/InventoryUpgradeType.proto similarity index 100% rename from pogo/Inventory/InventoryUpgradeType.proto rename to src/POGOProtos/Inventory/InventoryUpgradeType.proto diff --git a/pogo/Inventory/InventoryUpgrades.proto b/src/POGOProtos/Inventory/InventoryUpgrades.proto similarity index 70% rename from pogo/Inventory/InventoryUpgrades.proto rename to src/POGOProtos/Inventory/InventoryUpgrades.proto index 0b815d300..d1fc27d0b 100644 --- a/pogo/Inventory/InventoryUpgrades.proto +++ b/src/POGOProtos/Inventory/InventoryUpgrades.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Inventory/InventoryUpgrade.proto"; +import "POGOProtos/Inventory/InventoryUpgrade.proto"; message InventoryUpgrades { repeated InventoryUpgrade inventory_upgrades = 1; diff --git a/pogo/Inventory/Item.proto b/src/POGOProtos/Inventory/Item.proto similarity index 76% rename from pogo/Inventory/Item.proto rename to src/POGOProtos/Inventory/Item.proto index 29a41551b..4089da359 100644 --- a/pogo/Inventory/Item.proto +++ b/src/POGOProtos/Inventory/Item.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message Item { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Inventory/ItemAward.proto b/src/POGOProtos/Inventory/ItemAward.proto similarity index 75% rename from pogo/Inventory/ItemAward.proto rename to src/POGOProtos/Inventory/ItemAward.proto index 05db0a0a1..6bf2e3151 100644 --- a/pogo/Inventory/ItemAward.proto +++ b/src/POGOProtos/Inventory/ItemAward.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message ItemAward { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Inventory/ItemId.proto b/src/POGOProtos/Inventory/ItemId.proto similarity index 100% rename from pogo/Inventory/ItemId.proto rename to src/POGOProtos/Inventory/ItemId.proto diff --git a/pogo/Inventory/ItemType.proto b/src/POGOProtos/Inventory/ItemType.proto similarity index 100% rename from pogo/Inventory/ItemType.proto rename to src/POGOProtos/Inventory/ItemType.proto diff --git a/pogo/Inventory/PokemonFamily.proto b/src/POGOProtos/Inventory/PokemonFamily.proto similarity index 74% rename from pogo/Inventory/PokemonFamily.proto rename to src/POGOProtos/Inventory/PokemonFamily.proto index 9b15d5eea..8ea111174 100644 --- a/pogo/Inventory/PokemonFamily.proto +++ b/src/POGOProtos/Inventory/PokemonFamily.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Inventory; -import "Enums/PokemonFamilyId.proto"; +import "POGOProtos/Enums/PokemonFamilyId.proto"; message PokemonFamily { .POGOProtos.Enums.PokemonFamilyId family_id = 1; diff --git a/pogo/Map/Fort/FortData.proto b/src/POGOProtos/Map/Fort/FortData.proto similarity index 78% rename from pogo/Map/Fort/FortData.proto rename to src/POGOProtos/Map/Fort/FortData.proto index a8420e879..2d550b566 100644 --- a/pogo/Map/Fort/FortData.proto +++ b/src/POGOProtos/Map/Fort/FortData.proto @@ -1,12 +1,12 @@ syntax = "proto3"; package POGOProtos.Map.Fort; -import "Enums/PokemonId.proto"; -import "Enums/TeamColor.proto"; -import "Map/Fort/FortType.proto"; -import "Map/Fort/FortSponsor.proto"; -import "Map/Fort/FortRenderingType.proto"; -import "Map/Fort/FortLureInfo.proto"; +import "POGOProtos/Enums/PokemonId.proto"; +import "POGOProtos/Enums/TeamColor.proto"; +import "POGOProtos/Map/Fort/FortType.proto"; +import "POGOProtos/Map/Fort/FortSponsor.proto"; +import "POGOProtos/Map/Fort/FortRenderingType.proto"; +import "POGOProtos/Map/Fort/FortLureInfo.proto"; message FortData { string id = 1; diff --git a/pogo/Map/Fort/FortLureInfo.proto b/src/POGOProtos/Map/Fort/FortLureInfo.proto similarity index 82% rename from pogo/Map/Fort/FortLureInfo.proto rename to src/POGOProtos/Map/Fort/FortLureInfo.proto index ccf2d8991..78bd870da 100644 --- a/pogo/Map/Fort/FortLureInfo.proto +++ b/src/POGOProtos/Map/Fort/FortLureInfo.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Map.Fort; -import "Enums/PokemonId.proto"; +import "POGOProtos/Enums/PokemonId.proto"; message FortLureInfo { string fort_id = 1; diff --git a/pogo/Map/Fort/FortModifier.proto b/src/POGOProtos/Map/Fort/FortModifier.proto similarity index 81% rename from pogo/Map/Fort/FortModifier.proto rename to src/POGOProtos/Map/Fort/FortModifier.proto index 72e6c52ac..32d2be397 100644 --- a/pogo/Map/Fort/FortModifier.proto +++ b/src/POGOProtos/Map/Fort/FortModifier.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Map.Fort; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message FortModifier { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Map/Fort/FortRenderingType.proto b/src/POGOProtos/Map/Fort/FortRenderingType.proto similarity index 100% rename from pogo/Map/Fort/FortRenderingType.proto rename to src/POGOProtos/Map/Fort/FortRenderingType.proto diff --git a/pogo/Map/Fort/FortSponsor.proto b/src/POGOProtos/Map/Fort/FortSponsor.proto similarity index 100% rename from pogo/Map/Fort/FortSponsor.proto rename to src/POGOProtos/Map/Fort/FortSponsor.proto diff --git a/pogo/Map/Fort/FortSummary.proto b/src/POGOProtos/Map/Fort/FortSummary.proto similarity index 100% rename from pogo/Map/Fort/FortSummary.proto rename to src/POGOProtos/Map/Fort/FortSummary.proto diff --git a/pogo/Map/Fort/FortType.proto b/src/POGOProtos/Map/Fort/FortType.proto similarity index 100% rename from pogo/Map/Fort/FortType.proto rename to src/POGOProtos/Map/Fort/FortType.proto diff --git a/pogo/Map/MapCell.proto b/src/POGOProtos/Map/MapCell.proto similarity index 77% rename from pogo/Map/MapCell.proto rename to src/POGOProtos/Map/MapCell.proto index 3b9447907..1c3dee232 100644 --- a/pogo/Map/MapCell.proto +++ b/src/POGOProtos/Map/MapCell.proto @@ -1,12 +1,12 @@ syntax = "proto3"; package POGOProtos.Map; -import "Map/SpawnPoint.proto"; -import "Map/Fort/FortData.proto"; -import "Map/Fort/FortSummary.proto"; -import "Map/Pokemon/NearbyPokemon.proto"; -import "Map/Pokemon/WildPokemon.proto"; -import "Map/Pokemon/MapPokemon.proto"; +import "POGOProtos/Map/SpawnPoint.proto"; +import "POGOProtos/Map/Fort/FortData.proto"; +import "POGOProtos/Map/Fort/FortSummary.proto"; +import "POGOProtos/Map/Pokemon/NearbyPokemon.proto"; +import "POGOProtos/Map/Pokemon/WildPokemon.proto"; +import "POGOProtos/Map/Pokemon/MapPokemon.proto"; // A cell is a geographical "zone" containing objects like pokemon, gyms, and pokestops. message MapCell { diff --git a/pogo/Map/MapObjectsStatus.proto b/src/POGOProtos/Map/MapObjectsStatus.proto similarity index 100% rename from pogo/Map/MapObjectsStatus.proto rename to src/POGOProtos/Map/MapObjectsStatus.proto diff --git a/pogo/Map/Pokemon/MapPokemon.proto b/src/POGOProtos/Map/Pokemon/MapPokemon.proto similarity index 87% rename from pogo/Map/Pokemon/MapPokemon.proto rename to src/POGOProtos/Map/Pokemon/MapPokemon.proto index c0232e855..fc171f136 100644 --- a/pogo/Map/Pokemon/MapPokemon.proto +++ b/src/POGOProtos/Map/Pokemon/MapPokemon.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Map.Pokemon; -import "Enums/PokemonId.proto"; +import "POGOProtos/Enums/PokemonId.proto"; message MapPokemon { string spawnpoint_id = 1; diff --git a/pogo/Map/Pokemon/NearbyPokemon.proto b/src/POGOProtos/Map/Pokemon/NearbyPokemon.proto similarity index 80% rename from pogo/Map/Pokemon/NearbyPokemon.proto rename to src/POGOProtos/Map/Pokemon/NearbyPokemon.proto index fd65f74b7..72bcfe945 100644 --- a/pogo/Map/Pokemon/NearbyPokemon.proto +++ b/src/POGOProtos/Map/Pokemon/NearbyPokemon.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Map.Pokemon; -import "Enums/PokemonId.proto"; +import "POGOProtos/Enums/PokemonId.proto"; message NearbyPokemon { .POGOProtos.Enums.PokemonId pokemon_id = 1; diff --git a/pogo/Map/Pokemon/WildPokemon.proto b/src/POGOProtos/Map/Pokemon/WildPokemon.proto similarity index 87% rename from pogo/Map/Pokemon/WildPokemon.proto rename to src/POGOProtos/Map/Pokemon/WildPokemon.proto index eae8dfb99..7c079b127 100644 --- a/pogo/Map/Pokemon/WildPokemon.proto +++ b/src/POGOProtos/Map/Pokemon/WildPokemon.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Map.Pokemon; -import "Data/PokemonData.proto"; +import "POGOProtos/Data/PokemonData.proto"; message WildPokemon { fixed64 encounter_id = 1; diff --git a/pogo/Map/SpawnPoint.proto b/src/POGOProtos/Map/SpawnPoint.proto similarity index 100% rename from pogo/Map/SpawnPoint.proto rename to src/POGOProtos/Map/SpawnPoint.proto diff --git a/pogo/Networking/Envelopes/AuthTicket.proto b/src/POGOProtos/Networking/Envelopes/AuthTicket.proto similarity index 100% rename from pogo/Networking/Envelopes/AuthTicket.proto rename to src/POGOProtos/Networking/Envelopes/AuthTicket.proto diff --git a/pogo/Networking/Envelopes/RequestEnvelope.proto b/src/POGOProtos/Networking/Envelopes/RequestEnvelope.proto similarity index 77% rename from pogo/Networking/Envelopes/RequestEnvelope.proto rename to src/POGOProtos/Networking/Envelopes/RequestEnvelope.proto index 1d0b3be8d..c10f39fde 100644 --- a/pogo/Networking/Envelopes/RequestEnvelope.proto +++ b/src/POGOProtos/Networking/Envelopes/RequestEnvelope.proto @@ -1,9 +1,9 @@ syntax = "proto3"; package POGOProtos.Networking.Envelopes; -import "Networking/Requests/Request.proto"; -import "Networking/Envelopes/AuthTicket.proto"; -import "Networking/Envelopes/Unknown6.proto"; +import "POGOProtos/Networking/Requests/Request.proto"; +import "POGOProtos/Networking/Envelopes/AuthTicket.proto"; +import "POGOProtos/Networking/Envelopes/Unknown6.proto"; message RequestEnvelope { int32 status_code = 1; diff --git a/pogo/Networking/Envelopes/ResponseEnvelope.proto b/src/POGOProtos/Networking/Envelopes/ResponseEnvelope.proto similarity index 78% rename from pogo/Networking/Envelopes/ResponseEnvelope.proto rename to src/POGOProtos/Networking/Envelopes/ResponseEnvelope.proto index 64b0803e1..f6d0dcbd7 100644 --- a/pogo/Networking/Envelopes/ResponseEnvelope.proto +++ b/src/POGOProtos/Networking/Envelopes/ResponseEnvelope.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Networking.Envelopes; -import "Networking/Envelopes/AuthTicket.proto"; -import "Networking/Envelopes/Unknown6.proto"; +import "POGOProtos/Networking/Envelopes/AuthTicket.proto"; +import "POGOProtos/Networking/Envelopes/Unknown6.proto"; message ResponseEnvelope { int32 status_code = 1; diff --git a/pogo/Networking/Envelopes/Unknown6.proto b/src/POGOProtos/Networking/Envelopes/Unknown6.proto similarity index 100% rename from pogo/Networking/Envelopes/Unknown6.proto rename to src/POGOProtos/Networking/Envelopes/Unknown6.proto diff --git a/pogo/Networking/Requests/Messages/AddFortModifierMessage.proto b/src/POGOProtos/Networking/Requests/Messages/AddFortModifierMessage.proto similarity index 84% rename from pogo/Networking/Requests/Messages/AddFortModifierMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/AddFortModifierMessage.proto index 97698a675..957e02b90 100644 --- a/pogo/Networking/Requests/Messages/AddFortModifierMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/AddFortModifierMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message AddFortModifierMessage { .POGOProtos.Inventory.ItemId modifier_type = 1; diff --git a/pogo/Networking/Requests/Messages/AttackGymMessage.proto b/src/POGOProtos/Networking/Requests/Messages/AttackGymMessage.proto similarity index 86% rename from pogo/Networking/Requests/Messages/AttackGymMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/AttackGymMessage.proto index 188c632a8..b00d43e08 100644 --- a/pogo/Networking/Requests/Messages/AttackGymMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/AttackGymMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Data/Battle/BattleAction.proto"; +import "POGOProtos/Data/Battle/BattleAction.proto"; message AttackGymMessage { string gym_id = 1; diff --git a/pogo/Networking/Requests/Messages/CatchPokemonMessage.proto b/src/POGOProtos/Networking/Requests/Messages/CatchPokemonMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/CatchPokemonMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/CatchPokemonMessage.proto diff --git a/pogo/Networking/Requests/Messages/CheckAwardedBadgesMessage.proto b/src/POGOProtos/Networking/Requests/Messages/CheckAwardedBadgesMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/CheckAwardedBadgesMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/CheckAwardedBadgesMessage.proto diff --git a/pogo/Networking/Requests/Messages/CheckCodenameAvailableMessage.proto b/src/POGOProtos/Networking/Requests/Messages/CheckCodenameAvailableMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/CheckCodenameAvailableMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/CheckCodenameAvailableMessage.proto diff --git a/pogo/Networking/Requests/Messages/ClaimCodenameMessage.proto b/src/POGOProtos/Networking/Requests/Messages/ClaimCodenameMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/ClaimCodenameMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/ClaimCodenameMessage.proto diff --git a/pogo/Networking/Requests/Messages/CollectDailyBonusMessage.proto b/src/POGOProtos/Networking/Requests/Messages/CollectDailyBonusMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/CollectDailyBonusMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/CollectDailyBonusMessage.proto diff --git a/pogo/Networking/Requests/Messages/CollectDailyDefenderBonusMessage.proto b/src/POGOProtos/Networking/Requests/Messages/CollectDailyDefenderBonusMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/CollectDailyDefenderBonusMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/CollectDailyDefenderBonusMessage.proto diff --git a/pogo/Networking/Requests/Messages/DiskEncounterMessage.proto b/src/POGOProtos/Networking/Requests/Messages/DiskEncounterMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/DiskEncounterMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/DiskEncounterMessage.proto diff --git a/pogo/Networking/Requests/Messages/DownloadItemTemplatesMessage.proto b/src/POGOProtos/Networking/Requests/Messages/DownloadItemTemplatesMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/DownloadItemTemplatesMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/DownloadItemTemplatesMessage.proto diff --git a/pogo/Networking/Requests/Messages/DownloadRemoteConfigVersionMessage.proto b/src/POGOProtos/Networking/Requests/Messages/DownloadRemoteConfigVersionMessage.proto similarity index 86% rename from pogo/Networking/Requests/Messages/DownloadRemoteConfigVersionMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/DownloadRemoteConfigVersionMessage.proto index f61fc0623..062c92726 100644 --- a/pogo/Networking/Requests/Messages/DownloadRemoteConfigVersionMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/DownloadRemoteConfigVersionMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Enums/Platform.proto"; +import "POGOProtos/Enums/Platform.proto"; message DownloadRemoteConfigVersionMessage { .POGOProtos.Enums.Platform platform = 1; diff --git a/pogo/Networking/Requests/Messages/DownloadSettingsMessage.proto b/src/POGOProtos/Networking/Requests/Messages/DownloadSettingsMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/DownloadSettingsMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/DownloadSettingsMessage.proto diff --git a/pogo/Networking/Requests/Messages/EchoMessage.proto b/src/POGOProtos/Networking/Requests/Messages/EchoMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/EchoMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/EchoMessage.proto diff --git a/pogo/Networking/Requests/Messages/EncounterMessage.proto b/src/POGOProtos/Networking/Requests/Messages/EncounterMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/EncounterMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/EncounterMessage.proto diff --git a/pogo/Networking/Requests/Messages/EncounterTutorialCompleteMessage.proto b/src/POGOProtos/Networking/Requests/Messages/EncounterTutorialCompleteMessage.proto similarity index 79% rename from pogo/Networking/Requests/Messages/EncounterTutorialCompleteMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/EncounterTutorialCompleteMessage.proto index 2c37dea5e..575cd92e4 100644 --- a/pogo/Networking/Requests/Messages/EncounterTutorialCompleteMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/EncounterTutorialCompleteMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Enums/PokemonId.proto"; +import "POGOProtos/Enums/PokemonId.proto"; message EncounterTutorialCompleteMessage { .POGOProtos.Enums.PokemonId pokemon_id = 1; diff --git a/pogo/Networking/Requests/Messages/EquipBadgeMessage.proto b/src/POGOProtos/Networking/Requests/Messages/EquipBadgeMessage.proto similarity index 77% rename from pogo/Networking/Requests/Messages/EquipBadgeMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/EquipBadgeMessage.proto index 2718c12c3..1d63e011d 100644 --- a/pogo/Networking/Requests/Messages/EquipBadgeMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/EquipBadgeMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Enums/BadgeType.proto"; +import "POGOProtos/Enums/BadgeType.proto"; message EquipBadgeMessage { .POGOProtos.Enums.BadgeType badge_type = 1; diff --git a/pogo/Networking/Requests/Messages/EvolvePokemonMessage.proto b/src/POGOProtos/Networking/Requests/Messages/EvolvePokemonMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/EvolvePokemonMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/EvolvePokemonMessage.proto diff --git a/pogo/Networking/Requests/Messages/FortDeployPokemonMessage.proto b/src/POGOProtos/Networking/Requests/Messages/FortDeployPokemonMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/FortDeployPokemonMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/FortDeployPokemonMessage.proto diff --git a/pogo/Networking/Requests/Messages/FortDetailsMessage.proto b/src/POGOProtos/Networking/Requests/Messages/FortDetailsMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/FortDetailsMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/FortDetailsMessage.proto diff --git a/pogo/Networking/Requests/Messages/FortRecallPokemonMessage.proto b/src/POGOProtos/Networking/Requests/Messages/FortRecallPokemonMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/FortRecallPokemonMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/FortRecallPokemonMessage.proto diff --git a/pogo/Networking/Requests/Messages/FortSearchMessage.proto b/src/POGOProtos/Networking/Requests/Messages/FortSearchMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/FortSearchMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/FortSearchMessage.proto diff --git a/pogo/Networking/Requests/Messages/GetAssetDigestMessage.proto b/src/POGOProtos/Networking/Requests/Messages/GetAssetDigestMessage.proto similarity index 85% rename from pogo/Networking/Requests/Messages/GetAssetDigestMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/GetAssetDigestMessage.proto index 60d30fdf4..d299cd981 100644 --- a/pogo/Networking/Requests/Messages/GetAssetDigestMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/GetAssetDigestMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Enums/Platform.proto"; +import "POGOProtos/Enums/Platform.proto"; message GetAssetDigestMessage { .POGOProtos.Enums.Platform platform = 1; diff --git a/pogo/Networking/Requests/Messages/GetDownloadUrlsMessage.proto b/src/POGOProtos/Networking/Requests/Messages/GetDownloadUrlsMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/GetDownloadUrlsMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/GetDownloadUrlsMessage.proto diff --git a/pogo/Networking/Requests/Messages/GetGymDetailsMessage.proto b/src/POGOProtos/Networking/Requests/Messages/GetGymDetailsMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/GetGymDetailsMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/GetGymDetailsMessage.proto diff --git a/pogo/Networking/Requests/Messages/GetHatchedEggsMessage.proto b/src/POGOProtos/Networking/Requests/Messages/GetHatchedEggsMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/GetHatchedEggsMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/GetHatchedEggsMessage.proto diff --git a/pogo/Networking/Requests/Messages/GetIncensePokemonMessage.proto b/src/POGOProtos/Networking/Requests/Messages/GetIncensePokemonMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/GetIncensePokemonMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/GetIncensePokemonMessage.proto diff --git a/pogo/Networking/Requests/Messages/GetInventoryMessage.proto b/src/POGOProtos/Networking/Requests/Messages/GetInventoryMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/GetInventoryMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/GetInventoryMessage.proto diff --git a/pogo/Networking/Requests/Messages/GetMapObjectsMessage.proto b/src/POGOProtos/Networking/Requests/Messages/GetMapObjectsMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/GetMapObjectsMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/GetMapObjectsMessage.proto diff --git a/pogo/Networking/Requests/Messages/GetPlayerMessage.proto b/src/POGOProtos/Networking/Requests/Messages/GetPlayerMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/GetPlayerMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/GetPlayerMessage.proto diff --git a/pogo/Networking/Requests/Messages/GetPlayerProfileMessage.proto b/src/POGOProtos/Networking/Requests/Messages/GetPlayerProfileMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/GetPlayerProfileMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/GetPlayerProfileMessage.proto diff --git a/pogo/Networking/Requests/Messages/GetSuggestedCodenamesMessage.proto b/src/POGOProtos/Networking/Requests/Messages/GetSuggestedCodenamesMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/GetSuggestedCodenamesMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/GetSuggestedCodenamesMessage.proto diff --git a/pogo/Networking/Requests/Messages/IncenseEncounterMessage.proto b/src/POGOProtos/Networking/Requests/Messages/IncenseEncounterMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/IncenseEncounterMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/IncenseEncounterMessage.proto diff --git a/pogo/Networking/Requests/Messages/LevelUpRewardsMessage.proto b/src/POGOProtos/Networking/Requests/Messages/LevelUpRewardsMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/LevelUpRewardsMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/LevelUpRewardsMessage.proto diff --git a/pogo/Networking/Requests/Messages/MarkTutorialCompleteMessage.proto b/src/POGOProtos/Networking/Requests/Messages/MarkTutorialCompleteMessage.proto similarity index 83% rename from pogo/Networking/Requests/Messages/MarkTutorialCompleteMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/MarkTutorialCompleteMessage.proto index d5e2fbb7b..32262ce3e 100644 --- a/pogo/Networking/Requests/Messages/MarkTutorialCompleteMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/MarkTutorialCompleteMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Enums/TutorialState.proto"; +import "POGOProtos/Enums/TutorialState.proto"; message MarkTutorialCompleteMessage { repeated .POGOProtos.Enums.TutorialState tutorials_completed = 1; diff --git a/pogo/Networking/Requests/Messages/NicknamePokemonMessage.proto b/src/POGOProtos/Networking/Requests/Messages/NicknamePokemonMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/NicknamePokemonMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/NicknamePokemonMessage.proto diff --git a/pogo/Networking/Requests/Messages/PlayerUpdateMessage.proto b/src/POGOProtos/Networking/Requests/Messages/PlayerUpdateMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/PlayerUpdateMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/PlayerUpdateMessage.proto diff --git a/pogo/Networking/Requests/Messages/README.txt b/src/POGOProtos/Networking/Requests/Messages/README.txt similarity index 100% rename from pogo/Networking/Requests/Messages/README.txt rename to src/POGOProtos/Networking/Requests/Messages/README.txt diff --git a/pogo/Networking/Requests/Messages/RecycleInventoryItemMessage.proto b/src/POGOProtos/Networking/Requests/Messages/RecycleInventoryItemMessage.proto similarity index 79% rename from pogo/Networking/Requests/Messages/RecycleInventoryItemMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/RecycleInventoryItemMessage.proto index 580529337..5e68e02f1 100644 --- a/pogo/Networking/Requests/Messages/RecycleInventoryItemMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/RecycleInventoryItemMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message RecycleInventoryItemMessage { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Networking/Requests/Messages/ReleasePokemonMessage.proto b/src/POGOProtos/Networking/Requests/Messages/ReleasePokemonMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/ReleasePokemonMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/ReleasePokemonMessage.proto diff --git a/pogo/Networking/Requests/Messages/SetAvatarMessage.proto b/src/POGOProtos/Networking/Requests/Messages/SetAvatarMessage.proto similarity index 75% rename from pogo/Networking/Requests/Messages/SetAvatarMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/SetAvatarMessage.proto index 57a3c95c6..c54bdd27f 100644 --- a/pogo/Networking/Requests/Messages/SetAvatarMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/SetAvatarMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Data/Player/PlayerAvatar.proto"; +import "POGOProtos/Data/Player/PlayerAvatar.proto"; message SetAvatarMessage { .POGOProtos.Data.Player.PlayerAvatar player_avatar = 2; diff --git a/pogo/Networking/Requests/Messages/SetContactSettingsMessage.proto b/src/POGOProtos/Networking/Requests/Messages/SetContactSettingsMessage.proto similarity index 75% rename from pogo/Networking/Requests/Messages/SetContactSettingsMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/SetContactSettingsMessage.proto index c50ea9fc3..e533d14a9 100644 --- a/pogo/Networking/Requests/Messages/SetContactSettingsMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/SetContactSettingsMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Data/Player/ContactSettings.proto"; +import "POGOProtos/Data/Player/ContactSettings.proto"; message SetContactSettingsMessage { .POGOProtos.Data.Player.ContactSettings contact_settings = 1; diff --git a/pogo/Networking/Requests/Messages/SetFavoritePokemonMessage.proto b/src/POGOProtos/Networking/Requests/Messages/SetFavoritePokemonMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/SetFavoritePokemonMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/SetFavoritePokemonMessage.proto diff --git a/pogo/Networking/Requests/Messages/SetPlayerTeamMessage.proto b/src/POGOProtos/Networking/Requests/Messages/SetPlayerTeamMessage.proto similarity index 76% rename from pogo/Networking/Requests/Messages/SetPlayerTeamMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/SetPlayerTeamMessage.proto index fd6ad8d72..1efdcf808 100644 --- a/pogo/Networking/Requests/Messages/SetPlayerTeamMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/SetPlayerTeamMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Enums/TeamColor.proto"; +import "POGOProtos/Enums/TeamColor.proto"; message SetPlayerTeamMessage { .POGOProtos.Enums.TeamColor team = 1; diff --git a/pogo/Networking/Requests/Messages/StartGymBattleMessage.proto b/src/POGOProtos/Networking/Requests/Messages/StartGymBattleMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/StartGymBattleMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/StartGymBattleMessage.proto diff --git a/pogo/Networking/Requests/Messages/UpgradePokemonMessage.proto b/src/POGOProtos/Networking/Requests/Messages/UpgradePokemonMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/UpgradePokemonMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/UpgradePokemonMessage.proto diff --git a/pogo/Networking/Requests/Messages/UseIncenseMessage.proto b/src/POGOProtos/Networking/Requests/Messages/UseIncenseMessage.proto similarity index 77% rename from pogo/Networking/Requests/Messages/UseIncenseMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/UseIncenseMessage.proto index 285378b55..2b6e9dbf6 100644 --- a/pogo/Networking/Requests/Messages/UseIncenseMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/UseIncenseMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message UseIncenseMessage { .POGOProtos.Inventory.ItemId incense_type = 1; diff --git a/pogo/Networking/Requests/Messages/UseItemCaptureMessage.proto b/src/POGOProtos/Networking/Requests/Messages/UseItemCaptureMessage.proto similarity index 82% rename from pogo/Networking/Requests/Messages/UseItemCaptureMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/UseItemCaptureMessage.proto index e8706ca22..a5be2b9f1 100644 --- a/pogo/Networking/Requests/Messages/UseItemCaptureMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/UseItemCaptureMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message UseItemCaptureMessage { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Networking/Requests/Messages/UseItemEggIncubatorMessage.proto b/src/POGOProtos/Networking/Requests/Messages/UseItemEggIncubatorMessage.proto similarity index 100% rename from pogo/Networking/Requests/Messages/UseItemEggIncubatorMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/UseItemEggIncubatorMessage.proto diff --git a/pogo/Networking/Requests/Messages/UseItemGymMessage.proto b/src/POGOProtos/Networking/Requests/Messages/UseItemGymMessage.proto similarity index 83% rename from pogo/Networking/Requests/Messages/UseItemGymMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/UseItemGymMessage.proto index 633fb31d3..585eaa32a 100644 --- a/pogo/Networking/Requests/Messages/UseItemGymMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/UseItemGymMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message UseItemGymMessage { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Networking/Requests/Messages/UseItemPotionMessage.proto b/src/POGOProtos/Networking/Requests/Messages/UseItemPotionMessage.proto similarity index 79% rename from pogo/Networking/Requests/Messages/UseItemPotionMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/UseItemPotionMessage.proto index 1f7bd7c9e..82881ce1f 100644 --- a/pogo/Networking/Requests/Messages/UseItemPotionMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/UseItemPotionMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message UseItemPotionMessage { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Networking/Requests/Messages/UseItemReviveMessage.proto b/src/POGOProtos/Networking/Requests/Messages/UseItemReviveMessage.proto similarity index 79% rename from pogo/Networking/Requests/Messages/UseItemReviveMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/UseItemReviveMessage.proto index fd5cd2f1d..34744985a 100644 --- a/pogo/Networking/Requests/Messages/UseItemReviveMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/UseItemReviveMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message UseItemReviveMessage { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Networking/Requests/Messages/UseItemXpBoostMessage.proto b/src/POGOProtos/Networking/Requests/Messages/UseItemXpBoostMessage.proto similarity index 76% rename from pogo/Networking/Requests/Messages/UseItemXpBoostMessage.proto rename to src/POGOProtos/Networking/Requests/Messages/UseItemXpBoostMessage.proto index 172eb0ade..f863990bb 100644 --- a/pogo/Networking/Requests/Messages/UseItemXpBoostMessage.proto +++ b/src/POGOProtos/Networking/Requests/Messages/UseItemXpBoostMessage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests.Messages; -import "Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message UseItemXpBoostMessage { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Networking/Requests/Messages/base.proto.txt b/src/POGOProtos/Networking/Requests/Messages/base.proto.txt similarity index 100% rename from pogo/Networking/Requests/Messages/base.proto.txt rename to src/POGOProtos/Networking/Requests/Messages/base.proto.txt diff --git a/pogo/Networking/Requests/Request.proto b/src/POGOProtos/Networking/Requests/Request.proto similarity index 74% rename from pogo/Networking/Requests/Request.proto rename to src/POGOProtos/Networking/Requests/Request.proto index 0678f1cf4..a5c3c601a 100644 --- a/pogo/Networking/Requests/Request.proto +++ b/src/POGOProtos/Networking/Requests/Request.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Requests; -import "Networking/Requests/RequestType.proto"; +import "POGOProtos/Networking/Requests/RequestType.proto"; message Request { .POGOProtos.Networking.Requests.RequestType request_type = 1; diff --git a/pogo/Networking/Requests/RequestType.proto b/src/POGOProtos/Networking/Requests/RequestType.proto similarity index 100% rename from pogo/Networking/Requests/RequestType.proto rename to src/POGOProtos/Networking/Requests/RequestType.proto diff --git a/pogo/Networking/Responses/AddFortModifierResponse.proto b/src/POGOProtos/Networking/Responses/AddFortModifierResponse.proto similarity index 100% rename from pogo/Networking/Responses/AddFortModifierResponse.proto rename to src/POGOProtos/Networking/Responses/AddFortModifierResponse.proto diff --git a/pogo/Networking/Responses/AttackGymResponse.proto b/src/POGOProtos/Networking/Responses/AttackGymResponse.proto similarity index 81% rename from pogo/Networking/Responses/AttackGymResponse.proto rename to src/POGOProtos/Networking/Responses/AttackGymResponse.proto index f0d54a0cd..3f3f2aca9 100644 --- a/pogo/Networking/Responses/AttackGymResponse.proto +++ b/src/POGOProtos/Networking/Responses/AttackGymResponse.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/Battle/BattleLog.proto"; -import "Data/Battle/BattlePokemonInfo.proto"; +import "POGOProtos/Data/Battle/BattleLog.proto"; +import "POGOProtos/Data/Battle/BattlePokemonInfo.proto"; message AttackGymResponse { .POGOProtos.Networking.Responses.AttackGymResponse.Result result = 1; diff --git a/pogo/Networking/Responses/CatchPokemonResponse.proto b/src/POGOProtos/Networking/Responses/CatchPokemonResponse.proto similarity index 88% rename from pogo/Networking/Responses/CatchPokemonResponse.proto rename to src/POGOProtos/Networking/Responses/CatchPokemonResponse.proto index 038394a94..1d3689c63 100644 --- a/pogo/Networking/Responses/CatchPokemonResponse.proto +++ b/src/POGOProtos/Networking/Responses/CatchPokemonResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/Capture/CaptureAward.proto"; +import "POGOProtos/Data/Capture/CaptureAward.proto"; message CatchPokemonResponse { .POGOProtos.Networking.Responses.CatchPokemonResponse.CatchStatus status = 1; diff --git a/pogo/Networking/Responses/CheckAwardedBadgesResponse.proto b/src/POGOProtos/Networking/Responses/CheckAwardedBadgesResponse.proto similarity index 83% rename from pogo/Networking/Responses/CheckAwardedBadgesResponse.proto rename to src/POGOProtos/Networking/Responses/CheckAwardedBadgesResponse.proto index b8025488a..0ff0bbbab 100644 --- a/pogo/Networking/Responses/CheckAwardedBadgesResponse.proto +++ b/src/POGOProtos/Networking/Responses/CheckAwardedBadgesResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Enums/BadgeType.proto"; +import "POGOProtos/Enums/BadgeType.proto"; message CheckAwardedBadgesResponse { bool success = 1; diff --git a/pogo/Networking/Responses/CheckCodenameAvailableResponse.proto b/src/POGOProtos/Networking/Responses/CheckCodenameAvailableResponse.proto similarity index 100% rename from pogo/Networking/Responses/CheckCodenameAvailableResponse.proto rename to src/POGOProtos/Networking/Responses/CheckCodenameAvailableResponse.proto diff --git a/pogo/Networking/Responses/ClaimCodenameResponse.proto b/src/POGOProtos/Networking/Responses/ClaimCodenameResponse.proto similarity index 100% rename from pogo/Networking/Responses/ClaimCodenameResponse.proto rename to src/POGOProtos/Networking/Responses/ClaimCodenameResponse.proto diff --git a/pogo/Networking/Responses/CollectDailyBonusResponse.proto b/src/POGOProtos/Networking/Responses/CollectDailyBonusResponse.proto similarity index 100% rename from pogo/Networking/Responses/CollectDailyBonusResponse.proto rename to src/POGOProtos/Networking/Responses/CollectDailyBonusResponse.proto diff --git a/pogo/Networking/Responses/CollectDailyDefenderBonusResponse.proto b/src/POGOProtos/Networking/Responses/CollectDailyDefenderBonusResponse.proto similarity index 100% rename from pogo/Networking/Responses/CollectDailyDefenderBonusResponse.proto rename to src/POGOProtos/Networking/Responses/CollectDailyDefenderBonusResponse.proto diff --git a/pogo/Networking/Responses/DiskEncounterResponse.proto b/src/POGOProtos/Networking/Responses/DiskEncounterResponse.proto similarity index 79% rename from pogo/Networking/Responses/DiskEncounterResponse.proto rename to src/POGOProtos/Networking/Responses/DiskEncounterResponse.proto index 16dc33643..6678f2d8c 100644 --- a/pogo/Networking/Responses/DiskEncounterResponse.proto +++ b/src/POGOProtos/Networking/Responses/DiskEncounterResponse.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PokemonData.proto"; -import "Data/Capture/CaptureProbability.proto"; +import "POGOProtos/Data/PokemonData.proto"; +import "POGOProtos/Data/Capture/CaptureProbability.proto"; message DiskEncounterResponse { Result result = 1; diff --git a/pogo/Networking/Responses/DownloadItemTemplatesResponse.proto b/src/POGOProtos/Networking/Responses/DownloadItemTemplatesResponse.proto similarity index 59% rename from pogo/Networking/Responses/DownloadItemTemplatesResponse.proto rename to src/POGOProtos/Networking/Responses/DownloadItemTemplatesResponse.proto index e0f69dfa8..be924f1cf 100644 --- a/pogo/Networking/Responses/DownloadItemTemplatesResponse.proto +++ b/src/POGOProtos/Networking/Responses/DownloadItemTemplatesResponse.proto @@ -1,21 +1,21 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Settings/Master/ItemSettings.proto"; -import "Settings/Master/MoveSettings.proto"; -import "Settings/Master/BadgeSettings.proto"; -import "Settings/Master/PokemonSettings.proto"; -import "Settings/Master/MoveSequenceSettings.proto"; -import "Settings/Master/TypeEffectiveSettings.proto"; -import "Settings/Master/CameraSettings.proto"; -import "Settings/Master/PlayerLevelSettings.proto"; -import "Settings/Master/GymLevelSettings.proto"; -import "Settings/Master/GymBattleSettings.proto"; -import "Settings/Master/EncounterSettings.proto"; -import "Settings/Master/IapItemDisplay.proto"; -import "Settings/Master/IapSettings.proto"; -import "Settings/Master/PokemonUpgradeSettings.proto"; -import "Settings/Master/EquippedBadgeSettings.proto"; +import "POGOProtos/Settings/Master/ItemSettings.proto"; +import "POGOProtos/Settings/Master/MoveSettings.proto"; +import "POGOProtos/Settings/Master/BadgeSettings.proto"; +import "POGOProtos/Settings/Master/PokemonSettings.proto"; +import "POGOProtos/Settings/Master/MoveSequenceSettings.proto"; +import "POGOProtos/Settings/Master/TypeEffectiveSettings.proto"; +import "POGOProtos/Settings/Master/CameraSettings.proto"; +import "POGOProtos/Settings/Master/PlayerLevelSettings.proto"; +import "POGOProtos/Settings/Master/GymLevelSettings.proto"; +import "POGOProtos/Settings/Master/GymBattleSettings.proto"; +import "POGOProtos/Settings/Master/EncounterSettings.proto"; +import "POGOProtos/Settings/Master/IapItemDisplay.proto"; +import "POGOProtos/Settings/Master/IapSettings.proto"; +import "POGOProtos/Settings/Master/PokemonUpgradeSettings.proto"; +import "POGOProtos/Settings/Master/EquippedBadgeSettings.proto"; diff --git a/pogo/Networking/Responses/DownloadRemoteConfigVersionResponse.proto b/src/POGOProtos/Networking/Responses/DownloadRemoteConfigVersionResponse.proto similarity index 100% rename from pogo/Networking/Responses/DownloadRemoteConfigVersionResponse.proto rename to src/POGOProtos/Networking/Responses/DownloadRemoteConfigVersionResponse.proto diff --git a/pogo/Networking/Responses/DownloadSettingsResponse.proto b/src/POGOProtos/Networking/Responses/DownloadSettingsResponse.proto similarity index 78% rename from pogo/Networking/Responses/DownloadSettingsResponse.proto rename to src/POGOProtos/Networking/Responses/DownloadSettingsResponse.proto index 445b68cb5..abe09d087 100644 --- a/pogo/Networking/Responses/DownloadSettingsResponse.proto +++ b/src/POGOProtos/Networking/Responses/DownloadSettingsResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Settings/GlobalSettings.proto"; +import "POGOProtos/Settings/GlobalSettings.proto"; message DownloadSettingsResponse { string error = 1; diff --git a/pogo/Networking/Responses/EchoResponse.proto b/src/POGOProtos/Networking/Responses/EchoResponse.proto similarity index 100% rename from pogo/Networking/Responses/EchoResponse.proto rename to src/POGOProtos/Networking/Responses/EchoResponse.proto diff --git a/pogo/Networking/Responses/EncounterResponse.proto b/src/POGOProtos/Networking/Responses/EncounterResponse.proto similarity index 83% rename from pogo/Networking/Responses/EncounterResponse.proto rename to src/POGOProtos/Networking/Responses/EncounterResponse.proto index cf38813bc..258df1d06 100644 --- a/pogo/Networking/Responses/EncounterResponse.proto +++ b/src/POGOProtos/Networking/Responses/EncounterResponse.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/Capture/CaptureProbability.proto"; -import "Map/Pokemon/WildPokemon.proto"; +import "POGOProtos/Data/Capture/CaptureProbability.proto"; +import "POGOProtos/Map/Pokemon/WildPokemon.proto"; message EncounterResponse { .POGOProtos.Map.Pokemon.WildPokemon wild_pokemon = 1; diff --git a/pogo/Networking/Responses/EncounterTutorialCompleteResponse.proto b/src/POGOProtos/Networking/Responses/EncounterTutorialCompleteResponse.proto similarity index 79% rename from pogo/Networking/Responses/EncounterTutorialCompleteResponse.proto rename to src/POGOProtos/Networking/Responses/EncounterTutorialCompleteResponse.proto index a1c05121b..8e7c441d6 100644 --- a/pogo/Networking/Responses/EncounterTutorialCompleteResponse.proto +++ b/src/POGOProtos/Networking/Responses/EncounterTutorialCompleteResponse.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PokemonData.proto"; -import "Data/Capture/CaptureAward.proto"; +import "POGOProtos/Data/PokemonData.proto"; +import "POGOProtos/Data/Capture/CaptureAward.proto"; message EncounterTutorialCompleteResponse { .POGOProtos.Networking.Responses.EncounterTutorialCompleteResponse.Result result = 1; diff --git a/pogo/Networking/Responses/EquipBadgeResponse.proto b/src/POGOProtos/Networking/Responses/EquipBadgeResponse.proto similarity index 85% rename from pogo/Networking/Responses/EquipBadgeResponse.proto rename to src/POGOProtos/Networking/Responses/EquipBadgeResponse.proto index 26544cd91..3a83d98ed 100644 --- a/pogo/Networking/Responses/EquipBadgeResponse.proto +++ b/src/POGOProtos/Networking/Responses/EquipBadgeResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/Player/EquippedBadge.proto"; +import "POGOProtos/Data/Player/EquippedBadge.proto"; message EquipBadgeResponse { .POGOProtos.Networking.Responses.EquipBadgeResponse.Result result = 1; diff --git a/pogo/Networking/Responses/EvolvePokemonResponse.proto b/src/POGOProtos/Networking/Responses/EvolvePokemonResponse.proto similarity index 91% rename from pogo/Networking/Responses/EvolvePokemonResponse.proto rename to src/POGOProtos/Networking/Responses/EvolvePokemonResponse.proto index 77e2dffc8..57c573019 100644 --- a/pogo/Networking/Responses/EvolvePokemonResponse.proto +++ b/src/POGOProtos/Networking/Responses/EvolvePokemonResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PokemonData.proto"; +import "POGOProtos/Data/PokemonData.proto"; message EvolvePokemonResponse { .POGOProtos.Networking.Responses.EvolvePokemonResponse.Result result = 1; diff --git a/pogo/Networking/Responses/FortDeployPokemonResponse.proto b/src/POGOProtos/Networking/Responses/FortDeployPokemonResponse.proto similarity index 80% rename from pogo/Networking/Responses/FortDeployPokemonResponse.proto rename to src/POGOProtos/Networking/Responses/FortDeployPokemonResponse.proto index 52e5822a3..f42ff9b8a 100644 --- a/pogo/Networking/Responses/FortDeployPokemonResponse.proto +++ b/src/POGOProtos/Networking/Responses/FortDeployPokemonResponse.proto @@ -1,9 +1,9 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PokemonData.proto"; -import "Data/Gym/GymState.proto"; -import "Networking/Responses/FortDetailsResponse.proto"; +import "POGOProtos/Data/PokemonData.proto"; +import "POGOProtos/Data/Gym/GymState.proto"; +import "POGOProtos/Networking/Responses/FortDetailsResponse.proto"; message FortDeployPokemonResponse { .POGOProtos.Networking.Responses.FortDeployPokemonResponse.Result result = 1; diff --git a/pogo/Networking/Responses/FortDetailsResponse.proto b/src/POGOProtos/Networking/Responses/FortDetailsResponse.proto similarity index 73% rename from pogo/Networking/Responses/FortDetailsResponse.proto rename to src/POGOProtos/Networking/Responses/FortDetailsResponse.proto index 31582b65c..01bb62bb2 100644 --- a/pogo/Networking/Responses/FortDetailsResponse.proto +++ b/src/POGOProtos/Networking/Responses/FortDetailsResponse.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PokemonData.proto"; -import "Enums/TeamColor.proto"; -import "Map/Fort/FortType.proto"; -import "Map/Fort/FortModifier.proto"; +import "POGOProtos/Data/PokemonData.proto"; +import "POGOProtos/Enums/TeamColor.proto"; +import "POGOProtos/Map/Fort/FortType.proto"; +import "POGOProtos/Map/Fort/FortModifier.proto"; message FortDetailsResponse { string fort_id = 1; diff --git a/pogo/Networking/Responses/FortRecallPokemonResponse.proto b/src/POGOProtos/Networking/Responses/FortRecallPokemonResponse.proto similarity index 85% rename from pogo/Networking/Responses/FortRecallPokemonResponse.proto rename to src/POGOProtos/Networking/Responses/FortRecallPokemonResponse.proto index aa065a0c7..2208ac8bd 100644 --- a/pogo/Networking/Responses/FortRecallPokemonResponse.proto +++ b/src/POGOProtos/Networking/Responses/FortRecallPokemonResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Networking/Responses/FortDetailsResponse.proto"; +import "POGOProtos/Networking/Responses/FortDetailsResponse.proto"; message FortRecallPokemonResponse { .POGOProtos.Networking.Responses.FortRecallPokemonResponse.Result result = 1; diff --git a/pogo/Networking/Responses/FortSearchResponse.proto b/src/POGOProtos/Networking/Responses/FortSearchResponse.proto similarity index 85% rename from pogo/Networking/Responses/FortSearchResponse.proto rename to src/POGOProtos/Networking/Responses/FortSearchResponse.proto index de49229ec..676e54775 100644 --- a/pogo/Networking/Responses/FortSearchResponse.proto +++ b/src/POGOProtos/Networking/Responses/FortSearchResponse.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PokemonData.proto"; -import "Inventory/ItemAward.proto"; +import "POGOProtos/Data/PokemonData.proto"; +import "POGOProtos/Inventory/ItemAward.proto"; message FortSearchResponse { .POGOProtos.Networking.Responses.FortSearchResponse.Result result = 1; diff --git a/pogo/Networking/Responses/GetAssetDigestResponse.proto b/src/POGOProtos/Networking/Responses/GetAssetDigestResponse.proto similarity index 78% rename from pogo/Networking/Responses/GetAssetDigestResponse.proto rename to src/POGOProtos/Networking/Responses/GetAssetDigestResponse.proto index 1d39812f4..f8858d567 100644 --- a/pogo/Networking/Responses/GetAssetDigestResponse.proto +++ b/src/POGOProtos/Networking/Responses/GetAssetDigestResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/AssetDigestEntry.proto"; +import "POGOProtos/Data/AssetDigestEntry.proto"; message GetAssetDigestResponse { repeated .POGOProtos.Data.AssetDigestEntry digest = 1; diff --git a/pogo/Networking/Responses/GetDownloadUrlsResponse.proto b/src/POGOProtos/Networking/Responses/GetDownloadUrlsResponse.proto similarity index 77% rename from pogo/Networking/Responses/GetDownloadUrlsResponse.proto rename to src/POGOProtos/Networking/Responses/GetDownloadUrlsResponse.proto index c0b66b6f6..c6db098a2 100644 --- a/pogo/Networking/Responses/GetDownloadUrlsResponse.proto +++ b/src/POGOProtos/Networking/Responses/GetDownloadUrlsResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/DownloadUrlEntry.proto"; +import "POGOProtos/Data/DownloadUrlEntry.proto"; // UNTESTED message GetDownloadUrlsResponse { diff --git a/pogo/Networking/Responses/GetGymDetailsResponse.proto b/src/POGOProtos/Networking/Responses/GetGymDetailsResponse.proto similarity index 88% rename from pogo/Networking/Responses/GetGymDetailsResponse.proto rename to src/POGOProtos/Networking/Responses/GetGymDetailsResponse.proto index a7384f62e..2a23962a7 100644 --- a/pogo/Networking/Responses/GetGymDetailsResponse.proto +++ b/src/POGOProtos/Networking/Responses/GetGymDetailsResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/Gym/GymState.proto"; +import "POGOProtos/Data/Gym/GymState.proto"; message GetGymDetailsResponse { .POGOProtos.Data.Gym.GymState gym_state = 1; diff --git a/pogo/Networking/Responses/GetHatchedEggsResponse.proto b/src/POGOProtos/Networking/Responses/GetHatchedEggsResponse.proto similarity index 100% rename from pogo/Networking/Responses/GetHatchedEggsResponse.proto rename to src/POGOProtos/Networking/Responses/GetHatchedEggsResponse.proto diff --git a/pogo/Networking/Responses/GetIncensePokemonResponse.proto b/src/POGOProtos/Networking/Responses/GetIncensePokemonResponse.proto similarity index 100% rename from pogo/Networking/Responses/GetIncensePokemonResponse.proto rename to src/POGOProtos/Networking/Responses/GetIncensePokemonResponse.proto diff --git a/pogo/Networking/Responses/GetInventoryResponse.proto b/src/POGOProtos/Networking/Responses/GetInventoryResponse.proto similarity index 76% rename from pogo/Networking/Responses/GetInventoryResponse.proto rename to src/POGOProtos/Networking/Responses/GetInventoryResponse.proto index d379d7236..f831f09d2 100644 --- a/pogo/Networking/Responses/GetInventoryResponse.proto +++ b/src/POGOProtos/Networking/Responses/GetInventoryResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Inventory/InventoryDelta.proto"; +import "POGOProtos/Inventory/InventoryDelta.proto"; message GetInventoryResponse { bool success = 1; diff --git a/pogo/Networking/Responses/GetMapObjectsResponse.proto b/src/POGOProtos/Networking/Responses/GetMapObjectsResponse.proto similarity index 68% rename from pogo/Networking/Responses/GetMapObjectsResponse.proto rename to src/POGOProtos/Networking/Responses/GetMapObjectsResponse.proto index f6785eabe..06f25f3a1 100644 --- a/pogo/Networking/Responses/GetMapObjectsResponse.proto +++ b/src/POGOProtos/Networking/Responses/GetMapObjectsResponse.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Map/MapCell.proto"; -import "Map/MapObjectsStatus.proto"; +import "POGOProtos/Map/MapCell.proto"; +import "POGOProtos/Map/MapObjectsStatus.proto"; message GetMapObjectsResponse { repeated .POGOProtos.Map.MapCell map_cells = 1; diff --git a/pogo/Networking/Responses/GetPlayerProfileResponse.proto b/src/POGOProtos/Networking/Responses/GetPlayerProfileResponse.proto similarity index 87% rename from pogo/Networking/Responses/GetPlayerProfileResponse.proto rename to src/POGOProtos/Networking/Responses/GetPlayerProfileResponse.proto index af81f7b8f..3ff224a62 100644 --- a/pogo/Networking/Responses/GetPlayerProfileResponse.proto +++ b/src/POGOProtos/Networking/Responses/GetPlayerProfileResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PlayerBadge.proto"; +import "POGOProtos/Data/PlayerBadge.proto"; message GetPlayerProfileResponse { .POGOProtos.Networking.Responses.GetPlayerProfileResponse.Result result = 1; diff --git a/pogo/Networking/Responses/GetPlayerResponse.proto b/src/POGOProtos/Networking/Responses/GetPlayerResponse.proto similarity index 78% rename from pogo/Networking/Responses/GetPlayerResponse.proto rename to src/POGOProtos/Networking/Responses/GetPlayerResponse.proto index 970c16c0e..abb70e9fd 100644 --- a/pogo/Networking/Responses/GetPlayerResponse.proto +++ b/src/POGOProtos/Networking/Responses/GetPlayerResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PlayerData.proto"; +import "POGOProtos/Data/PlayerData.proto"; message GetPlayerResponse { bool success = 1; diff --git a/pogo/Networking/Responses/GetSuggestedCodenamesResponse.proto b/src/POGOProtos/Networking/Responses/GetSuggestedCodenamesResponse.proto similarity index 100% rename from pogo/Networking/Responses/GetSuggestedCodenamesResponse.proto rename to src/POGOProtos/Networking/Responses/GetSuggestedCodenamesResponse.proto diff --git a/pogo/Networking/Responses/IncenseEncounterResponse.proto b/src/POGOProtos/Networking/Responses/IncenseEncounterResponse.proto similarity index 81% rename from pogo/Networking/Responses/IncenseEncounterResponse.proto rename to src/POGOProtos/Networking/Responses/IncenseEncounterResponse.proto index 1a3f031c5..3ae5c3449 100644 --- a/pogo/Networking/Responses/IncenseEncounterResponse.proto +++ b/src/POGOProtos/Networking/Responses/IncenseEncounterResponse.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PokemonData.proto"; -import "Data/Capture/CaptureProbability.proto"; +import "POGOProtos/Data/PokemonData.proto"; +import "POGOProtos/Data/Capture/CaptureProbability.proto"; message IncenseEncounterResponse { .POGOProtos.Networking.Responses.IncenseEncounterResponse.Result result = 1; diff --git a/pogo/Networking/Responses/LevelUpRewardsResponse.proto b/src/POGOProtos/Networking/Responses/LevelUpRewardsResponse.proto similarity index 80% rename from pogo/Networking/Responses/LevelUpRewardsResponse.proto rename to src/POGOProtos/Networking/Responses/LevelUpRewardsResponse.proto index 84c7ceeed..124c21d82 100644 --- a/pogo/Networking/Responses/LevelUpRewardsResponse.proto +++ b/src/POGOProtos/Networking/Responses/LevelUpRewardsResponse.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Inventory/ItemId.proto"; -import "Inventory/ItemAward.proto"; +import "POGOProtos/Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemAward.proto"; message LevelUpRewardsResponse { .POGOProtos.Networking.Responses.LevelUpRewardsResponse.Result result = 1; diff --git a/pogo/Networking/Responses/MarkTutorialCompleteResponse.proto b/src/POGOProtos/Networking/Responses/MarkTutorialCompleteResponse.proto similarity index 79% rename from pogo/Networking/Responses/MarkTutorialCompleteResponse.proto rename to src/POGOProtos/Networking/Responses/MarkTutorialCompleteResponse.proto index 5d8c3894e..f39c5e991 100644 --- a/pogo/Networking/Responses/MarkTutorialCompleteResponse.proto +++ b/src/POGOProtos/Networking/Responses/MarkTutorialCompleteResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PlayerData.proto"; +import "POGOProtos/Data/PlayerData.proto"; message MarkTutorialCompleteResponse { bool success = 1; diff --git a/pogo/Networking/Responses/NicknamePokemonResponse.proto b/src/POGOProtos/Networking/Responses/NicknamePokemonResponse.proto similarity index 100% rename from pogo/Networking/Responses/NicknamePokemonResponse.proto rename to src/POGOProtos/Networking/Responses/NicknamePokemonResponse.proto diff --git a/pogo/Networking/Responses/PlayerUpdateResponse.proto b/src/POGOProtos/Networking/Responses/PlayerUpdateResponse.proto similarity index 70% rename from pogo/Networking/Responses/PlayerUpdateResponse.proto rename to src/POGOProtos/Networking/Responses/PlayerUpdateResponse.proto index f0927cf01..026075588 100644 --- a/pogo/Networking/Responses/PlayerUpdateResponse.proto +++ b/src/POGOProtos/Networking/Responses/PlayerUpdateResponse.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Map/Fort/FortData.proto"; -import "Map/Pokemon/WildPokemon.proto"; +import "POGOProtos/Map/Fort/FortData.proto"; +import "POGOProtos/Map/Pokemon/WildPokemon.proto"; message PlayerUpdateResponse { repeated .POGOProtos.Map.Pokemon.WildPokemon wild_pokemons = 1; diff --git a/pogo/Networking/Responses/README.txt b/src/POGOProtos/Networking/Responses/README.txt similarity index 100% rename from pogo/Networking/Responses/README.txt rename to src/POGOProtos/Networking/Responses/README.txt diff --git a/pogo/Networking/Responses/RecycleInventoryItemResponse.proto b/src/POGOProtos/Networking/Responses/RecycleInventoryItemResponse.proto similarity index 100% rename from pogo/Networking/Responses/RecycleInventoryItemResponse.proto rename to src/POGOProtos/Networking/Responses/RecycleInventoryItemResponse.proto diff --git a/pogo/Networking/Responses/ReleasePokemonResponse.proto b/src/POGOProtos/Networking/Responses/ReleasePokemonResponse.proto similarity index 100% rename from pogo/Networking/Responses/ReleasePokemonResponse.proto rename to src/POGOProtos/Networking/Responses/ReleasePokemonResponse.proto diff --git a/pogo/Networking/Responses/SetAvatarResponse.proto b/src/POGOProtos/Networking/Responses/SetAvatarResponse.proto similarity index 87% rename from pogo/Networking/Responses/SetAvatarResponse.proto rename to src/POGOProtos/Networking/Responses/SetAvatarResponse.proto index bafba4a69..93ab2c922 100644 --- a/pogo/Networking/Responses/SetAvatarResponse.proto +++ b/src/POGOProtos/Networking/Responses/SetAvatarResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PlayerData.proto"; +import "POGOProtos/Data/PlayerData.proto"; message SetAvatarResponse { .POGOProtos.Networking.Responses.SetAvatarResponse.Status status = 1; diff --git a/pogo/Networking/Responses/SetContactSettingsResponse.proto b/src/POGOProtos/Networking/Responses/SetContactSettingsResponse.proto similarity index 87% rename from pogo/Networking/Responses/SetContactSettingsResponse.proto rename to src/POGOProtos/Networking/Responses/SetContactSettingsResponse.proto index fbc7ffdd2..d17f4017b 100644 --- a/pogo/Networking/Responses/SetContactSettingsResponse.proto +++ b/src/POGOProtos/Networking/Responses/SetContactSettingsResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PlayerData.proto"; +import "POGOProtos/Data/PlayerData.proto"; message SetContactSettingsResponse { .POGOProtos.Networking.Responses.SetContactSettingsResponse.Status status = 1; diff --git a/pogo/Networking/Responses/SetFavoritePokemonResponse.proto b/src/POGOProtos/Networking/Responses/SetFavoritePokemonResponse.proto similarity index 100% rename from pogo/Networking/Responses/SetFavoritePokemonResponse.proto rename to src/POGOProtos/Networking/Responses/SetFavoritePokemonResponse.proto diff --git a/pogo/Networking/Responses/SetPlayerTeamResponse.proto b/src/POGOProtos/Networking/Responses/SetPlayerTeamResponse.proto similarity index 87% rename from pogo/Networking/Responses/SetPlayerTeamResponse.proto rename to src/POGOProtos/Networking/Responses/SetPlayerTeamResponse.proto index 07e518471..47aff063e 100644 --- a/pogo/Networking/Responses/SetPlayerTeamResponse.proto +++ b/src/POGOProtos/Networking/Responses/SetPlayerTeamResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PlayerData.proto"; +import "POGOProtos/Data/PlayerData.proto"; message SetPlayerTeamResponse { .POGOProtos.Networking.Responses.SetPlayerTeamResponse.Status status = 1; diff --git a/pogo/Networking/Responses/StartGymBattleResponse.proto b/src/POGOProtos/Networking/Responses/StartGymBattleResponse.proto similarity index 88% rename from pogo/Networking/Responses/StartGymBattleResponse.proto rename to src/POGOProtos/Networking/Responses/StartGymBattleResponse.proto index 435c09aac..9d63f4abf 100644 --- a/pogo/Networking/Responses/StartGymBattleResponse.proto +++ b/src/POGOProtos/Networking/Responses/StartGymBattleResponse.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/Battle/BattleLog.proto"; -import "Data/Battle/BattleParticipant.proto"; +import "POGOProtos/Data/Battle/BattleLog.proto"; +import "POGOProtos/Data/Battle/BattleParticipant.proto"; message StartGymBattleResponse { .POGOProtos.Networking.Responses.StartGymBattleResponse.Result result = 1; diff --git a/pogo/Networking/Responses/UpgradePokemonResponse.proto b/src/POGOProtos/Networking/Responses/UpgradePokemonResponse.proto similarity index 90% rename from pogo/Networking/Responses/UpgradePokemonResponse.proto rename to src/POGOProtos/Networking/Responses/UpgradePokemonResponse.proto index eee1854c5..16ed57023 100644 --- a/pogo/Networking/Responses/UpgradePokemonResponse.proto +++ b/src/POGOProtos/Networking/Responses/UpgradePokemonResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Data/PokemonData.proto"; +import "POGOProtos/Data/PokemonData.proto"; message UpgradePokemonResponse { .POGOProtos.Networking.Responses.UpgradePokemonResponse.Result result = 1; diff --git a/pogo/Networking/Responses/UseIncenseResponse.proto b/src/POGOProtos/Networking/Responses/UseIncenseResponse.proto similarity index 87% rename from pogo/Networking/Responses/UseIncenseResponse.proto rename to src/POGOProtos/Networking/Responses/UseIncenseResponse.proto index d26725f8e..424f53dfd 100644 --- a/pogo/Networking/Responses/UseIncenseResponse.proto +++ b/src/POGOProtos/Networking/Responses/UseIncenseResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Inventory/AppliedItem.proto"; +import "POGOProtos/Inventory/AppliedItem.proto"; message UseIncenseResponse { .POGOProtos.Networking.Responses.UseIncenseResponse.Result result = 1; diff --git a/pogo/Networking/Responses/UseItemCaptureResponse.proto b/src/POGOProtos/Networking/Responses/UseItemCaptureResponse.proto similarity index 100% rename from pogo/Networking/Responses/UseItemCaptureResponse.proto rename to src/POGOProtos/Networking/Responses/UseItemCaptureResponse.proto diff --git a/pogo/Networking/Responses/UseItemEggIncubatorResponse.proto b/src/POGOProtos/Networking/Responses/UseItemEggIncubatorResponse.proto similarity index 90% rename from pogo/Networking/Responses/UseItemEggIncubatorResponse.proto rename to src/POGOProtos/Networking/Responses/UseItemEggIncubatorResponse.proto index c3860dc13..f3a171512 100644 --- a/pogo/Networking/Responses/UseItemEggIncubatorResponse.proto +++ b/src/POGOProtos/Networking/Responses/UseItemEggIncubatorResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Inventory/EggIncubator.proto"; +import "POGOProtos/Inventory/EggIncubator.proto"; message UseItemEggIncubatorResponse { .POGOProtos.Networking.Responses.UseItemEggIncubatorResponse.Result result = 1; diff --git a/pogo/Networking/Responses/UseItemGymResponse.proto b/src/POGOProtos/Networking/Responses/UseItemGymResponse.proto similarity index 100% rename from pogo/Networking/Responses/UseItemGymResponse.proto rename to src/POGOProtos/Networking/Responses/UseItemGymResponse.proto diff --git a/pogo/Networking/Responses/UseItemPotionResponse.proto b/src/POGOProtos/Networking/Responses/UseItemPotionResponse.proto similarity index 100% rename from pogo/Networking/Responses/UseItemPotionResponse.proto rename to src/POGOProtos/Networking/Responses/UseItemPotionResponse.proto diff --git a/pogo/Networking/Responses/UseItemReviveResponse.proto b/src/POGOProtos/Networking/Responses/UseItemReviveResponse.proto similarity index 100% rename from pogo/Networking/Responses/UseItemReviveResponse.proto rename to src/POGOProtos/Networking/Responses/UseItemReviveResponse.proto diff --git a/pogo/Networking/Responses/UseItemXpBoostResponse.proto b/src/POGOProtos/Networking/Responses/UseItemXpBoostResponse.proto similarity index 88% rename from pogo/Networking/Responses/UseItemXpBoostResponse.proto rename to src/POGOProtos/Networking/Responses/UseItemXpBoostResponse.proto index 7ec762e5e..ad3f68c2a 100644 --- a/pogo/Networking/Responses/UseItemXpBoostResponse.proto +++ b/src/POGOProtos/Networking/Responses/UseItemXpBoostResponse.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Networking.Responses; -import "Inventory/AppliedItems.proto"; +import "POGOProtos/Inventory/AppliedItems.proto"; message UseItemXpBoostResponse { .POGOProtos.Networking.Responses.UseItemXpBoostResponse.Result result = 1; diff --git a/pogo/Networking/Responses/base.proto.txt b/src/POGOProtos/Networking/Responses/base.proto.txt similarity index 100% rename from pogo/Networking/Responses/base.proto.txt rename to src/POGOProtos/Networking/Responses/base.proto.txt diff --git a/pogo/Settings/DownloadSettingsAction.proto b/src/POGOProtos/Settings/DownloadSettingsAction.proto similarity index 100% rename from pogo/Settings/DownloadSettingsAction.proto rename to src/POGOProtos/Settings/DownloadSettingsAction.proto diff --git a/pogo/Settings/FortSettings.proto b/src/POGOProtos/Settings/FortSettings.proto similarity index 100% rename from pogo/Settings/FortSettings.proto rename to src/POGOProtos/Settings/FortSettings.proto diff --git a/pogo/Settings/GlobalSettings.proto b/src/POGOProtos/Settings/GlobalSettings.proto similarity index 62% rename from pogo/Settings/GlobalSettings.proto rename to src/POGOProtos/Settings/GlobalSettings.proto index bf7a19bae..215379aa1 100644 --- a/pogo/Settings/GlobalSettings.proto +++ b/src/POGOProtos/Settings/GlobalSettings.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package POGOProtos.Settings; -import "Settings/FortSettings.proto"; -import "Settings/MapSettings.proto"; -import "Settings/LevelSettings.proto"; -import "Settings/InventorySettings.proto"; +import "POGOProtos/Settings/FortSettings.proto"; +import "POGOProtos/Settings/MapSettings.proto"; +import "POGOProtos/Settings/LevelSettings.proto"; +import "POGOProtos/Settings/InventorySettings.proto"; message GlobalSettings { .POGOProtos.Settings.FortSettings fort_settings = 2; diff --git a/pogo/Settings/InventorySettings.proto b/src/POGOProtos/Settings/InventorySettings.proto similarity index 100% rename from pogo/Settings/InventorySettings.proto rename to src/POGOProtos/Settings/InventorySettings.proto diff --git a/pogo/Settings/LevelSettings.proto b/src/POGOProtos/Settings/LevelSettings.proto similarity index 100% rename from pogo/Settings/LevelSettings.proto rename to src/POGOProtos/Settings/LevelSettings.proto diff --git a/pogo/Settings/MapSettings.proto b/src/POGOProtos/Settings/MapSettings.proto similarity index 100% rename from pogo/Settings/MapSettings.proto rename to src/POGOProtos/Settings/MapSettings.proto diff --git a/pogo/Settings/Master/BadgeSettings.proto b/src/POGOProtos/Settings/Master/BadgeSettings.proto similarity index 80% rename from pogo/Settings/Master/BadgeSettings.proto rename to src/POGOProtos/Settings/Master/BadgeSettings.proto index 4b2eee6c9..a8de75c4e 100644 --- a/pogo/Settings/Master/BadgeSettings.proto +++ b/src/POGOProtos/Settings/Master/BadgeSettings.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Settings.Master; -import "Enums/BadgeType.proto"; +import "POGOProtos/Enums/BadgeType.proto"; message BadgeSettings { .POGOProtos.Enums.BadgeType badge_type = 1; diff --git a/pogo/Settings/Master/CameraSettings.proto b/src/POGOProtos/Settings/Master/CameraSettings.proto similarity index 87% rename from pogo/Settings/Master/CameraSettings.proto rename to src/POGOProtos/Settings/Master/CameraSettings.proto index db1e0fce3..d798c0d69 100644 --- a/pogo/Settings/Master/CameraSettings.proto +++ b/src/POGOProtos/Settings/Master/CameraSettings.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Settings.Master; -import "Enums/CameraTarget.proto"; -import "Enums/CameraInterpolation.proto"; +import "POGOProtos/Enums/CameraTarget.proto"; +import "POGOProtos/Enums/CameraInterpolation.proto"; message CameraSettings { string next_camera = 1; diff --git a/pogo/Settings/Master/EncounterSettings.proto b/src/POGOProtos/Settings/Master/EncounterSettings.proto similarity index 100% rename from pogo/Settings/Master/EncounterSettings.proto rename to src/POGOProtos/Settings/Master/EncounterSettings.proto diff --git a/pogo/Settings/Master/EquippedBadgeSettings.proto b/src/POGOProtos/Settings/Master/EquippedBadgeSettings.proto similarity index 100% rename from pogo/Settings/Master/EquippedBadgeSettings.proto rename to src/POGOProtos/Settings/Master/EquippedBadgeSettings.proto diff --git a/pogo/Settings/Master/GymBattleSettings.proto b/src/POGOProtos/Settings/Master/GymBattleSettings.proto similarity index 100% rename from pogo/Settings/Master/GymBattleSettings.proto rename to src/POGOProtos/Settings/Master/GymBattleSettings.proto diff --git a/pogo/Settings/Master/GymLevelSettings.proto b/src/POGOProtos/Settings/Master/GymLevelSettings.proto similarity index 100% rename from pogo/Settings/Master/GymLevelSettings.proto rename to src/POGOProtos/Settings/Master/GymLevelSettings.proto diff --git a/pogo/Settings/Master/IapItemDisplay.proto b/src/POGOProtos/Settings/Master/IapItemDisplay.proto similarity index 73% rename from pogo/Settings/Master/IapItemDisplay.proto rename to src/POGOProtos/Settings/Master/IapItemDisplay.proto index 54bfe3087..1a7705d48 100644 --- a/pogo/Settings/Master/IapItemDisplay.proto +++ b/src/POGOProtos/Settings/Master/IapItemDisplay.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Settings.Master; -import "Enums/IapItemCategory.proto"; -import "Inventory/ItemId.proto"; +import "POGOProtos/Enums/IapItemCategory.proto"; +import "POGOProtos/Inventory/ItemId.proto"; message IapItemDisplay { string sku = 1; diff --git a/pogo/Settings/Master/IapSettings.proto b/src/POGOProtos/Settings/Master/IapSettings.proto similarity index 100% rename from pogo/Settings/Master/IapSettings.proto rename to src/POGOProtos/Settings/Master/IapSettings.proto diff --git a/pogo/Settings/Master/Item/BattleAttributes.proto b/src/POGOProtos/Settings/Master/Item/BattleAttributes.proto similarity index 100% rename from pogo/Settings/Master/Item/BattleAttributes.proto rename to src/POGOProtos/Settings/Master/Item/BattleAttributes.proto diff --git a/pogo/Settings/Master/Item/EggIncubatorAttributes.proto b/src/POGOProtos/Settings/Master/Item/EggIncubatorAttributes.proto similarity index 79% rename from pogo/Settings/Master/Item/EggIncubatorAttributes.proto rename to src/POGOProtos/Settings/Master/Item/EggIncubatorAttributes.proto index 9ee67bee0..fb5057435 100644 --- a/pogo/Settings/Master/Item/EggIncubatorAttributes.proto +++ b/src/POGOProtos/Settings/Master/Item/EggIncubatorAttributes.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Settings.Master.Item; -import "Inventory/EggIncubatorType.proto"; +import "POGOProtos/Inventory/EggIncubatorType.proto"; message EggIncubatorAttributes { .POGOProtos.Inventory.EggIncubatorType incubator_type = 1; diff --git a/pogo/Settings/Master/Item/ExperienceBoostAttributes.proto b/src/POGOProtos/Settings/Master/Item/ExperienceBoostAttributes.proto similarity index 100% rename from pogo/Settings/Master/Item/ExperienceBoostAttributes.proto rename to src/POGOProtos/Settings/Master/Item/ExperienceBoostAttributes.proto diff --git a/pogo/Settings/Master/Item/FoodAttributes.proto b/src/POGOProtos/Settings/Master/Item/FoodAttributes.proto similarity index 83% rename from pogo/Settings/Master/Item/FoodAttributes.proto rename to src/POGOProtos/Settings/Master/Item/FoodAttributes.proto index 6a0818acf..36f22eafb 100644 --- a/pogo/Settings/Master/Item/FoodAttributes.proto +++ b/src/POGOProtos/Settings/Master/Item/FoodAttributes.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Settings.Master.Item; -import "Enums/ItemEffect.proto"; +import "POGOProtos/Enums/ItemEffect.proto"; message FoodAttributes { repeated POGOProtos.Enums.ItemEffect item_effect = 1; diff --git a/pogo/Settings/Master/Item/FortModifierAttributes.proto b/src/POGOProtos/Settings/Master/Item/FortModifierAttributes.proto similarity index 100% rename from pogo/Settings/Master/Item/FortModifierAttributes.proto rename to src/POGOProtos/Settings/Master/Item/FortModifierAttributes.proto diff --git a/pogo/Settings/Master/Item/IncenseAttributes.proto b/src/POGOProtos/Settings/Master/Item/IncenseAttributes.proto similarity index 90% rename from pogo/Settings/Master/Item/IncenseAttributes.proto rename to src/POGOProtos/Settings/Master/Item/IncenseAttributes.proto index 9bc62db5b..100b11cc3 100644 --- a/pogo/Settings/Master/Item/IncenseAttributes.proto +++ b/src/POGOProtos/Settings/Master/Item/IncenseAttributes.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Settings.Master.Item; -import "Enums/PokemonType.proto"; +import "POGOProtos/Enums/PokemonType.proto"; message IncenseAttributes { int32 incense_lifetime_seconds = 1; diff --git a/pogo/Settings/Master/Item/InventoryUpgradeAttributes.proto b/src/POGOProtos/Settings/Master/Item/InventoryUpgradeAttributes.proto similarity index 77% rename from pogo/Settings/Master/Item/InventoryUpgradeAttributes.proto rename to src/POGOProtos/Settings/Master/Item/InventoryUpgradeAttributes.proto index 02e09cf86..50aec8ef5 100644 --- a/pogo/Settings/Master/Item/InventoryUpgradeAttributes.proto +++ b/src/POGOProtos/Settings/Master/Item/InventoryUpgradeAttributes.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Settings.Master.Item; -import "Inventory/InventoryUpgradeType.proto"; +import "POGOProtos/Inventory/InventoryUpgradeType.proto"; message InventoryUpgradeAttributes { int32 additional_storage = 1; diff --git a/pogo/Settings/Master/Item/PokeballAttributes.proto b/src/POGOProtos/Settings/Master/Item/PokeballAttributes.proto similarity index 83% rename from pogo/Settings/Master/Item/PokeballAttributes.proto rename to src/POGOProtos/Settings/Master/Item/PokeballAttributes.proto index 706cf0a14..ca1dce1c7 100644 --- a/pogo/Settings/Master/Item/PokeballAttributes.proto +++ b/src/POGOProtos/Settings/Master/Item/PokeballAttributes.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Settings.Master.Item; -import "Enums/ItemEffect.proto"; +import "POGOProtos/Enums/ItemEffect.proto"; message PokeballAttributes { .POGOProtos.Enums.ItemEffect item_effect = 1; diff --git a/pogo/Settings/Master/Item/PotionAttributes.proto b/src/POGOProtos/Settings/Master/Item/PotionAttributes.proto similarity index 100% rename from pogo/Settings/Master/Item/PotionAttributes.proto rename to src/POGOProtos/Settings/Master/Item/PotionAttributes.proto diff --git a/pogo/Settings/Master/Item/ReviveAttributes.proto b/src/POGOProtos/Settings/Master/Item/ReviveAttributes.proto similarity index 100% rename from pogo/Settings/Master/Item/ReviveAttributes.proto rename to src/POGOProtos/Settings/Master/Item/ReviveAttributes.proto diff --git a/pogo/Settings/Master/ItemSettings.proto b/src/POGOProtos/Settings/Master/ItemSettings.proto similarity index 56% rename from pogo/Settings/Master/ItemSettings.proto rename to src/POGOProtos/Settings/Master/ItemSettings.proto index 67433e9ed..2aa2d41c4 100644 --- a/pogo/Settings/Master/ItemSettings.proto +++ b/src/POGOProtos/Settings/Master/ItemSettings.proto @@ -1,20 +1,20 @@ syntax = "proto3"; package POGOProtos.Settings.Master; -import "Enums/ItemCategory.proto"; -import "Inventory/ItemId.proto"; -import "Inventory/ItemType.proto"; +import "POGOProtos/Enums/ItemCategory.proto"; +import "POGOProtos/Inventory/ItemId.proto"; +import "POGOProtos/Inventory/ItemType.proto"; -import "Settings/Master/Item/FoodAttributes.proto"; -import "Settings/Master/Item/PotionAttributes.proto"; -import "Settings/Master/Item/ReviveAttributes.proto"; -import "Settings/Master/Item/BattleAttributes.proto"; -import "Settings/Master/Item/IncenseAttributes.proto"; -import "Settings/Master/Item/PokeballAttributes.proto"; -import "Settings/Master/Item/FortModifierAttributes.proto"; -import "Settings/Master/Item/EggIncubatorAttributes.proto"; -import "Settings/Master/Item/ExperienceBoostAttributes.proto"; -import "Settings/Master/Item/InventoryUpgradeAttributes.proto"; +import "POGOProtos/Settings/Master/Item/FoodAttributes.proto"; +import "POGOProtos/Settings/Master/Item/PotionAttributes.proto"; +import "POGOProtos/Settings/Master/Item/ReviveAttributes.proto"; +import "POGOProtos/Settings/Master/Item/BattleAttributes.proto"; +import "POGOProtos/Settings/Master/Item/IncenseAttributes.proto"; +import "POGOProtos/Settings/Master/Item/PokeballAttributes.proto"; +import "POGOProtos/Settings/Master/Item/FortModifierAttributes.proto"; +import "POGOProtos/Settings/Master/Item/EggIncubatorAttributes.proto"; +import "POGOProtos/Settings/Master/Item/ExperienceBoostAttributes.proto"; +import "POGOProtos/Settings/Master/Item/InventoryUpgradeAttributes.proto"; message ItemSettings { .POGOProtos.Inventory.ItemId item_id = 1; diff --git a/pogo/Settings/Master/MoveSequenceSettings.proto b/src/POGOProtos/Settings/Master/MoveSequenceSettings.proto similarity index 100% rename from pogo/Settings/Master/MoveSequenceSettings.proto rename to src/POGOProtos/Settings/Master/MoveSequenceSettings.proto diff --git a/pogo/Settings/Master/MoveSettings.proto b/src/POGOProtos/Settings/Master/MoveSettings.proto similarity index 84% rename from pogo/Settings/Master/MoveSettings.proto rename to src/POGOProtos/Settings/Master/MoveSettings.proto index 8b5b8abfb..b6d60949d 100644 --- a/pogo/Settings/Master/MoveSettings.proto +++ b/src/POGOProtos/Settings/Master/MoveSettings.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package POGOProtos.Settings.Master; -import "Enums/PokemonType.proto"; -import "Enums/PokemonMovementType.proto"; +import "POGOProtos/Enums/PokemonType.proto"; +import "POGOProtos/Enums/PokemonMovementType.proto"; message MoveSettings { .POGOProtos.Enums.PokemonMovementType movement_id = 1; diff --git a/pogo/Settings/Master/PlayerLevelSettings.proto b/src/POGOProtos/Settings/Master/PlayerLevelSettings.proto similarity index 100% rename from pogo/Settings/Master/PlayerLevelSettings.proto rename to src/POGOProtos/Settings/Master/PlayerLevelSettings.proto diff --git a/pogo/Settings/Master/Pokemon/CameraAttributes.proto b/src/POGOProtos/Settings/Master/Pokemon/CameraAttributes.proto similarity index 100% rename from pogo/Settings/Master/Pokemon/CameraAttributes.proto rename to src/POGOProtos/Settings/Master/Pokemon/CameraAttributes.proto diff --git a/pogo/Settings/Master/Pokemon/EncounterAttributes.proto b/src/POGOProtos/Settings/Master/Pokemon/EncounterAttributes.proto similarity index 88% rename from pogo/Settings/Master/Pokemon/EncounterAttributes.proto rename to src/POGOProtos/Settings/Master/Pokemon/EncounterAttributes.proto index 9f2a89e41..e8885f15b 100644 --- a/pogo/Settings/Master/Pokemon/EncounterAttributes.proto +++ b/src/POGOProtos/Settings/Master/Pokemon/EncounterAttributes.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Settings.Master.Pokemon; -import "Enums/PokemonMovementType.proto"; +import "POGOProtos/Enums/PokemonMovementType.proto"; message EncounterAttributes { float base_capture_rate = 1; diff --git a/pogo/Settings/Master/Pokemon/StatsAttributes.proto b/src/POGOProtos/Settings/Master/Pokemon/StatsAttributes.proto similarity index 100% rename from pogo/Settings/Master/Pokemon/StatsAttributes.proto rename to src/POGOProtos/Settings/Master/Pokemon/StatsAttributes.proto diff --git a/pogo/Settings/Master/PokemonSettings.proto b/src/POGOProtos/Settings/Master/PokemonSettings.proto similarity index 69% rename from pogo/Settings/Master/PokemonSettings.proto rename to src/POGOProtos/Settings/Master/PokemonSettings.proto index 4738b40fd..ed66c418b 100644 --- a/pogo/Settings/Master/PokemonSettings.proto +++ b/src/POGOProtos/Settings/Master/PokemonSettings.proto @@ -1,14 +1,14 @@ syntax = "proto3"; package POGOProtos.Settings.Master; -import "Enums/PokemonId.proto"; -import "Enums/PokemonClass.proto"; -import "Enums/PokemonType.proto"; -import "Enums/PokemonMove.proto"; -import "Enums/PokemonFamilyId.proto"; -import "Settings/Master/Pokemon/StatsAttributes.proto"; -import "Settings/Master/Pokemon/CameraAttributes.proto"; -import "Settings/Master/Pokemon/EncounterAttributes.proto"; +import "POGOProtos/Enums/PokemonId.proto"; +import "POGOProtos/Enums/PokemonClass.proto"; +import "POGOProtos/Enums/PokemonType.proto"; +import "POGOProtos/Enums/PokemonMove.proto"; +import "POGOProtos/Enums/PokemonFamilyId.proto"; +import "POGOProtos/Settings/Master/Pokemon/StatsAttributes.proto"; +import "POGOProtos/Settings/Master/Pokemon/CameraAttributes.proto"; +import "POGOProtos/Settings/Master/Pokemon/EncounterAttributes.proto"; message PokemonSettings { .POGOProtos.Enums.PokemonId pokemon_id = 1; diff --git a/pogo/Settings/Master/PokemonUpgradeSettings.proto b/src/POGOProtos/Settings/Master/PokemonUpgradeSettings.proto similarity index 100% rename from pogo/Settings/Master/PokemonUpgradeSettings.proto rename to src/POGOProtos/Settings/Master/PokemonUpgradeSettings.proto diff --git a/pogo/Settings/Master/TypeEffectiveSettings.proto b/src/POGOProtos/Settings/Master/TypeEffectiveSettings.proto similarity index 79% rename from pogo/Settings/Master/TypeEffectiveSettings.proto rename to src/POGOProtos/Settings/Master/TypeEffectiveSettings.proto index ab9b45b27..ed0ec1c60 100644 --- a/pogo/Settings/Master/TypeEffectiveSettings.proto +++ b/src/POGOProtos/Settings/Master/TypeEffectiveSettings.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package POGOProtos.Settings.Master; -import "Enums/PokemonType.proto"; +import "POGOProtos/Enums/PokemonType.proto"; message TypeEffectiveSettings { repeated float attack_scalar = 1; diff --git a/src/assist.py b/src/assist.py new file mode 100644 index 000000000..20a0580f3 --- /dev/null +++ b/src/assist.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python + +import os +import argparse + +parser = argparse.ArgumentParser() +parser.add_argument("-m", "--message", help="Message to prodecure files for.") +args = parser.parse_args() + + +def underscore_to_camelcase(value): + def camelcase(): + while True: + yield str.capitalize + + c = camelcase() + return "".join(c.next()(x) if x else '_' for x in value.split("_")) + + +if not args.message: + print "Specify a message." + + +def initialize_file(package, message, path): + with open(path, 'a') as opened_file: + opened_file.write('syntax = "proto3";\n') + opened_file.write('package %s;\n\n' % package) + opened_file.write('message %s {\n' % message) + opened_file.write('\t// Initialized by assist.py\n') + opened_file.write('}\n') + + print "Created %s" % path + + +message = underscore_to_camelcase(args.message) +request_path = os.path.join("Networking\Requests\Messages", "%sMessage.proto" % message) +response_path = os.path.join("Networking\Responses", "%sResponse.proto" % message) + +initialize_file("POGOProtos.Networking.Requests.Messages", "%sMessage" % message, request_path) +initialize_file("POGOProtos.Networking.Responses", "%sResponse" % message, response_path)