From c836845d7d91dbf8e5466bf9910c144828d86a8b Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 8 Jun 2026 14:10:13 -0500 Subject: [PATCH 1/8] Update version to 1.0.0.6 and add file existence check in PostalCodeController --- CommonDataFramework/CommonDataFramework.nuspec | 2 +- CommonDataFramework/Modules/Postals/PostalCodeController.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CommonDataFramework/CommonDataFramework.nuspec b/CommonDataFramework/CommonDataFramework.nuspec index 121b8dc..a72df42 100644 --- a/CommonDataFramework/CommonDataFramework.nuspec +++ b/CommonDataFramework/CommonDataFramework.nuspec @@ -2,7 +2,7 @@ CommonDataFramework - 1.0.0.5 + 1.0.0.6 Policing Redefined Team MarcelWRLD false diff --git a/CommonDataFramework/Modules/Postals/PostalCodeController.cs b/CommonDataFramework/Modules/Postals/PostalCodeController.cs index 7a52681..e2c40b4 100644 --- a/CommonDataFramework/Modules/Postals/PostalCodeController.cs +++ b/CommonDataFramework/Modules/Postals/PostalCodeController.cs @@ -74,6 +74,11 @@ internal static void Load() { foreach (string filename in Directory.GetFiles(PostalXmlPath).Where(x => x.EndsWith(".xml"))) { + if (!File.Exists(filename)) { + LogWarn($"Postal code file {filename} does not exist."); + continue; + } + PostalCodeSet postalCodeSet = PostalCodeSet.FromXML(filename); if (postalCodeSet != null) { From 15b292796180a06b7d105d1245b46796d718559f Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 8 Jun 2026 14:14:47 -0500 Subject: [PATCH 2/8] bump assembly version --- CommonDataFramework/Properties/AssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CommonDataFramework/Properties/AssemblyInfo.cs b/CommonDataFramework/Properties/AssemblyInfo.cs index 55738dd..a013d41 100644 --- a/CommonDataFramework/Properties/AssemblyInfo.cs +++ b/CommonDataFramework/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.8")] -[assembly: AssemblyFileVersion("1.0.0.8")] +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] From 53b10adb4d90b33b968526d4bf09f7af2f59b8a6 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 8 Jun 2026 14:18:32 -0500 Subject: [PATCH 3/8] change assembly version to 1.0.0.9 --- CommonDataFramework/CommonDataFramework.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonDataFramework/CommonDataFramework.nuspec b/CommonDataFramework/CommonDataFramework.nuspec index a72df42..27d64bb 100644 --- a/CommonDataFramework/CommonDataFramework.nuspec +++ b/CommonDataFramework/CommonDataFramework.nuspec @@ -2,7 +2,7 @@ CommonDataFramework - 1.0.0.6 + 1.0.0.9 Policing Redefined Team MarcelWRLD false From 2b06048ca61accccf56cbf79ae0d7adbd7592e33 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 8 Jun 2026 14:23:22 -0500 Subject: [PATCH 4/8] assembly info might be the death of me --- CommonDataFramework/CommonDataFramework.csproj | 2 +- CommonDataFramework/Properties/AssemblyInfo.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CommonDataFramework/CommonDataFramework.csproj b/CommonDataFramework/CommonDataFramework.csproj index 5e9337e..28ae1f1 100644 --- a/CommonDataFramework/CommonDataFramework.csproj +++ b/CommonDataFramework/CommonDataFramework.csproj @@ -9,7 +9,7 @@ Properties CommonDataFramework CommonDataFramework - v4.8 + v4.8.1 512 preview diff --git a/CommonDataFramework/Properties/AssemblyInfo.cs b/CommonDataFramework/Properties/AssemblyInfo.cs index a013d41..ec5572e 100644 --- a/CommonDataFramework/Properties/AssemblyInfo.cs +++ b/CommonDataFramework/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("CommonDataFramework")] -[assembly: AssemblyCopyright("Copyright © 2024")] +[assembly: AssemblyCopyright("Copyright © 2026 Policing Redefined Team")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] +[assembly: AssemblyVersion("1.0.0.9")] +[assembly: AssemblyFileVersion("1.0.0.9")] From b7050f63cc8bd3235a9395a2cab132b843fe4f83 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 8 Jun 2026 14:25:13 -0500 Subject: [PATCH 5/8] Add README.md to nuspec files for documentation --- CommonDataFramework/CommonDataFramework.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CommonDataFramework/CommonDataFramework.nuspec b/CommonDataFramework/CommonDataFramework.nuspec index 27d64bb..accb9ec 100644 --- a/CommonDataFramework/CommonDataFramework.nuspec +++ b/CommonDataFramework/CommonDataFramework.nuspec @@ -18,7 +18,7 @@ - + + \ No newline at end of file From fb0db1996d2fba1419a0297001fb2cacac71290d Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 8 Jun 2026 14:35:25 -0500 Subject: [PATCH 6/8] Fix README.md path in nuspec and add directory check in PostalCodeController --- CommonDataFramework/CommonDataFramework.nuspec | 2 +- CommonDataFramework/Modules/Postals/PostalCodeController.cs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CommonDataFramework/CommonDataFramework.nuspec b/CommonDataFramework/CommonDataFramework.nuspec index accb9ec..9f4f33c 100644 --- a/CommonDataFramework/CommonDataFramework.nuspec +++ b/CommonDataFramework/CommonDataFramework.nuspec @@ -19,6 +19,6 @@ - + \ No newline at end of file diff --git a/CommonDataFramework/Modules/Postals/PostalCodeController.cs b/CommonDataFramework/Modules/Postals/PostalCodeController.cs index e2c40b4..1f664b7 100644 --- a/CommonDataFramework/Modules/Postals/PostalCodeController.cs +++ b/CommonDataFramework/Modules/Postals/PostalCodeController.cs @@ -72,6 +72,12 @@ internal static void SetActivePostalCodeSet(string name) internal static void Load() { + if (!Directory.Exists(PostalXmlPath)) + { + Game.DisplaySubtitle("~b~[CDF]~s~ Could ~r~not~s~ load any postal codes."); + return; + } + foreach (string filename in Directory.GetFiles(PostalXmlPath).Where(x => x.EndsWith(".xml"))) { if (!File.Exists(filename)) { From 738d8609756f15404d3fc48b51affa06d348a7f1 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 8 Jun 2026 14:36:48 -0500 Subject: [PATCH 7/8] bump assembly version to 1.0.0.10 --- CommonDataFramework/Properties/AssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CommonDataFramework/Properties/AssemblyInfo.cs b/CommonDataFramework/Properties/AssemblyInfo.cs index ec5572e..9de4b23 100644 --- a/CommonDataFramework/Properties/AssemblyInfo.cs +++ b/CommonDataFramework/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.9")] -[assembly: AssemblyFileVersion("1.0.0.9")] +[assembly: AssemblyVersion("1.0.0.10")] +[assembly: AssemblyFileVersion("1.0.0.10")] From 2704c3d47c25fbe44878db4fa71b563c28704a02 Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 9 Jun 2026 09:32:41 -0500 Subject: [PATCH 8/8] update VehicleData.cs --- .../Modules/VehicleDatabase/VehicleData.cs | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/CommonDataFramework/Modules/VehicleDatabase/VehicleData.cs b/CommonDataFramework/Modules/VehicleDatabase/VehicleData.cs index d6e8482..ec964c7 100644 --- a/CommonDataFramework/Modules/VehicleDatabase/VehicleData.cs +++ b/CommonDataFramework/Modules/VehicleDatabase/VehicleData.cs @@ -209,9 +209,10 @@ internal VehicleData(Vehicle vehicle) PrimaryColorSpecific = NativeFunction.Natives.xB45085B721EFD38C(Holder, false); // GET_VEHICLE_MOD_COLOR_1_NAME SecondaryColorSpecific = NativeFunction.Natives.x4967A516ED23A5A1(Holder); // GET_VEHICLE_MOD_COLOR_2_NAME - var make = Game.GetLocalizedString(NativeFunction.Natives.xF7AF4F159FF99F97(Holder.Model.Hash)); // GET_MAKE_NAME_FROM_VEHICLE_MODEL + string make = Game.GetLocalizedString(NativeFunction.Natives.xF7AF4F159FF99F97(Holder.Model.Hash)); // GET_MAKE_NAME_FROM_VEHICLE_MODEL Make = make ?? "Unknown"; - var model = Game.GetLocalizedString(NativeFunction.Natives.xB215AAC32D25D019(Holder.Model.Hash)); // GET_DISPLAY_NAME_FROM_VEHICLE_MODEL + + string model = Game.GetLocalizedString(NativeFunction.Natives.xB215AAC32D25D019(Holder.Model.Hash)); // GET_DISPLAY_NAME_FROM_VEHICLE_MODEL Model = model ?? "Unknown"; VehicleDataController.Database.Add(vehicle, this); @@ -341,9 +342,10 @@ private static EVehicleOwnerType GetSuitableOwnerType(Vehicle vehicle) { EVehicleOwnerType.Driver when vehicle.Driver == null => EVehicleOwnerType.RandomPed, EVehicleOwnerType.FamilyMember when vehicle.Driver == null => EVehicleOwnerType.RandomPed, - EVehicleOwnerType.Passenger when vehicle.Passengers.Length == 0 => GetRandomOwnerType() == EVehicleOwnerType.Driver - ? EVehicleOwnerType.Driver - : EVehicleOwnerType.RandomPed, + EVehicleOwnerType.Passenger when vehicle.Passengers.Length == 0 => + vehicle.Driver != null + ? EVehicleOwnerType.Driver + : EVehicleOwnerType.RandomPed, _ => ownerType }; } @@ -400,11 +402,11 @@ internal static void ResetWeights() private static string GetColorName(Color color) { - var h = color.GetHue(); - var s = color.GetSaturation(); - var b = color.GetBrightness(); + float h = color.GetHue(); + float s = color.GetSaturation(); + float b = color.GetBrightness(); - foreach (var (condition, name) in Colors) + foreach ((Func condition, string name) in Colors) { if (condition(h, s, b)) return name;