Update to 0.35 protoc

brianzhouzc · Aug 25, 2016 · d1c0b54 · d1c0b54
1 parent 97dcbaa
commit d1c0b54
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 25 deletions.
diff --git a/POGOProtos b/POGOProtos
diff --git a/PokemonGo.RocketAPI b/PokemonGo.RocketAPI
diff --git a/PokemonGo.RocketBot.Logic/PokemonGo.RocketBot.Logic.csproj b/PokemonGo.RocketBot.Logic/PokemonGo.RocketBot.Logic.csproj
@@ -69,14 +69,7 @@
       <HintPath>..\packages\GMap.NET.WindowsForms.1.7.1\lib\net40\GMap.NET.WindowsForms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Protobuf, Version=3.0.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.0.0\lib\net45\Google.Protobuf.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="POGOProtos, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\POGOProtos.1.7.0\lib\net45\POGOProtos.dll</HintPath>
-    </Reference>
+    <Reference Include="Google.Protobuf, Version=3.0.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604" />
     <Reference Include="S2Geometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\S2Geometry.1.0.3\lib\portable-net45+wp8+win8\S2Geometry.dll</HintPath>
       <Private>True</Private>
@@ -227,6 +220,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\POGOProtos\POGOProtos.csproj">
+      <Project>{a03a7bb2-4f0b-467b-84b2-9a76e6aae6fb}</Project>
+      <Name>POGOProtos</Name>
+    </ProjectReference>
     <ProjectReference Include="..\PokemonGo.RocketAPI\PokemonGo.RocketAPI.csproj">
       <Project>{05d2da44-1b8e-4cf7-94ed-4d52451cd095}</Project>
       <Name>PokemonGo.RocketAPI</Name>

diff --git a/PokemonGo.RocketBot.Window/Forms/MainForm.cs b/PokemonGo.RocketBot.Window/Forms/MainForm.cs
@@ -556,7 +556,6 @@ private async void btnRefresh_Click(object sender, EventArgs e)
         private void startStopBotToolStripMenuItem_Click(object sender, EventArgs e)
         {
             startStopBotToolStripMenuItem.Enabled = false;
-            settingToolStripMenuItem.Enabled = false;
             Task.Run(StartBot);
         }
 

diff --git a/PokemonGo.RocketBot.Window/Forms/SettingForm.cs b/PokemonGo.RocketBot.Window/Forms/SettingForm.cs
@@ -294,14 +294,14 @@ private void SettingsForm_Load(object sender, EventArgs e)
 
         protected override void OnLoad(EventArgs e)
         {
-            var btn = new Button { Size = new Size(25, GoogleApiBox.ClientSize.Height + 2) };
+            var btn = new Button {Size = new Size(25, GoogleApiBox.ClientSize.Height + 2)};
             btn.Location = new Point(GoogleApiBox.ClientSize.Width - btn.Width, -1);
             btn.Cursor = Cursors.Default;
             btn.Image = ResourceHelper.GetImage("question");
             btn.Click += googleapihep_click;
             GoogleApiBox.Controls.Add(btn);
             // Send EM_SETMARGINS to prevent text from disappearing underneath the button
-            SendMessage(GoogleApiBox.Handle, 0xd3, (IntPtr)2, (IntPtr)(btn.Width << 16));
+            SendMessage(GoogleApiBox.Handle, 0xd3, (IntPtr) 2, (IntPtr) (btn.Width << 16));
             base.OnLoad(e);
         }
 
