From e39d244aae1876445729614284d06e5a852a4c8f Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Sat, 25 Nov 2023 23:08:08 -0500 Subject: [PATCH] (fix) Catch error for not having the specified JSON file --- src/main/java/emu/lunarcore/util/JsonUtils.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/emu/lunarcore/util/JsonUtils.java b/src/main/java/emu/lunarcore/util/JsonUtils.java index 197e143..403c01d 100644 --- a/src/main/java/emu/lunarcore/util/JsonUtils.java +++ b/src/main/java/emu/lunarcore/util/JsonUtils.java @@ -1,9 +1,6 @@ package emu.lunarcore.util; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; +import java.io.*; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; @@ -13,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import com.google.gson.reflect.TypeToken; +import emu.lunarcore.LunarCore; public class JsonUtils { private static final Gson gson = new GsonBuilder().setPrettyPrinting().create(); @@ -101,6 +99,9 @@ public class JsonUtils { public static Map loadToMap(String filename, Class keyType, Class valueType) throws IOException { try (InputStreamReader fileReader = new InputStreamReader(new FileInputStream(Utils.toFilePath(filename)), StandardCharsets.UTF_8)) { return loadToMap(fileReader, keyType, valueType); + } catch (FileNotFoundException ignored) { + LunarCore.getLogger().error("File not found: {}.", filename); + return null; } } }