From 115d457000b9fbcde14b783024cda73468d30d54 Mon Sep 17 00:00:00 2001 From: cadon Date: Sat, 22 Apr 2023 19:32:21 +0200 Subject: [PATCH 1/2] fix update loop error --- ARKBreedingStats/values/Values.cs | 2 +- ARKBreedingStats/values/ValuesFile.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ARKBreedingStats/values/Values.cs b/ARKBreedingStats/values/Values.cs index c25c933a..db8624aa 100644 --- a/ARKBreedingStats/values/Values.cs +++ b/ARKBreedingStats/values/Values.cs @@ -200,7 +200,7 @@ public bool LoadModValues(IEnumerable modFilesToLoad, bool throwExceptio string filename = FileService.GetJsonPath(Path.Combine(FileService.ValuesFolder, modFileToLoad)); - if (TryLoadValuesFile(filename, true, false, out ValuesFile modValues, out string modFileErrorMessage)) + if (TryLoadValuesFile(filename, true, false, out var modValues, out var modFileErrorMessage, true)) { modifiedValues.Add(modValues); } diff --git a/ARKBreedingStats/values/ValuesFile.cs b/ARKBreedingStats/values/ValuesFile.cs index d4e718d0..82054992 100644 --- a/ARKBreedingStats/values/ValuesFile.cs +++ b/ARKBreedingStats/values/ValuesFile.cs @@ -96,14 +96,14 @@ protected static ValuesFile LoadValuesFile(string filePath) /// If the mod-values will be used, setModFileName should be true. /// If the file cannot be found or the format is wrong, the file is ignored and no exception is thrown if throwExceptionOnFail is false. /// - protected static bool TryLoadValuesFile(string filePath, bool setModFileName, bool throwExceptionOnFail, out ValuesFile values, out string errorMessage) + protected static bool TryLoadValuesFile(string filePath, bool setModFileName, bool throwExceptionOnFail, out ValuesFile values, out string errorMessage, bool checkIfModPropertyIsExisting = false) { values = null; errorMessage = null; try { values = LoadValuesFile(filePath); - if (string.IsNullOrEmpty(values.mod?.id)) + if (checkIfModPropertyIsExisting && string.IsNullOrEmpty(values.mod?.id)) { errorMessage = $"The mod file\n{filePath}\ndoesn't contains an object \"mod\" or that object doesn't contain a valid entry \"id\". The mod file cannot be loaded until this information is added"; From e9164ac67b4d1228e8b7f37ecbd7272bbf44dd24 Mon Sep 17 00:00:00 2001 From: cadon Date: Sat, 22 Apr 2023 19:33:41 +0200 Subject: [PATCH 2/2] ver --- ARKBreedingStats/Properties/AssemblyInfo.cs | 2 +- ARKBreedingStats/_manifest.json | 2 +- ARKBreedingStats/json/values/_manifest.json | 22 ++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs index 1392ef8c..0a5cba3a 100644 --- a/ARKBreedingStats/Properties/AssemblyInfo.cs +++ b/ARKBreedingStats/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ // Revision // [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("0.52.1.0")] +[assembly: AssemblyFileVersion("0.52.1.1")] [assembly: NeutralResourcesLanguage("en")] diff --git a/ARKBreedingStats/_manifest.json b/ARKBreedingStats/_manifest.json index d6b68c9d..76177ea5 100644 --- a/ARKBreedingStats/_manifest.json +++ b/ARKBreedingStats/_manifest.json @@ -4,7 +4,7 @@ "ARK Smart Breeding": { "Id": "ARK Smart Breeding", "Category": "main", - "version": "0.52.1.0" + "version": "0.52.1.1" }, "SpeciesColorImages": { "Id": "SpeciesColorImages", diff --git a/ARKBreedingStats/json/values/_manifest.json b/ARKBreedingStats/json/values/_manifest.json index 439e455e..0fa06db5 100644 --- a/ARKBreedingStats/json/values/_manifest.json +++ b/ARKBreedingStats/json/values/_manifest.json @@ -6,7 +6,7 @@ "mod": { "id": "1083349027", "tag": "SpeedyFlyers", "title": "Najs Speedy Flyers" } }, "1090809604-Pyria.json": { - "version": "356.5.1671741134.1", + "version": "357.12.1681020738", "mod": { "id": "1090809604", "tag": "Pyria", "title": "Pyria: Mythos Evolved" } }, "1092784125-Gryphons.json": { @@ -35,7 +35,7 @@ "mod": { "id": "1139775728", "tag": "Confuciusornis", "title": "Confuciusornis" } }, "1169020368-Trex.json": { - "version": "357.4.1679236349", + "version": "357.11.1680434574", "mod": { "id": "1169020368", "tag": "Trex", "title": "Ark Creature Rebalance (AG Reborn)" } }, "1178308359-ShadDragon.json": { @@ -149,7 +149,7 @@ "mod": { "id": "1675895024", "tag": "NoUntameables", "title": "No Untameables" } }, "1676159020-Aquaria.json": { - "version": "355.16.1674259257", + "version": "357.13.1681407858", "mod": { "id": "1676159020", "tag": "Aquaria", "title": "Additional Creatures: Aquaria" } }, "1681125667-Primal_Fear_EX.json": { @@ -170,11 +170,11 @@ "mod": { "id": "1729512589", "tag": "Brachiosaurus", "title": "ARK Additions: Brachiosaurus!" } }, "1734595558-Pyria2.json": { - "version": "356.5.1669482607", + "version": "357.5.1680228174", "mod": { "id": "1734595558", "tag": "Pyria2", "title": "Pyria: The Second Chapter" } }, "1754846792-Zythara_Critters.json": { - "version": "357.4.1678517540", + "version": "357.14.1680668333", "mod": { "id": "1754846792", "tag": "Zythara_Critters", "title": "Zythara Critters" } }, "1768499278-BalancedJPE.json": { @@ -243,7 +243,7 @@ "mod": { "id": "2000326197", "tag": "ExtraResources", "title": "Event Assets" } }, "2003934830-Beasts.json": { - "version": "357.4.1678923214", + "version": "357.14.1681745937", "mod": { "id": "2003934830", "tag": "Beasts", "title": "Prehistoric Beasts" } }, "2019846325-ApexMod.json": { @@ -291,7 +291,7 @@ "mod": { "id": "2362246280", "tag": "GigaFullTame", "title": "Giga Full Tame" } }, "2447186973-ArkOmega.json": { - "version": "357.4.1678350769", + "version": "357.14.1681967408", "mod": { "id": "2447186973", "tag": "ArkOmega", "title": "Ark Omega" } }, "2493949846-Endemics.json": { @@ -303,7 +303,7 @@ "mod": { "id": "2683373846", "tag": "ZazaCollection_2", "title": "Zaza's Collection" } }, "2804332920-PaleoARKlegends.json": { - "version": "356.12.1677311339", + "version": "357.14.1681844066", "mod": { "id": "2804332920", "tag": "PaleoARKlegends", "title": "Paleo ARK: Legends Expansion!" } }, "2869411055-SDinoVariants.json": { @@ -311,7 +311,7 @@ "mod": { "id": "2869411055", "tag": "SDinoVariants", "title": "SDinoVariants" } }, "710880648-DinoOverHaulMODX.json": { - "version": "357.4.1678496346", + "version": "357.14.1682108466", "mod": { "id": "710880648", "tag": "DinoOverHaulMODX", "title": "DinoOverhaul X -- Hardcore PvE Experience" } }, "729352919-IndomRex.json": { @@ -323,7 +323,7 @@ "mod": { "id": "814833973", "tag": "Wyvern_Mating", "title": "Wyvern Mating" } }, "839162288-Primal_Fear.json": { - "version": "356.5.1651177976", + "version": "357.12.1681258396", "mod": { "id": "839162288", "tag": "Primal_Fear", "title": "Primal Fear" } }, "883957187-WyvernWorld.json": { @@ -331,7 +331,7 @@ "mod": { "id": "883957187", "tag": "WyvernWorld", "title": "Wyvern World" } }, "893735676-AE.json": { - "version": "357.5.1679775865", + "version": "357.14.1681700117", "mod": { "id": "893735676", "tag": "AE", "title": "Ark Eternal" } }, "895711211-ClassicFlyers.json": {