@@ -348,7 +348,7 @@ private static List<PokemonId> ConvertClbToList(CheckedListBox input)
         /// </summary>
         private List<string> GetLanguageList()
         {
-            var languages = new List<string> { "en" };
+            var languages = new List<string> {"en"};
             var langFiles = Directory.GetFiles(LanguagePath, "*.json", SearchOption.TopDirectoryOnly);
             languages.AddRange(langFiles.Select(
                 langFileName => Path.GetFileNameWithoutExtension(langFileName)?.Replace("translation.", ""))
@@ -365,7 +365,7 @@ private void UpdateLocationInfo()
             tbLatitude.Text = gMapCtrl.Position.Lat.ToString(CultureInfo.InvariantCulture);
             tbLongitude.Text = gMapCtrl.Position.Lng.ToString(CultureInfo.InvariantCulture);
             //update trackbar
-            trackBar.Value = (int)Math.Round(gMapCtrl.Zoom);
+            trackBar.Value = (int) Math.Round(gMapCtrl.Zoom);
         }
 
         /// <summary>
@@ -710,7 +710,7 @@ private void AdressBox_Leave(object sender, EventArgs e)
 
         private void AdressBox_KeyPress(object sender, KeyPressEventArgs e)
         {
-            if (e.KeyChar != (char)Keys.Enter)
+            if (e.KeyChar != (char) Keys.Enter)
             {
                 return;
             }

diff --git a/PokemonGo.RocketBot.Window/Helpers/MachineIdHelper.cs b/PokemonGo.RocketBot.Window/Helpers/MachineIdHelper.cs
@@ -13,7 +13,7 @@ public static string GetCpuId()
 
             foreach (var o in moc)
             {
-                var mo = (ManagementObject)o;
+                var mo = (ManagementObject) o;
                 cpuInfo = mo.Properties["processorID"].Value.ToString();
                 break;
             }

diff --git a/PokemonGo.RocketBot.Window/Helpers/TimeHelper.cs b/PokemonGo.RocketBot.Window/Helpers/TimeHelper.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PokemonGo.RocketBot.Window.Helpers
 {
@@ -13,4 +9,4 @@ public static DateTime FromUnixTimeUtc(long time)
             return new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(time);
         }
     }
-}
+}
diff --git a/PokemonGo.RocketBot.Window/PokemonGo.RocketBot.Window.csproj b/PokemonGo.RocketBot.Window/PokemonGo.RocketBot.Window.csproj
@@ -147,9 +147,6 @@
       <HintPath>..\packages\ObjectListView.Official.2.9.1\lib\net20\ObjectListView.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="POGOProtos">
-      <HintPath>..\packages\POGOProtos.1.7.0\lib\net45\POGOProtos.dll</HintPath>
-    </Reference>
     <Reference Include="S2Geometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\S2Geometry.1.0.3\lib\portable-net45+wp8+win8\S2Geometry.dll</HintPath>
       <Private>True</Private>
@@ -565,6 +562,10 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\POGOProtos\POGOProtos.csproj">
+      <Project>{a03a7bb2-4f0b-467b-84b2-9a76e6aae6fb}</Project>
+      <Name>POGOProtos</Name>
+    </ProjectReference>
     <ProjectReference Include="..\PokemonGo.RocketAPI\PokemonGo.RocketAPI.csproj">
       <Project>{05d2da44-1b8e-4cf7-94ed-4d52451cd095}</Project>
       <Name>PokemonGo.RocketAPI</Name>

