Skip to content

Commit

Permalink
Merge pull request #759 from xPaw/update-protobufs
Browse files Browse the repository at this point in the history
Update protobufs
  • Loading branch information
yaakov-h authored Oct 24, 2019
2 parents 5159028 + f75c471 commit a5d17a0
Show file tree
Hide file tree
Showing 56 changed files with 5,671 additions and 1,992 deletions.
15 changes: 9 additions & 6 deletions Resources/NetHookAnalyzer2/NetHookAnalyzer2/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -306,13 +306,16 @@ void HandleFileCreated(string fullPath)
return;
}

var listViewItem = item.AsListViewItem();
itemsListView.Items.Add(listViewItem);

if (automaticallySelectNewItemsToolStripMenuItem.Checked)
itemsListView.Invoke( ( MethodInvoker ) delegate ()
{
SelectLastItem();
}
var listViewItem = item.AsListViewItem();
itemsListView.Items.Add( listViewItem );

if ( automaticallySelectNewItemsToolStripMenuItem.Checked )
{
SelectLastItem();
}
} );
}

void OnFolderWatcherCreated(object sender, FileSystemEventArgs e)
Expand Down
4 changes: 2 additions & 2 deletions Resources/NetHookAnalyzer2/NetHookAnalyzer2/NetHookItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@ string ReadInnerMessageNameCore()

case SteamKit2.EMsg.ClientServiceMethodLegacy:
{
var proto = ReadAsProtobufMsg<CMsgClientServiceMethod>();
var proto = ReadAsProtobufMsg<CMsgClientServiceMethodLegacy>();
return proto.Body.method_name;
}

case SteamKit2.EMsg.ClientServiceMethodLegacyResponse:
{
var proto = ReadAsProtobufMsg<CMsgClientServiceMethodResponse>();
var proto = ReadAsProtobufMsg<CMsgClientServiceMethodLegacyResponse>();
return proto.Body.method_name;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,6 @@ public IEnumerable<KeyValuePair<string, object>> GetExtraObjects(object body, ui
yield break;
}

foreach(var singleObject in updateMultiple.objects_added)
{
var extraNode = ReadExtraObject(singleObject);
if (extraNode != null)
{
yield return new KeyValuePair<string, object>(string.Format("New SO ({0})", extraNode.GetType().Name), extraNode);
}
}

foreach (var singleObject in updateMultiple.objects_modified)
{
var extraNode = ReadExtraObject(singleObject);
Expand All @@ -39,15 +30,6 @@ public IEnumerable<KeyValuePair<string, object>> GetExtraObjects(object body, ui
yield return new KeyValuePair<string, object>(string.Format("Modified SO ({0})", extraNode.GetType().Name), extraNode);
}
}

foreach (var singleObject in updateMultiple.objects_removed)
{
var extraNode = ReadExtraObject(singleObject);
if (extraNode != null)
{
yield return new KeyValuePair<string, object>(string.Format("Removed SO ({0})", extraNode.GetType().Name), extraNode);
}
}
}

