From abbf5d0f84a3364d74dadd82f8ea6a64982f784f Mon Sep 17 00:00:00 2001 From: Bixilon Date: Sun, 19 Mar 2023 15:50:12 +0100 Subject: [PATCH] index assets manager: ignore realms resources This should reduce size of saved assets and bandwidth usage (not a lot, but some MB) --- .../assets/minecraft/index/IndexAssetsManager.kt | 2 +- .../assets/minecraft/index/IndexAssetsType.kt | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsManager.kt b/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsManager.kt index 7c1b8acf3..84d109f1f 100644 --- a/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsManager.kt +++ b/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsManager.kt @@ -102,7 +102,7 @@ class IndexAssetsManager( check(data is Map<*, *>) val name = path.toAssetName(false) ?: continue - val type = IndexAssetsType.determinate(name.path) + val type = IndexAssetsType.determinate(name) if (type == null || type !in this.types) { continue } diff --git a/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsType.kt b/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsType.kt index 16a38d30a..895bda6af 100644 --- a/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsType.kt +++ b/src/main/java/de/bixilon/minosoft/assets/minecraft/index/IndexAssetsType.kt @@ -16,6 +16,8 @@ package de.bixilon.minosoft.assets.minecraft.index import de.bixilon.kutil.enums.EnumUtil import de.bixilon.kutil.enums.ValuesEnum import de.bixilon.minosoft.assets.util.FileAssetsTypes +import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.ResourceLocation enum class IndexAssetsType(val type: String) { LANGUAGE(FileAssetsTypes.GAME), @@ -28,12 +30,13 @@ enum class IndexAssetsType(val type: String) { override val NAME_MAP: Map = EnumUtil.getEnumValues(VALUES) - fun determinate(path: String): IndexAssetsType? { + fun determinate(identifier: ResourceLocation): IndexAssetsType? { return when { - path.startsWith("lang/") -> LANGUAGE - path.startsWith("sounds/") -> SOUNDS - path == "sounds.json" -> SOUNDS - path.startsWith("textures/") -> TEXTURES + identifier.path == "sounds.json" -> SOUNDS + identifier.namespace != Namespaces.MINECRAFT -> null + identifier.path.startsWith("sounds/") -> SOUNDS + identifier.path.startsWith("lang/") -> LANGUAGE + identifier.path.startsWith("textures/") -> TEXTURES else -> null } }