diff --git a/POGOProtos b/POGOProtos index edd0d9b..36a2a8e 160000 --- a/POGOProtos +++ b/POGOProtos @@ -1 +1 @@ -Subproject commit edd0d9b75906db892c11a003f801874c7f1e2ac4 +Subproject commit 36a2a8ea792cfa05c55ad3b692c67380e4654952 diff --git a/PokemonGo.RocketAPI b/PokemonGo.RocketAPI index 3aae75c..ad89192 160000 --- a/PokemonGo.RocketAPI +++ b/PokemonGo.RocketAPI @@ -1 +1 @@ -Subproject commit 3aae75c4e8bc5fb5fcee821ea63d0a808592e395 +Subproject commit ad89192001dc1beade27a6296f183e42015f2170 diff --git a/PokemonGo.RocketBot.Logic/PokemonGo.RocketBot.Logic.csproj b/PokemonGo.RocketBot.Logic/PokemonGo.RocketBot.Logic.csproj index 94b3821..8a047e2 100644 --- 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 index 4802bb2..f40441b 100644 --- a/PokemonGo.RocketBot.Window/Forms/MainForm.cs +++ b/PokemonGo.RocketBot.Window/Forms/MainForm.cs @@ -556,7 +556,6 @@ namespace PokemonGo.RocketBot.Window.Forms 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 index 7e3b8db..1f2cd02 100644 --- a/PokemonGo.RocketBot.Window/Forms/SettingForm.cs +++ b/PokemonGo.RocketBot.Window/Forms/SettingForm.cs @@ -294,14 +294,14 @@ namespace PokemonGo.RocketBot.Window.Forms 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 @@ namespace PokemonGo.RocketBot.Window.Forms /// </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 @@ namespace PokemonGo.RocketBot.Window.Forms 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 @@ namespace PokemonGo.RocketBot.Window.Forms 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 index 36eaeaa..82923a0 100644 --- a/PokemonGo.RocketBot.Window/Helpers/MachineIdHelper.cs +++ b/PokemonGo.RocketBot.Window/Helpers/MachineIdHelper.cs @@ -13,7 +13,7 @@ namespace PokemonGo.RocketBot.Window.Helpers 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 index f3cc418..da16ebb 100644 --- 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 @@ namespace PokemonGo.RocketBot.Window.Helpers return new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(time); } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/PokemonGo.RocketBot.Window.csproj b/PokemonGo.RocketBot.Window/PokemonGo.RocketBot.Window.csproj index 05ef6d1..91204dd 100644 --- 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 index d35936f..fa6e685 100644 --- 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