XIVChat
/
XIVChat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: push changes

This commit is contained in:
Anna 2022-08-22 13:46:17 -04:00
parent e9a250bf57
commit b9516b2b1a
Signed by: anna
GPG Key ID: 0B391D8F06FCD9E0
8 changed files with 319 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

418
XIVChat Desktop Installer/XIVChat Desktop.wxs
View File

File diff suppressed because it is too large Load Diff

84
XIVChat Desktop/XIVChat Desktop.csproj
View File

@ -16,63 +16,63 @@
</PropertyGroup>
<ItemGroup>
<None Remove="Resources\fonticon_ps4.tex.png"/>
<None Remove="Resources\fonts\ffxiv.ttf"/>
<None Remove="Resources\logo.ico"/>
<None Remove="Resources\status\app_status_afk.png"/>
<None Remove="Resources\status\app_status_contents.png"/>
<None Remove="Resources\status\app_status_contents_same.png"/>
<None Remove="Resources\status\app_status_contents_similar.png"/>
<None Remove="Resources\status\app_status_cross_party_leader.png"/>
<None Remove="Resources\status\app_status_cross_party_member.png"/>
<None Remove="Resources\status\app_status_offline.png"/>
<None Remove="Resources\status\app_status_online.png"/>
<None Remove="Resources\status\app_status_party_leader.png"/>
<None Remove="Resources\status\app_status_party_member.png"/>
<None Remove="Resources\status\app_status_roleplaying.png"/>
<None Remove="Resources\status\app_status_roleplaying.svg"/>
<None Remove="Resources\fonticon_ps4.tex.png" />
<None Remove="Resources\fonts\ffxiv.ttf" />
<None Remove="Resources\logo.ico" />
<None Remove="Resources\status\app_status_afk.png" />
<None Remove="Resources\status\app_status_contents.png" />
<None Remove="Resources\status\app_status_contents_same.png" />
<None Remove="Resources\status\app_status_contents_similar.png" />
<None Remove="Resources\status\app_status_cross_party_leader.png" />
<None Remove="Resources\status\app_status_cross_party_member.png" />
<None Remove="Resources\status\app_status_offline.png" />
<None Remove="Resources\status\app_status_online.png" />
<None Remove="Resources\status\app_status_party_leader.png" />
<None Remove="Resources\status\app_status_party_member.png" />
<None Remove="Resources\status\app_status_roleplaying.png" />
<None Remove="Resources\status\app_status_roleplaying.svg" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\fonticon_ps4.tex.png"/>
<Resource Include="Resources\fonts\ffxiv.ttf"/>
<Resource Include="Resources\logo.ico"/>
<Resource Include="Resources\status\app_status_afk.png"/>
<Resource Include="Resources\status\app_status_contents.png"/>
<Resource Include="Resources\status\app_status_contents_same.png"/>
<Resource Include="Resources\status\app_status_contents_similar.png"/>
<Resource Include="Resources\status\app_status_cross_party_leader.png"/>
<Resource Include="Resources\status\app_status_cross_party_member.png"/>
<Resource Include="Resources\status\app_status_offline.png"/>
<Resource Include="Resources\status\app_status_online.png"/>
<Resource Include="Resources\status\app_status_party_leader.png"/>
<Resource Include="Resources\status\app_status_party_member.png"/>
<Resource Include="Resources\status\app_status_roleplaying.png"/>
<Resource Include="Resources\fonticon_ps4.tex.png" />
<Resource Include="Resources\fonts\ffxiv.ttf" />
<Resource Include="Resources\logo.ico" />
<Resource Include="Resources\status\app_status_afk.png" />
<Resource Include="Resources\status\app_status_contents.png" />
<Resource Include="Resources\status\app_status_contents_same.png" />
<Resource Include="Resources\status\app_status_contents_similar.png" />
<Resource Include="Resources\status\app_status_cross_party_leader.png" />
<Resource Include="Resources\status\app_status_cross_party_member.png" />
<Resource Include="Resources\status\app_status_offline.png" />
<Resource Include="Resources\status\app_status_online.png" />
<Resource Include="Resources\status\app_status_party_leader.png" />
<Resource Include="Resources\status\app_status_party_member.png" />
<Resource Include="Resources\status\app_status_roleplaying.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autoupdater.NET.Official" Version="1.6.4"/>
<PackageReference Include="Fody" Version="6.5.1">
<PackageReference Include="Autoupdater.NET.Official" Version="1.7.0" />
<PackageReference Include="Fody" Version="6.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0"/>
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.0.2"/>
<PackageReference Include="ModernWpfUI" Version="0.9.4"/>
<PackageReference Include="ModernWpfUI.MahApps" Version="0.9.4"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
<PackageReference Include="ModernWpfUI" Version="0.9.4" />
<PackageReference Include="ModernWpfUI.MahApps" Version="0.9.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Sentry" Version="3.4.0"/>
<PackageReference Include="Sodium.Core" Version="1.2.3"/>
<PackageReference Include="System.Drawing.Common" Version="5.0.2"/>
<PackageReference Include="WpfWindowPlacement" Version="3.0.0"/>
<PackageReference Include="Sentry" Version="3.16.0" />
<PackageReference Include="Sodium.Core" Version="1.2.3" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="WpfWindowPlacement" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MdXaml\MdXaml\MdXaml.csproj"/>
<ProjectReference Include="..\XIVChatCommon\XIVChatCommon.csproj"/>
<ProjectReference Include="..\MdXaml\MdXaml\MdXaml.csproj" />
<ProjectReference Include="..\XIVChatCommon\XIVChatCommon.csproj" />
</ItemGroup>
<ItemGroup>

