fix(builder): Variables for AMBuild

Author: skuzzis

.gitmodules

@@ -13,4 +13,7 @@
 	url = https://github.com/komashchenko/DynLibUtils
 [submodule "vendor/json"]
 	path = vendor/json
-	url = https://github.com/Tencent/rapidjson
+	url = https://github.com/Tencent/rapidjson
+[submodule "hl2sdk-manifests"]
+	path = hl2sdk-manifests
+	url = https://github.com/alliedmodders/hl2sdk-manifests

AMBuilder

@@ -1,4 +1,5 @@
 import os
+import fnmatch
 
 MMSPlugin.plugin_name = 'swiftly'
 MMSPlugin.plugin_alias = 'swiftly'
@@ -20,6 +21,8 @@ for sdk_target in MMSPlugin.sdk_targets:
 				binary.sources.append(os.path.join(root, _file).replace("\\", "/"))
 
 	binary.sources.append("vendor/dynlib/module.cpp")
+	binary.sources.append(os.path.join(sdk['path'], 'entity2', 'entitysystem.cpp'))
+	binary.sources.append(os.path.join(sdk['path'], 'entity2', 'entityidentity.cpp'))
 
 	if binary.compiler.target.platform == 'linux':
 		binary.compiler.cxxflags += [
@@ -29,7 +32,7 @@ for sdk_target in MMSPlugin.sdk_targets:
 			"-Wno-non-virtual-dtor",
 			"-Wno-attributes",
 			"-Wno-int-to-pointer-cast",
-			"-ffexceptions",
+			"-fexceptions",
 			"-fPIC",
 		]
 		binary.compiler.cflags += [
@@ -39,7 +42,7 @@ for sdk_target in MMSPlugin.sdk_targets:
 			"-Wno-non-virtual-dtor",
 			"-Wno-attributes",
 			"-Wno-int-to-pointer-cast",
-			"-ffexceptions",
+			"-fexceptions",
 			"-fPIC",
 		]
 		binary.compiler.postlink += [
@@ -55,7 +58,7 @@ for sdk_target in MMSPlugin.sdk_targets:
             "-lpsl",
             "-lbrotlidec",
             "-lbacktrace",
-            "-lstdc++"
+            "-lstdc++",
 			os.path.join(sdk['path'], 'lib', 'linux64', 'libsteam_api.so')
 		]
 		binary.compiler.defines += [
@@ -129,7 +132,7 @@ for sdk_target in MMSPlugin.sdk_targets:
 		]
 
 	binary.compiler.defines += [
-		"GITHUB_SHA=\"" + (os.getenv('GITHUB_SHA') == None and "LOCAL" or os.getenv('GITHUB_SHA')) + "\""
+		"GITHUB_SHA=\"" + (os.getenv('GITHUB_SHA') == None and "LOCAL" or os.getenv('GITHUB_SHA')) + "\"",
 		"HAVE_STRUCT_TIMESPEC",
 		"BUILDING",
 		"CURL_STATICLIB",
@@ -158,32 +161,30 @@ for sdk_target in MMSPlugin.sdk_targets:
 	]
 
 	protoc_builder = builder.tools.Protoc(protoc = sdk_target.protoc, sources = [
-		os.path.join(sdk['path'], 'game', 'shared', 'clienmessages.proto'),
+		os.path.join(sdk['path'], 'game', 'shared', 'clientmessages.proto'),
 		os.path.join(sdk['path'], 'game', 'shared', 'usermessages.proto'),
 		os.path.join(sdk['path'], 'game', 'shared', 'te.proto'),
 		os.path.join(sdk['path'], 'game', 'shared', 'usercmd.proto'),
 
-		os.path.join(sdk['path'], 'game', 'shared', 'cs', 'cs_gameevents.proto'),
-		os.path.join(sdk['path'], 'game', 'shared', 'cs', 'cs_usercmd.proto'),
+		os.path.join(builder.sourcePath, 'protobufs', 'cs_gameevents.proto'),
+		os.path.join(builder.sourcePath, 'protobufs', 'cs_usercmd.proto'),
 
-		os.path.join(sdk['path'], 'game', 'shared', 'cstrike15', 'cstrike15_gcmessages.proto'),
-		os.path.join(sdk['path'], 'game', 'shared', 'cstrike15', 'cstrike15_usermessages.proto'),
+		os.path.join(builder.sourcePath, 'protobufs', 'cstrike15_gcmessages.proto'),
+		os.path.join(builder.sourcePath, 'protobufs', 'cstrike15_usermessages.proto'),
 
 		os.path.join(sdk['path'], 'gcsdk', 'gcsdk_gcmessages.proto'),
 		os.path.join(sdk['path'], 'gcsdk', 'steammessages.proto'),
 
 		os.path.join(sdk['path'], 'common', 'network_connection.proto'),
 		os.path.join(sdk['path'], 'common', 'networkbasetypes.proto'),
-		os.path.join(sdk['path'], 'common', 'engine_gcmessages.proto'),
 		os.path.join(sdk['path'], 'common', 'netmessages.proto'),
 		os.path.join(sdk['path'], 'common', 'engine_gcmessages.proto'),
 	])
 	protoc_builder.protoc.includes += [
 		os.path.join(sdk['path'], 'gcsdk'),
 		os.path.join(sdk['path'], 'common'),
 		os.path.join(sdk['path'], 'game', 'shared'),
-		os.path.join(sdk['path'], 'game', 'shared', 'cstrike15'),
-		os.path.join(builder.sourcePath, 'protobuf'),
+		os.path.join(builder.sourcePath, 'protobufs')
 	]
 
 	binary.custom = [protoc_builder]

