Skip to content

Commit

Permalink
Merge pull request #1347 from SteamRE/remove-underlords
Browse files Browse the repository at this point in the history 
Remove Artifact and Underlords protobufs
  • Loading branch information
@xPaw
xPaw authored Apr 7, 2024
2 parents 42c95a5 + 26d79cf commit 03bc052
Show file tree
Hide file tree
Showing 39 changed files with 7 additions and 60,086 deletions.
24 changes: 1 addition & 23 deletions Resources/NetHookAnalyzer2/NetHookAnalyzer2/EMsgExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
using System.Collections.Generic;
using SteamKit2;

using Artifact = SteamKit2.GC.Artifact.Internal;
using CSGO = SteamKit2.GC.CSGO.Internal;
using Dota = SteamKit2.GC.Dota.Internal;
using TF2 = SteamKit2.GC.TF2.Internal;
using Underlords = SteamKit2.GC.Underlords.Internal;

namespace NetHookAnalyzer2
{
Expand Down Expand Up @@ -48,34 +46,14 @@ static IEnumerable<Type> GetGCEMsgEnums(uint appId)
yield return typeof(Dota.EGCBaseClientMsg);
break;

case WellKnownAppIDs.CounterStrikeGlobalOffensive:
case WellKnownAppIDs.CounterStrike2:
yield return typeof(CSGO.ECsgoGCMsg);
yield return typeof(CSGO.EGCBaseMsg);
yield return typeof(CSGO.ESOMsg);
yield return typeof(CSGO.EGCSystemMsg);
yield return typeof(CSGO.EGCItemMsg);
yield return typeof(CSGO.EGCBaseClientMsg);
break;

case WellKnownAppIDs.Artifact:
yield return typeof(Artifact.EGCBaseMsg);
yield return typeof(Artifact.ESOMsg);
yield return typeof(Artifact.EGCItemMsg);
yield return typeof(Artifact.EGCBaseClientMsg);
yield return typeof(Artifact.EGCDCGClientMessages);
yield return typeof(Artifact.EGCDCGCommonMessages);
yield return typeof(Artifact.EGCDCGServerMessages);
break;

case WellKnownAppIDs.Underlords:
yield return typeof( Underlords.EGCBaseMsg );
yield return typeof( Underlords.ESOMsg );
yield return typeof( Underlords.EGCItemMsg );
yield return typeof( Underlords.EGCBaseClientMsg );
yield return typeof( Underlords.EGCDACClientMessages );
yield return typeof( Underlords.EGCDACCommonMessages );
yield return typeof( Underlords.EGCDACServerMessages );
break;
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions Resources/NetHookAnalyzer2/NetHookAnalyzer2/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ static ISpecialization[] LoadMessageObjectSpecializations()
new TF2CacheSubscribedGCSpecialization(),
new TF2SOMultipleObjectsGCSpecialization(),
new TF2SOSingleObjectGCSpecialization(),
new ArtifactCacheSubscribedGCSpecialization(),
new ArtifactSOMultipleObjectsGCSpecialization(),
new ArtifactSOSingleObjectGCSpecialization(),
new UnderlordsCacheSubscribedGCSpecialization(),
new UnderlordsSOMultipleObjectsGCSpecialization(),
new UnderlordsSOSingleObjectGCSpecialization(),
}
}
};
Expand Down
10 changes: 1 addition & 9 deletions Resources/NetHookAnalyzer2/NetHookAnalyzer2/MessageTypeFinder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,9 @@ static IEnumerable<string> GetPossibleGCTypePrefixes(uint appid)
yield return "SteamKit2.GC.Dota.Internal.CMsg";
break;

case WellKnownAppIDs.CounterStrikeGlobalOffensive:
case WellKnownAppIDs.CounterStrike2:
yield return "SteamKit2.GC.CSGO.Internal.CMsg";
break;

case WellKnownAppIDs.Artifact:
yield return "SteamKit2.GC.Artifact.Internal.CMsg";
break;

case WellKnownAppIDs.Underlords:
yield return "SteamKit2.GC.Underlords.Internal.CMsg";
break;
}
}
}
Expand Down
32 changes: 1 addition & 31 deletions Resources/NetHookAnalyzer2/NetHookAnalyzer2/MessageTypeOverrides.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
using CSGO = SteamKit2.GC.CSGO.Internal;
using Dota = SteamKit2.GC.Dota.Internal;
using TF2 = SteamKit2.GC.TF2.Internal;
using Artifact = SteamKit2.GC.Artifact.Internal;
using Underlords = SteamKit2.GC.Underlords.Internal;