3
XIVChatCommon/Message/Client/ClientPreferences.cs
View File

@ -26,6 +26,9 @@ namespace XIVChatCommon.Message.Client {
[Preference(typeof(bool))]
TargetingListSupport = 1,
[Preference(typeof(bool))]
HousingLocationSupport = 2,
}
public static class ClientPreferencesExtension {

2
XIVChatCommon/Message/Server/PlayerData.cs
View File

@ -33,4 +33,4 @@ namespace XIVChatCommon.Message.Server {
return MessagePackSerializer.Serialize(this);
}
}
}
}

8
XIVChatCommon/Message/Server/ServerBacklog.cs
View File

@ -6,10 +6,14 @@ namespace XIVChatCommon.Message.Server {
[Key(0)]
public readonly ServerMessage[] messages;
[Key(1)]
public readonly uint sequence;
protected override byte Code => (byte)ServerOperation.Backlog;
public ServerBacklog(ServerMessage[] messages) {
public ServerBacklog(ServerMessage[] messages, uint sequence) {
this.messages = messages;
this.sequence = sequence;
}
public static ServerBacklog Decode(byte[] bytes) {
@ -20,4 +24,4 @@ namespace XIVChatCommon.Message.Server {
return MessagePackSerializer.Serialize(this);
}
}
}
}

57
XIVChatCommon/Message/Server/ServerHousingLocation.cs Normal file
View File

@ -0,0 +1,57 @@
using MessagePack;
namespace XIVChatCommon.Message.Server {
[MessagePackObject]
public class ServerHousingLocation : Encodable {
[Key(0)]
public readonly ushort? ward;
[Key(1)]
public readonly ushort? plot;
[Key(2)]
public readonly bool plotExterior;
[Key(3)]
public readonly byte? apartmentWing;
public ServerHousingLocation(ushort? ward, ushort? plot, bool plotExterior, byte? apartmentWing) {
this.ward = ward;
this.plot = plot;
this.plotExterior = plotExterior;
this.apartmentWing = apartmentWing;
}
[IgnoreMember]
protected override byte Code => (byte) ServerOperation.HousingLocation;
public static ServerHousingLocation Decode(byte[] bytes) {
return MessagePackSerializer.Deserialize<ServerHousingLocation>(bytes);
}
protected override byte[] PayloadEncode() {
return MessagePackSerializer.Serialize(this);
}
public override bool Equals(object? obj) {
if (obj is not ServerHousingLocation other) {
return false;
}
return this.ward == other.ward
&& this.plot == other.plot
&& this.plotExterior == other.plotExterior
&& this.apartmentWing == other.apartmentWing;
}
public override int GetHashCode() {
unchecked {
var hashCode = this.ward.GetHashCode();
hashCode = (hashCode * 397) ^ this.plot.GetHashCode();
hashCode = (hashCode * 397) ^ this.plotExterior.GetHashCode();
hashCode = (hashCode * 397) ^ this.apartmentWing.GetHashCode();
return hashCode;
}
}
}
}

2
XIVChatCommon/Message/Server/ServerOperation.cs
View File

@ -9,6 +9,6 @@
Backlog = 7,
PlayerList = 8,
LinkshellList = 9,
TargetingList = 10,
HousingLocation = 10,
}
}

4
XIVChatCommon/XIVChatCommon.csproj
View File

@ -5,11 +5,11 @@
<Nullable>enable</Nullable>
<AssemblyVersion>1.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
<TargetFrameworks>net48;net5.0</TargetFrameworks>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MessagePack" Version="2.2.85"/>
<PackageReference Include="MessagePack" Version="2.3.85"/>
<PackageReference Include="Sodium.Core" Version="1.2.3"/>
</ItemGroup>