diff --git a/RocketBot.sln b/RocketBot.sln
@@ -14,6 +14,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokemonGo.RocketBot.Window"
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokemonGo.RocketAPI", "PokemonGo.RocketAPI\PokemonGo.RocketAPI.csproj", "{05D2DA44-1B8E-4CF7-94ED-4D52451CD095}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB} = {A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "POGOProtos", "POGOProtos\POGOProtos.csproj", "{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -75,6 +80,22 @@ Global
 		{05D2DA44-1B8E-4CF7-94ED-4D52451CD095}.v4.0-Release|Any CPU.Build.0 = Release|Any CPU
 		{05D2DA44-1B8E-4CF7-94ED-4D52451CD095}.v4.0-Release|x86.ActiveCfg = Release|x86
 		{05D2DA44-1B8E-4CF7-94ED-4D52451CD095}.v4.0-Release|x86.Build.0 = Release|x86
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.Debug|x86.ActiveCfg = Debug|x86
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.Debug|x86.Build.0 = Debug|x86
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.Release|x86.ActiveCfg = Release|x86
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.Release|x86.Build.0 = Release|x86
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.v4.0-Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.v4.0-Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.v4.0-Debug|x86.ActiveCfg = Debug|x86
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.v4.0-Debug|x86.Build.0 = Debug|x86
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.v4.0-Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.v4.0-Release|Any CPU.Build.0 = Release|Any CPU
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.v4.0-Release|x86.ActiveCfg = Release|x86
+		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}.v4.0-Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
+5 −5		Data/Battle/BattleType.cs
+216 −0		Data/BuddyPokemon.cs
+46 −8		Data/Logs/ActionLogEntry.cs
+231 −0		Data/Logs/BuddyPokemonLogEntry.cs
+10 −9		Data/Logs/CatchPokemonLogEntry.cs
+14 −24		Data/Player/PlayerStats.cs
+80 −16		Data/PlayerData.cs
+32 −3		Data/PokemonData.cs
+6 −5		Enums/PokemonRarity.cs
+66 −72		Map/Fort/FortData.cs
+61 −5		Map/Pokemon/NearbyPokemon.cs
+60 −36		Networking/Envelopes/RequestEnvelope.cs
+3 −185		Networking/Envelopes/ResponseEnvelope.cs
+2,614 −0		Networking/Envelopes/Signature.cs
+23 −19		Networking/Envelopes/Unknown6.cs
+160 −0		Networking/Requests/Messages/CheckChallenge.cs
+132 −0		Networking/Requests/Messages/GetBuddyWalked.cs
+32 −3		Networking/Requests/Messages/GetGymDetailsMessage.cs
+180 −22		Networking/Requests/Messages/GetPlayerMessage.cs
+160 −0		Networking/Requests/Messages/PlayerLocaleMessage.cs
+160 −0		Networking/Requests/Messages/SetBuddyPokemon.cs
+193 −158		Networking/Requests/Messages/SetFavoritePokemonMessage.cs
+160 −0		Networking/Requests/Messages/VerifyChallenge.cs
+18 −12		Networking/Requests/RequestType.cs
+88 −6		Networking/Responses/AddFortModifierResponse.cs
+36 −0		Networking/Responses/Base.cs
+188 −0		Networking/Responses/CheckChallengeResponse.cs
+46 −13		Networking/Responses/ClaimCodenameResponse.cs
+5 −3		Networking/Responses/FortDeployPokemonResponse.cs
+6 −4		Networking/Responses/FortSearchResponse.cs
+219 −0		Networking/Responses/GetBuddyWalkedResponse.cs
+4 −3		Networking/Responses/ReleasePokemonResponse.cs
+215 −0		Networking/Responses/SetBuddyPokemonResponse.cs
+160 −0		Networking/Responses/VerifyChallengeResponse.cs
+3 −3		Networking/Signature.cs
+12 −1		POGOProtos.csproj
+45 −9		Settings/GlobalSettings.cs
+246 −0		Settings/GpsSettings.cs
+32 −4		Settings/Master/GymBattleSettings.cs
+77 −3		Settings/Master/PokemonSettings.cs
+0 −6,707		bin/Release/Google.Protobuf.xml
+ −		obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+0 −14		obj/Debug/POGOProtos.csproj.FileListAbsolute.txt
+0 −0		obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
+0 −0		obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
+0 −0		obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
+0 −6		obj/Release/POGOProtos.csproj.FileListAbsolute.txt
+0 −0		obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
+0 −0		obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
+0 −0		obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
+31 −30		Client.cs
+0 −1		Exceptions/AccountNotVerifiedException.cs
+1 −2		Exceptions/GoogleException.cs
+1 −1		Exceptions/GoogleOfflineException.cs
+4 −2		Exceptions/InvalidResponseException.cs
+12 −7		Extensions/HttpClientExtensions.cs
+1 −1		Helpers/RandomHelper.cs
+138 −106		Helpers/RequestBuilder.cs
+2 −1		Helpers/RetryHandler.cs
+2 −42		Helpers/Utils.cs
+1 −1		HttpClient/PokemonClient.cs
+5 −16		Login/GoogleLogin.cs
+3 −3		Login/ILoginType.cs
+23 −18		Login/PtcLogin.cs
+12 −69		PokemonGo.RocketAPI.csproj
+53 −21		Rpc/BaseRpc.cs
+41 −27		Rpc/Download.cs
+18 −11		Rpc/Encounter.cs
+17 −15		Rpc/Fort.cs
+23 −16		Rpc/Inventory.cs
+4 −5		Rpc/Login.cs
+19 −13		Rpc/Map.cs
+13 −5		Rpc/Misc.cs
+45 −23		Rpc/Player.cs
+5 −1		app.config
+ −		bin/Debug/Pokemon.Go.Rocket.API.dll
+0 −15		bin/Debug/Pokemon.Go.Rocket.API.dll.config
+ −		bin/Debug/Pokemon.Go.Rocket.API.pdb
+ −		obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+ −		obj/Debug/Pokemon.Go.Rocket.API.dll
+ −		obj/Debug/Pokemon.Go.Rocket.API.pdb
+6 −34		obj/Debug/PokemonGo.RocketAPI.csproj.FileListAbsolute.txt
+3 −46		packages.config