deps: update lumina

This commit is contained in:
goat 2020-02-23 22:33:20 +09:00
parent 15d340d0ed
commit d21d366993
2 changed files with 9 additions and 18 deletions

View file

@ -40,7 +40,7 @@
<EmbeddedResource Include="Resources\eye.png" /> <EmbeddedResource Include="Resources\eye.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Lumina" Version="1.0.0-preview7" /> <PackageReference Include="Lumina" Version="1.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="PropertyChanged.Fody" Version="2.6.1" /> <PackageReference Include="PropertyChanged.Fody" Version="2.6.1" />
<PackageReference Include="Serilog" Version="2.6.0" /> <PackageReference Include="Serilog" Version="2.6.0" />

View file

@ -73,23 +73,14 @@ namespace Dalamud.Data
CacheFileResources = true CacheFileResources = true
}; };
switch (this.language) luminaOptions.DefaultExcelLanguage = this.language switch {
{ ClientLanguage.Japanese => Language.Japanese,
case ClientLanguage.Japanese: ClientLanguage.English => Language.English,
luminaOptions.DefaultExcelLanguage = Language.Japanese; ClientLanguage.German => Language.German,
break; ClientLanguage.French => Language.French,
case ClientLanguage.English: _ => throw new ArgumentOutOfRangeException(nameof(this.language),
luminaOptions.DefaultExcelLanguage = Language.English; "Unknown Language: " + this.language)
break; };
case ClientLanguage.German:
luminaOptions.DefaultExcelLanguage = Language.German;
break;
case ClientLanguage.French:
luminaOptions.DefaultExcelLanguage = Language.French;
break;
default:
throw new ArgumentOutOfRangeException(nameof(this.language), "Unknown Language: " + this.language);
}
gameData = new Lumina.Lumina(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "sqpack"), luminaOptions); gameData = new Lumina.Lumina(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "sqpack"), luminaOptions);