ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-19 22:37:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

deps: update lumina, manually include Lumina.Generated as resource

Browse source
This commit is contained in:
goat 2020-11-23 00:26:05 +01:00
parent c8e7ef6052
commit 87bbf34601
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Dalamud/Dalamud.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="Target"> <PropertyGroup Label="Target">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<TargetFramework>net472</TargetFramework> <TargetFramework>net472</TargetFramework>
@ -31,15 +31,13 @@
<GeneratePackageOnBuild>false</GeneratePackageOnBuild> <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Resources\**" /> <None Remove="Resources\Lumina.Generated.dll" />
<EmbeddedResource Remove="Resources\**" />
<None Remove="Resources\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CheapLoc" Version="1.1.3" /> <PackageReference Include="CheapLoc" Version="1.1.3" />
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" /> <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
<PackageReference Include="Lumina" Version="2.2.0" /> <PackageReference Include="Lumina" Version="2.4.1" />
<PackageReference Include="Lumina.Generated" Version="5.30.2" /> <PackageReference Include="Lumina.Excel" Version="5.35.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" />
@ -71,4 +69,10 @@
<ProjectReference Include="..\lib\ImGuiScene\deps\SDL2-CS\SDL2-CS.csproj" /> <ProjectReference Include="..\lib\ImGuiScene\deps\SDL2-CS\SDL2-CS.csproj" />
<ProjectReference Include="..\lib\ImGuiScene\ImGuiScene\ImGuiScene.csproj" /> <ProjectReference Include="..\lib\ImGuiScene\ImGuiScene\ImGuiScene.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ContentWithTargetPath Include="Resources\Lumina.Generated.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<TargetPath>Lumina.Generated.dll</TargetPath>
</ContentWithTargetPath>
</ItemGroup>
</Project> </Project>

2
Dalamud/Game/Chat/SeStringHandling/SeStringManager.cs
View file

@ -142,7 +142,7 @@ namespace Dalamud.Game.Chat.SeStringHandling
var mapSheet = this.data.GetExcelSheet<Map>(); var mapSheet = this.data.GetExcelSheet<Map>();
var matches = this.data.GetExcelSheet<PlaceName>().GetRows() var matches = this.data.GetExcelSheet<PlaceName>().GetRows()
.Where(row => row.Name.ToLowerInvariant() == placeName.ToLowerInvariant()) .Where(row => row.Name.ToString().ToLowerInvariant() == placeName.ToLowerInvariant())
.ToArray(); .ToArray();
foreach (var place in matches) foreach (var place in matches)

5
Dalamud/Game/Network/NetworkHandlers.cs
View file

@ -60,8 +60,9 @@ namespace Dalamud.Game.Network {
return; return;
} }
var cfcName = contentFinderCondition.Name.ToString();
if (string.IsNullOrEmpty(contentFinderCondition.Name)) { if (string.IsNullOrEmpty(contentFinderCondition.Name)) {
contentFinderCondition.Name = "Duty Roulette"; cfcName = "Duty Roulette";
contentFinderCondition.Image = 112324; contentFinderCondition.Image = 112324;
} }
@ -80,7 +81,7 @@ namespace Dalamud.Game.Network {
Task.Run(async () => { Task.Run(async () => {
if(this.dalamud.Configuration.DutyFinderChatMessage) if(this.dalamud.Configuration.DutyFinderChatMessage)
this.dalamud.Framework.Gui.Chat.Print("Duty pop: " + contentFinderCondition.Name); this.dalamud.Framework.Gui.Chat.Print("Duty pop: " + cfcName);
await this.ProcessCfPop?.Invoke(contentFinderCondition); await this.ProcessCfPop?.Invoke(contentFinderCondition);
}); });

BIN
Dalamud/Resources/Lumina.Generated.dll Normal file
View file

Binary file not shown.