configure.py

@@ -25,7 +25,7 @@
                        help='Plugin alias')
 parser.options.add_argument('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
                        help='Root search folder for HL2SDKs')
-parser.options.add_argument('--hl2sdk-manifests', type=str, dest='hl2sdk_manifests', default='alliedmodders/hl2sdk-manifests/',
+parser.options.add_argument('--hl2sdk-manifests', type=str, dest='hl2sdk_manifests', default='hl2sdk-manifests/',
                        help='HL2SDK manifests source tree folder')
 parser.options.add_argument('--mms_path', type=str, dest='mms_path', default=None,
                        help='Metamod:Source source tree folder')

hl2sdk-manifests

@@ -0,0 +1,35 @@
+import "networkbasetypes.proto";
+
+enum ECsgoGameEvents {
+	GE_PlayerAnimEventId = 450;
+	GE_RadioIconEventId = 451;
+	GE_FireBulletsId = 452;
+}
+
+message CMsgTEPlayerAnimEvent {
+	optional fixed32 player = 1 [default = 16777215];
+	optional uint32 event = 2;
+	optional int32 data = 3;
+}
+
+message CMsgTERadioIcon {
+	optional fixed32 player = 1 [default = 16777215];
+}
+
+message CMsgTEFireBullets {
+	optional .CMsgVector origin = 1;
+	optional .CMsgQAngle angles = 2;
+	optional uint32 weapon_id = 3 [default = 16777215];
+	optional uint32 mode = 4;
+	optional uint32 seed = 5;
+	optional fixed32 player = 6 [default = 16777215];
+	optional float inaccuracy = 7;
+	optional float recoil_index = 8;
+	optional float spread = 9;
+	optional int32 sound_type = 10;
+	optional uint32 item_def_index = 11;
+	optional fixed32 sound_dsp_effect = 12;
+	optional .CMsgVector ent_origin = 13;
+	optional uint32 num_bullets_remaining = 14;
+	optional uint32 attack_type = 15;
+}

protobufs/cs_gameevents.proto

@@ -0,0 +1,35 @@
+import "networkbasetypes.proto";
+import "usercmd.proto";
+
+message CSGOInterpolationInfoPB {
+	optional int32 src_tick = 1 [default = -1];
+	optional int32 dst_tick = 2 [default = -1];
+	optional float frac = 3 [default = 0];
+}
+
+message CSGOInputHistoryEntryPB {
+	optional .CMsgQAngle view_angles = 2;
+	optional int32 render_tick_count = 4;
+	optional float render_tick_fraction = 5;
+	optional int32 player_tick_count = 6;
+	optional float player_tick_fraction = 7;
+	optional .CSGOInterpolationInfoPB cl_interp = 12;
+	optional .CSGOInterpolationInfoPB sv_interp0 = 13;
+	optional .CSGOInterpolationInfoPB sv_interp1 = 14;
+	optional .CSGOInterpolationInfoPB player_interp = 15;
+	optional int32 frame_number = 20;
+	optional int32 target_ent_index = 8 [default = -1];
+	optional .CMsgVector shoot_position = 3;
+	optional .CMsgVector target_head_pos_check = 9;
+	optional .CMsgVector target_abs_pos_check = 10;
+	optional .CMsgQAngle target_abs_ang_check = 11;
+}
+
+message CSGOUserCmdPB {
+	optional .CBaseUserCmdPB base = 1;
+	repeated .CSGOInputHistoryEntryPB input_history = 2;
+	optional int32 attack1_start_history_index = 6 [default = -1];
+	optional int32 attack2_start_history_index = 7 [default = -1];
+	optional int32 attack3_start_history_index = 8 [default = -1];
+	optional bool left_hand_desired = 9 [default = false];
+}