fix: parent-models not being properly obfuscated

MineInAbyss · Aug 9, 2024 · 7bc18b6 · 7bc18b6
1 parent fe5fd5d
commit 7bc18b6
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/main/kotlin/com/mineinabyss/packy/PackObfuscator.kt b/src/main/kotlin/com/mineinabyss/packy/PackObfuscator.kt
@@ -188,12 +188,8 @@ class PackObfuscator(private val resourcePack: ResourcePack) {
         ?: toBuilder().overrides(overrides().filterNotNull().map { override ->
             val overrideKey = override.model()
             val modelKey = obfuscatedModels.findObf(overrideKey)?.key()
-                ?: resourcePack.takeUnless {
-                    overrideKey == this.key() || ResourcePacks.defaultVanillaResourcePack?.model(
-                        overrideKey
-                    ) != null
-                }
-                    ?.model(overrideKey)?.let(::obfuscateModel)?.key()
+                ?: ResourcePacks.defaultVanillaResourcePack?.model(overrideKey)?.let { overrideKey }
+                ?: resourcePack.takeUnless { overrideKey == this.key() }?.model(overrideKey)?.let(::obfuscateModel)?.key()
                 ?: overrideKey
 
             return@map ItemOverride.of(modelKey, override.predicate())