Update dependencies

Marvin0401 · Feb 4, 2021 · c67478e · c67478e
1 parent 0dc986e
commit c67478e
Showing 14 changed files with 17 additions and 17 deletions.
diff --git a/SysBot.Pokemon.Discord/Helpers/ReusableActions.cs b/SysBot.Pokemon.Discord/Helpers/ReusableActions.cs
@@ -66,7 +66,7 @@ public static async Task SendPKMAsShowdownSetAsync(this ISocketMessageChannel ch
 
         public static string GetFormattedShowdownText(PKM pkm)
         {
-            var showdown = ShowdownSet.GetShowdownText(pkm);
+            var showdown = ShowdownParsing.GetShowdownText(pkm);
             return Format.Code(showdown);
         }
 

diff --git a/SysBot.Pokemon.Discord/SysBot.Pokemon.Discord.csproj b/SysBot.Pokemon.Discord/SysBot.Pokemon.Discord.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Discord.Net" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.4" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
-    <PackageReference Include="PKHeX.Core" Version="20.11.28" />
+    <PackageReference Include="PKHeX.Core" Version="21.1.31" />
     <ProjectReference Include="..\SysBot.Base\SysBot.Base.csproj" />
     <ProjectReference Include="..\SysBot.Pokemon\SysBot.Pokemon.csproj" />
   </ItemGroup>

diff --git a/SysBot.Pokemon.Twitch/SysBot.Pokemon.Twitch.csproj b/SysBot.Pokemon.Twitch/SysBot.Pokemon.Twitch.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PKHeX.Core" Version="20.11.28" />
-    <PackageReference Include="TwitchLib.Client" Version="3.1.5" />
+    <PackageReference Include="PKHeX.Core" Version="21.1.31" />
+    <PackageReference Include="TwitchLib.Client" Version="3.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/SysBot.Pokemon.WinForms/SysBot.Pokemon.WinForms.csproj b/SysBot.Pokemon.WinForms/SysBot.Pokemon.WinForms.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="PKHeX.Core" Version="20.11.28" />
+    <PackageReference Include="PKHeX.Core" Version="21.1.31" />
     <PackageReference Include="System.Resources.Extensions" Version="4.6.0" />
   </ItemGroup>
 

diff --git a/SysBot.Pokemon.YouTube/SysBot.Pokemon.YouTube.csproj b/SysBot.Pokemon.YouTube/SysBot.Pokemon.YouTube.csproj
@@ -13,7 +13,7 @@
 		<PackageReference Include="Google.Apis.Core" Version="1.45.0" />
 		<PackageReference Include="Google.Apis.YouTube.v3" Version="1.45.0.1929" />
 		<PackageReference Include="Google.Apis.YouTubePartner.v1" Version="1.35.1.1334" />
-		<PackageReference Include="PKHeX.Core" Version="20.11.28" />
+		<PackageReference Include="PKHeX.Core" Version="21.1.31" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/SysBot.Pokemon.Z3/SysBot.Pokemon.Z3.csproj b/SysBot.Pokemon.Z3/SysBot.Pokemon.Z3.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PKHeX.Core" Version="20.11.28" />
+    <PackageReference Include="PKHeX.Core" Version="21.1.31" />
     <ProjectReference Include="..\SysBot.Pokemon\SysBot.Pokemon.csproj" />
   </ItemGroup>
 
@@ -17,7 +17,7 @@
     <When Condition=" '$(Platform)' == 'x64' OR $(RuntimeIdentifier.EndsWith('x64')) ">
       <!-- x64 specific references -->
       <ItemGroup>
-        <PackageReference Include="Microsoft.Z3.x64" Version="4.8.8" />
+        <PackageReference Include="Microsoft.Z3.x64" Version="4.8.10" />
       </ItemGroup>
     </When>
 

diff --git a/SysBot.Pokemon/BotEgg/EggBot.cs b/SysBot.Pokemon/BotEgg/EggBot.cs
@@ -76,7 +76,7 @@ public override async Task MainLoop(CancellationToken token)
                 }
 
                 encounterCount++;
-                Log($"Encounter: {encounterCount}:{Environment.NewLine}{ShowdownSet.GetShowdownText(pk)}{Environment.NewLine}");
+                Log($"Encounter: {encounterCount}:{Environment.NewLine}{ShowdownParsing.GetShowdownText(pk)}{Environment.NewLine}");
                 Counts.AddCompletedEggs();
 
                 if (DumpSetting.Dump && !string.IsNullOrEmpty(DumpSetting.DumpFolder))