namespace NetHookAnalyzer2
{
Expand Down Expand Up @@ -67,7 +65,7 @@ static class MessageTypeOverrides
[(uint)Dota.EDOTAGCMsg.k_EMsgGCToClientTeamsInfo] = typeof(Dota.CMsgDOTATeamsInfo),
[(uint)Dota.EDOTAGCMsg.k_EMsgClientToGCMyTeamInfoRequest] = typeof(Dota.CMsgDOTAMyTeamInfoRequest),
},
[WellKnownAppIDs.CounterStrikeGlobalOffensive] = new Dictionary<uint, Type>
[WellKnownAppIDs.CounterStrike2] = new Dictionary<uint, Type>
{
[(uint)CSGO.EGCBaseClientMsg.k_EMsgGCClientHello] = typeof(CSGO.CMsgClientHello),
[(uint)CSGO.EGCBaseClientMsg.k_EMsgGCClientWelcome] = typeof(CSGO.CMsgClientWelcome),
Expand All @@ -81,34 +79,6 @@ static class MessageTypeOverrides
[(uint)CSGO.ESOMsg.k_ESOMsg_Update] = typeof(CSGO.CMsgSOSingleObject),
[(uint)CSGO.ESOMsg.k_ESOMsg_UpdateMultiple] = typeof(CSGO.CMsgSOMultipleObjects),
},
[WellKnownAppIDs.Artifact] = new Dictionary<uint, Type>
{
[(uint)Artifact.EGCBaseClientMsg.k_EMsgGCClientHello] = typeof(Artifact.CMsgClientHello),
[(uint)Artifact.EGCBaseClientMsg.k_EMsgGCClientWelcome] = typeof(Artifact.CMsgClientWelcome),
[(uint)Artifact.EGCBaseClientMsg.k_EMsgGCServerHello] = typeof(Artifact.CMsgClientHello),
[(uint)Artifact.EGCBaseClientMsg.k_EMsgGCServerWelcome] = typeof(Artifact.CMsgClientWelcome),
[(uint)Artifact.EGCBaseClientMsg.k_EMsgGCClientConnectionStatus] = typeof(Artifact.CMsgConnectionStatus),
[(uint)Artifact.EGCBaseClientMsg.k_EMsgGCServerConnectionStatus] = typeof(Artifact.CMsgConnectionStatus),

[(uint)Artifact.ESOMsg.k_ESOMsg_Create] = typeof(Artifact.CMsgSOSingleObject),
[(uint)Artifact.ESOMsg.k_ESOMsg_Destroy] = typeof(Artifact.CMsgSOSingleObject),
[(uint)Artifact.ESOMsg.k_ESOMsg_Update] = typeof(Artifact.CMsgSOSingleObject),
[(uint)Artifact.ESOMsg.k_ESOMsg_UpdateMultiple] = typeof(Artifact.CMsgSOMultipleObjects),
},
[ WellKnownAppIDs.Underlords ] = new Dictionary<uint, Type>
{
[(uint)Underlords.EGCBaseClientMsg.k_EMsgGCClientHello] = typeof(Underlords.CMsgClientHello),
[(uint)Underlords.EGCBaseClientMsg.k_EMsgGCClientWelcome] = typeof(Underlords.CMsgClientWelcome),
[(uint)Underlords.EGCBaseClientMsg.k_EMsgGCServerHello] = typeof(Underlords.CMsgClientHello),
[(uint)Underlords.EGCBaseClientMsg.k_EMsgGCServerWelcome] = typeof(Underlords.CMsgClientWelcome),
[(uint)Underlords.EGCBaseClientMsg.k_EMsgGCClientConnectionStatus] = typeof(Underlords.CMsgConnectionStatus),
[(uint)Underlords.EGCBaseClientMsg.k_EMsgGCServerConnectionStatus] = typeof(Underlords.CMsgConnectionStatus),

[(uint)Underlords.ESOMsg.k_ESOMsg_Create] = typeof(Underlords.CMsgSOSingleObject),
[(uint)Underlords.ESOMsg.k_ESOMsg_Destroy] = typeof(Underlords.CMsgSOSingleObject),
[(uint)Underlords.ESOMsg.k_ESOMsg_Update] = typeof(Underlords.CMsgSOSingleObject),
[(uint)Underlords.ESOMsg.k_ESOMsg_UpdateMultiple] = typeof(Underlords.CMsgSOMultipleObjects),
},
};
}
}
61 changes: 0 additions & 61 deletions ...r2/NetHookAnalyzer2/Specializations/Artifact/ArtifactSOCacheSubscribedGCSpecialization.cs
View file

This file was deleted.

27 changes: 0 additions & 27 deletions Resources/NetHookAnalyzer2/NetHookAnalyzer2/Specializations/Artifact/ArtifactSOHelper.cs
View file

This file was deleted.

75 changes: 0 additions & 75 deletions ...r2/NetHookAnalyzer2/Specializations/Artifact/ArtifactSOMultipleObjectsGCSpecialization.cs
View file

This file was deleted.

54 changes: 0 additions & 54 deletions ...yzer2/NetHookAnalyzer2/Specializations/Artifact/ArtifactSOSingleObjectGCSpecialization.cs
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...kAnalyzer2/NetHookAnalyzer2/Specializations/CSGO/CSGOSOCacheSubscribedGCSpecialization.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class CSGOCacheSubscribedGCSpecialization : IGameCoordinatorSpecialization
{
public IEnumerable<KeyValuePair<string, object>> GetExtraObjects(object body, uint appID)
{
if (appID != WellKnownAppIDs.CounterStrikeGlobalOffensive)
if (appID != WellKnownAppIDs.CounterStrike2)
{
yield break;
}
Expand Down
2 changes: 1 addition & 1 deletion ...kAnalyzer2/NetHookAnalyzer2/Specializations/CSGO/CSGOSOMultipleObjectsGCSpecialization.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class CSGOSOMultipleObjectsGCSpecialization : IGameCoordinatorSpecialization
{
public IEnumerable<KeyValuePair<string, object>> GetExtraObjects(object body, uint appID)
{
if (appID != WellKnownAppIDs.CounterStrikeGlobalOffensive)
if (appID != WellKnownAppIDs.CounterStrike2)
{
yield break;
}
Expand Down
2 changes: 1 addition & 1 deletion ...HookAnalyzer2/NetHookAnalyzer2/Specializations/CSGO/CSGOSOSingleObjectGCSpecialization.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class CSGOSOSingleObjectGCSpecialization : IGameCoordinatorSpecialization
{
public IEnumerable<KeyValuePair<string, object>> GetExtraObjects(object body, uint appID)
{
if (appID != WellKnownAppIDs.CounterStrikeGlobalOffensive)
if (appID != WellKnownAppIDs.CounterStrike2)
{
yield break;
}
Expand Down
Loading

0 comments on commit 03bc052

Please sign in to comment.