object ReadExtraObject(CMsgSOMultipleObjects.SingleObject sharedObject)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class ClientServiceMethodResponseSpecialization : ISpecialization
{
public IEnumerable<KeyValuePair<string, object>> ReadExtraObjects(object messageObject)
{
var serviceMethodBody = messageObject as CMsgClientServiceMethodResponse;
var serviceMethodBody = messageObject as CMsgClientServiceMethodLegacyResponse;
if (serviceMethodBody == null)
{
yield break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class ClientServiceMethodSpecialization : ISpecialization
{
public IEnumerable<KeyValuePair<string, object>> ReadExtraObjects(object messageObject)
{
var serviceMethodBody = messageObject as CMsgClientServiceMethod;
var serviceMethodBody = messageObject as CMsgClientServiceMethodLegacy;
if (serviceMethodBody == null)
{
yield break;
Expand Down
1 change: 1 addition & 0 deletions Resources/ProtobufGen/protos.csv
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ dota2,dota_gcmessages_common.proto,GC\Dota\MsgGCCommon.cs,SteamKit2.GC.Dota.Inte
dota2,dota_gcmessages_common_match_management.proto,GC\Dota\MsgGCCommonMatchMgmt.cs,SteamKit2.GC.Dota.Internal
dota2,dota_gcmessages_msgid.proto,GC\Dota\MsgGCMsgId.cs,SteamKit2.GC.Dota.Internal
dota2,dota_gcmessages_server.proto,GC\Dota\MsgGCServer.cs,SteamKit2.GC.Dota.Internal
dota2,extramsgblockutil.proto,GC\Dota\MsgGCExtraMsgBlock.cs,SteamKit2.GC.Dota.Internal
dota2,dota_match_metadata.proto,GC\Dota\MsgMatchMetadata.cs,SteamKit2.GC.Dota.Internal
dota2,dota_shared_enums.proto,GC\Dota\MsgSharedEnums.cs,SteamKit2.GC.Dota.Internal
dota2,econ_gcmessages.proto,GC\Dota\SteamMsgGCEcon.cs,SteamKit2.GC.Dota.Internal
Expand Down
2 changes: 1 addition & 1 deletion Resources/Protobufs
Submodule Protobufs updated 59 files
+2 −0 csgo/econ_gcmessages.proto
+1 −0 csgo/engine_gcmessages.proto
+0 −2 csgo/gcsdk_gcmessages.proto
+14 −1 dota2/dota_clientmessages.proto
+73 −35 dota2/dota_gcmessages_client.proto
+3 −1 dota2/dota_gcmessages_client_match_management.proto
+2 −4 dota2/dota_gcmessages_client_team.proto
+45 −15 dota2/dota_gcmessages_common.proto
+41 −4 dota2/dota_gcmessages_common_match_management.proto
+16 −12 dota2/dota_gcmessages_msgid.proto
+133 −42 dota2/dota_gcmessages_server.proto
+4 −1 dota2/dota_match_metadata.proto
+28 −3 dota2/dota_shared_enums.proto
+35 −1 dota2/dota_usermessages.proto
+5 −0 dota2/econ_gcmessages.proto
+10 −0 dota2/extramsgblockutil.proto
+43 −0 dota2/gcsdk_gcmessages.proto
+2 −0 dota2/networkbasetypes.proto
+7 −3 dota2/steamdatagram_messages_auth.proto
+9 −5 dota2/steamdatagram_messages_sdr.proto
+9 −0 dota2/steammessages.proto
+7 −2 dota2/steamnetworkingsockets_messages_certs.proto
+4 −2 dota2/steamnetworkingsockets_messages_udp.proto
+10 −7 dota2/usermessages.proto
+17 −0 steam/htmlmessages.proto
+3 −0 steam/steamdatagram_messages_sdr.proto
+35 −28 steam/steammessages_appoverview.proto
+90 −1 steam/steammessages_base.proto
+24 −3 steam/steammessages_broadcast.steamclient.proto
+37 −0 steam/steammessages_clientmetrics.steamclient.proto
+17 −18 steam/steammessages_clientserver.proto
+28 −20 steam/steammessages_clientserver_2.proto
+24 −4 steam/steammessages_clientserver_login.proto
+6 −1 steam/steammessages_cloud.steamclient.proto
+2 −0 steam/steammessages_econ.steamclient.proto
+1 −0 steam/steammessages_friendmessages.steamclient.proto
+1 −0 steam/steammessages_parental.steamclient.proto
+79 −0 steam/steammessages_player.steamclient.proto
+43 −0 steam/steammessages_publishedfile.steamclient.proto
+2 −0 steam/steammessages_remoteclient.proto
+13 −0 steam/steammessages_remoteclient_discovery.proto
+48 −0 steam/steammessages_remoteclient_service.steamclient.proto
+34 −0 steam/steammessages_useraccount.steamclient.proto
+9 −4 steam/steammessages_virtualcontroller.proto
+7 −0 steam/steamnetworkingsockets_messages.proto
+1 −0 steam/steamnetworkingsockets_messages_certs.proto
+10 −0 steam/stream.proto
+202 −51 underlords/dac_gamemessages.proto
+176 −6 underlords/dac_gcmessages_client.proto
+50 −20 underlords/dac_gcmessages_common.proto
+33 −8 underlords/dac_gcmessages_server.proto
+1 −0 underlords/econ_gcmessages.proto
+38 −0 underlords/gcsdk_gcmessages.proto
+1 −0 underlords/networkbasetypes.proto
+9 −0 underlords/steammessages.proto
+6 −10 underlords/usermessages.proto
+102 −19 webui/friends.proto
+564 −0 webui/friends_mobile.proto
+2,243 −0 webui/steamui_libraryroot.proto
2 changes: 2 additions & 0 deletions SteamKit2/SteamKit2/Base/Generated/GC/CSGO/SteamMsgGCEcon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,8 @@ public enum EGCItemCustomizationNotification
{
k_EGCItemCustomizationNotification_NameItem = 1006,
k_EGCItemCustomizationNotification_UnlockCrate = 1007,
k_EGCItemCustomizationNotification_XRayItemReveal = 1008,
k_EGCItemCustomizationNotification_XRayItemClaim = 1009,
k_EGCItemCustomizationNotification_NameBaseItem = 1019,
k_EGCItemCustomizationNotification_RemoveItemName = 1030,
k_EGCItemCustomizationNotification_RemoveSticker = 1053,
Expand Down
10 changes: 10 additions & 0 deletions SteamKit2/SteamKit2/Base/Generated/GC/CSGO/SteamMsgGCEngine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,16 @@ public float keyframe_interval
public void Resetkeyframe_interval() => __pbn__keyframe_interval = null;
private float? __pbn__keyframe_interval;

[global::ProtoBuf.ProtoMember(11)]
public uint cdndelay
{
get { return __pbn__cdndelay.GetValueOrDefault(); }
set { __pbn__cdndelay = value; }
}
public bool ShouldSerializecdndelay() => __pbn__cdndelay != null;
public void Resetcdndelay() => __pbn__cdndelay = null;
private uint? __pbn__cdndelay;

}

}
Expand Down
6 changes: 0 additions & 6 deletions SteamKit2/SteamKit2/Base/Generated/GC/CSGO/SteamMsgGCSDK.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,6 @@ public ulong version
public void Resetversion() => __pbn__version = null;
private ulong? __pbn__version;

[global::ProtoBuf.ProtoMember(4)]
public global::System.Collections.Generic.List<SingleObject> objects_added { get; } = new global::System.Collections.Generic.List<SingleObject>();

[global::ProtoBuf.ProtoMember(5)]
public global::System.Collections.Generic.List<SingleObject> objects_removed { get; } = new global::System.Collections.Generic.List<SingleObject>();

[global::ProtoBuf.ProtoMember(6)]
public CMsgSOIDOwner owner_soid { get; set; }

Expand Down
Loading

0 comments on commit a5d17a0

Please sign in to comment.