diff --git a/SysBot.Pokemon/BotEncounter/EncounterBot.cs b/SysBot.Pokemon/BotEncounter/EncounterBot.cs
@@ -201,7 +201,7 @@ private async Task<int> StepUntilEncounter(CancellationToken token)
         private async Task<bool> HandleEncounter(PK8 pk, bool legends, CancellationToken token)
         {
             encounterCount++;
-            Log($"Encounter: {encounterCount}{Environment.NewLine}{ShowdownSet.GetShowdownText(pk)}{Environment.NewLine}");
+            Log($"Encounter: {encounterCount}{Environment.NewLine}{ShowdownParsing.GetShowdownText(pk)}{Environment.NewLine}");
             if (legends)
                 Counts.AddCompletedLegends();
             else

diff --git a/SysBot.Pokemon/BotFossil/FossilBot.cs b/SysBot.Pokemon/BotFossil/FossilBot.cs
@@ -86,7 +86,7 @@ public override async Task MainLoop(CancellationToken token)
                 }
 
                 encounterCount++;
-                Log($"Encounter: {encounterCount}:{Environment.NewLine}{ShowdownSet.GetShowdownText(pk)}{Environment.NewLine}{Environment.NewLine}");
+                Log($"Encounter: {encounterCount}:{Environment.NewLine}{ShowdownParsing.GetShowdownText(pk)}{Environment.NewLine}{Environment.NewLine}");
                 if (DumpSetting.Dump)
                     DumpPokemon(DumpSetting.DumpFolder, "fossil", pk);
 

diff --git a/SysBot.Pokemon/Helpers/AutoLegalityWrapper.cs b/SysBot.Pokemon/Helpers/AutoLegalityWrapper.cs
@@ -75,15 +75,15 @@ SaveFile GetFallbackBlank(int generation)
         private static void InitializeCoreStrings()
         {
             var lang = Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName.Substring(0, 2);
-            Util.SetLocalization(typeof(LegalityCheckStrings), lang);
-            Util.SetLocalization(typeof(MessageStrings), lang);
+            LocalizationUtil.SetLocalization(typeof(LegalityCheckStrings), lang);
+            LocalizationUtil.SetLocalization(typeof(MessageStrings), lang);
             RibbonStrings.ResetDictionary(GameInfo.Strings.ribbons);
             ParseSettings.ChangeLocalizationStrings(GameInfo.Strings.movelist, GameInfo.Strings.specieslist);
         }
 
         public static bool CanBeTraded(this PKM pkm)
         {
-            return !AltFormInfo.IsFusedForm(pkm.Species, pkm.AltForm, pkm.Format);
+            return !FormInfo.IsFusedForm(pkm.Species, pkm.Form, pkm.Format);
         }
 
         public static ITrainerInfo GetTrainerInfo(int gen) => TrainerSettings.GetSavedTrainerData(gen);

diff --git a/SysBot.Pokemon/Structures/Ledy/PokemonPool.cs b/SysBot.Pokemon/Structures/Ledy/PokemonPool.cs
@@ -154,7 +154,7 @@ private static bool DisallowSurpriseTrade(PKM pk)
                 return true;
 
             // Can't surprise trade fused stuff.
-            if (AltFormInfo.IsFusedForm(pk.Species, pk.AltForm, pk.Format))
+            if (FormInfo.IsFusedForm(pk.Species, pk.Form, pk.Format))
                 return true;
 
             return false;

diff --git a/SysBot.Pokemon/SysBot.Pokemon.csproj b/SysBot.Pokemon/SysBot.Pokemon.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PKHeX.Core" Version="20.11.28" />
+    <PackageReference Include="PKHeX.Core" Version="21.1.31" />
     <ProjectReference Include="..\SysBot.Base\SysBot.Base.csproj" />
   </ItemGroup>
 

diff --git a/SysBot.Pokemon/deps/PKHeX.Core.AutoMod.dll b/SysBot.Pokemon/deps/PKHeX.Core.AutoMod.dll
diff --git a/SysBot.Tests/SysBot.Tests.csproj b/SysBot.Tests/SysBot.Tests.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>