AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 03:44:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

generic short tryCatch

Browse Source
This commit is contained in:
Bixilon 2021-07-11 11:57:34 +02:00
parent f4d188547c
commit 7001bdffb7
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/de/bixilon/minosoft/data/language/LanguageManager.kt
View File

@ -20,6 +20,7 @@ import de.bixilon.minosoft.data.text.ChatComponent
import de.bixilon.minosoft.data.text.TextComponent import de.bixilon.minosoft.data.text.TextComponent
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
import de.bixilon.minosoft.util.KUtil.synchronizedListOf import de.bixilon.minosoft.util.KUtil.synchronizedListOf
import de.bixilon.minosoft.util.KUtil.tryCatch
import de.bixilon.minosoft.util.nbt.tag.NBTUtil.asCompound import de.bixilon.minosoft.util.nbt.tag.NBTUtil.asCompound
import java.io.FileNotFoundException import java.io.FileNotFoundException
@ -52,14 +53,6 @@ class LanguageManager(
fun load(language: String, version: Version?, path: ResourceLocation = ResourceLocation("lang/")): LanguageManager { fun load(language: String, version: Version?, path: ResourceLocation = ResourceLocation("lang/")): LanguageManager {
val assetsManager = version?.assetsManager ?: Minosoft.MINOSOFT_ASSETS_MANAGER val assetsManager = version?.assetsManager ?: Minosoft.MINOSOFT_ASSETS_MANAGER
fun tryLoadMinecraftLanguage(language: String): Language? {
return try {
tryLoadMinecraftLanguage(language)
} catch (exception: FileNotFoundException) {
null
}
}
fun loadMinecraftLanguage(language: String): Language { fun loadMinecraftLanguage(language: String): Language {
val data: MutableMap<ResourceLocation, String> = mutableMapOf() val data: MutableMap<ResourceLocation, String> = mutableMapOf()
@ -85,7 +78,7 @@ class LanguageManager(
val languages: MutableList<Language> = mutableListOf() val languages: MutableList<Language> = mutableListOf()
if (language != "en_US") { if (language != "en_US") {
tryLoadMinecraftLanguage(language)?.let { languages += it } tryCatch(FileNotFoundException::class.java, executor = { languages += loadMinecraftLanguage(language) })
} }
languages += loadMinecraftLanguage("en_US") languages += loadMinecraftLanguage("en_US")

13
src/main/java/de/bixilon/minosoft/util/KUtil.kt
View File

@ -292,4 +292,17 @@ object KUtil {
else -> TODO() else -> TODO()
} }
} }
fun <T> tryCatch(vararg exceptions: Class<out Throwable> = arrayOf(), executor: () -> T): T? {
try {
return executor()
} catch (thrown: Throwable) {
for (exception in exceptions) {
if (exception.isAssignableFrom(thrown::class.java)) {
return null
}
}
throw thrown
}
}
} }