Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 08:07:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Improve json parsing error handling.

Browse source
This commit is contained in:
EliteMasterEric 2024-02-23 03:16:51 -05:00
parent eb4a21f2d5
commit fb9fd57210
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/funkin/data/BaseRegistry.hx
View file

@ -61,7 +61,16 @@ abstract class BaseRegistry<T:(IRegistryEntry<J> & Constructible<EntryConstructo
for (entryCls in scriptedEntryClassNames) for (entryCls in scriptedEntryClassNames)
{ {
var entry:T = createScriptedEntry(entryCls); var entry:Null<T> = null;
try
{
entry = createScriptedEntry(entryCls);
}
catch (e:Dynamic)
{
log('Failed to create scripted entry (${entryCls})');
continue;
}
if (entry != null) if (entry != null)
{ {
@ -196,6 +205,11 @@ abstract class BaseRegistry<T:(IRegistryEntry<J> & Constructible<EntryConstructo
*/ */
public function parseEntryDataWithMigration(id:String, version:thx.semver.Version):Null<J> public function parseEntryDataWithMigration(id:String, version:thx.semver.Version):Null<J>
{ {
if (version == null)
{
throw '[${registryId}] Entry ${id} could not be JSON-parsed or does not have a parseable version.';
}
// If a version rule is not specified, do not check against it. // If a version rule is not specified, do not check against it.
if (versionRule == null || VersionUtil.validateVersion(version, versionRule)) if (versionRule == null || VersionUtil.validateVersion(version, versionRule))
{ {