From a575a2b7f6b0f655b77d573c38ac4b30723a0543 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Wed, 31 May 2023 19:40:09 -0400 Subject: [PATCH] Fix unnecessary warning for first-time setup --- .../emu/grasscutter/utils/lang/Language.java | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/src/main/java/emu/grasscutter/utils/lang/Language.java b/src/main/java/emu/grasscutter/utils/lang/Language.java index 1e9d2bc6b..e0c1df11f 100644 --- a/src/main/java/emu/grasscutter/utils/lang/Language.java +++ b/src/main/java/emu/grasscutter/utils/lang/Language.java @@ -1,36 +1,25 @@ package emu.grasscutter.utils.lang; -import static emu.grasscutter.config.Configuration.FALLBACK_LANGUAGE; -import static emu.grasscutter.utils.FileUtils.getCachePath; -import static emu.grasscutter.utils.FileUtils.getResourcePath; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; +import com.google.gson.*; import emu.grasscutter.Grasscutter; -import emu.grasscutter.data.GameData; -import emu.grasscutter.data.ResourceLoader; +import emu.grasscutter.data.*; import emu.grasscutter.data.excels.achievement.AchievementData; import emu.grasscutter.game.player.Player; -import emu.grasscutter.utils.JsonUtils; -import emu.grasscutter.utils.Utils; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import it.unimi.dsi.fastutil.ints.IntOpenHashSet; -import it.unimi.dsi.fastutil.ints.IntSet; -import it.unimi.dsi.fastutil.objects.Object2IntMap; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import emu.grasscutter.utils.*; +import it.unimi.dsi.fastutil.ints.*; +import it.unimi.dsi.fastutil.objects.*; +import lombok.EqualsAndHashCode; + import java.io.*; import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; +import java.nio.file.*; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import lombok.EqualsAndHashCode; +import java.util.regex.*; +import java.util.stream.*; + +import static emu.grasscutter.config.Configuration.FALLBACK_LANGUAGE; +import static emu.grasscutter.utils.FileUtils.*; public final class Language { private static final Map cachedLanguages = new ConcurrentHashMap<>(); @@ -370,6 +359,8 @@ public final class Language { textMapStrings = loadTextMapsCache(); return; } + } catch (NoSuchFileException ignored) { + // Cache doesn't exist, generate it. } catch (Exception exception) { Grasscutter.getLogger().error("Error loading textmaps cache: " + exception.toString()); }