diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-01-21 13:17:01 +0100 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-01-21 13:17:01 +0100 |
| commit | 36cf26be6d783d56ecff22af753def8e6ee5aa62 (patch) | |
| tree | a5f9046e8ab882bc01d2cbea9b974fa7aa233d2c /src/texturePacks/java/moe/nea/firmament/features | |
| parent | 2a3a4c07f5db951169adfc5626e8cf28c0812cf6 (diff) | |
| download | Firmament-36cf26be6d783d56ecff22af753def8e6ee5aa62.tar.gz Firmament-36cf26be6d783d56ecff22af753def8e6ee5aa62.tar.bz2 Firmament-36cf26be6d783d56ecff22af753def8e6ee5aa62.zip | |
fix: Don't hide global overrides for textures with extra attributes ids
Diffstat (limited to 'src/texturePacks/java/moe/nea/firmament/features')
| -rw-r--r-- | src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt | 2 | ||||
| -rw-r--r-- | src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ItemPredicate.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt index e9437ef..bef52d2 100644 --- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt +++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt @@ -76,7 +76,7 @@ object CustomSkyBlockTextures : FirmamentFeature { fun onCustomModelId(it: CustomItemModelEvent) { if (!TConfig.enabled) return val id = it.itemStack.skyBlockId ?: return - it.overrideIfExists(Identifier.of("firmskyblock", id.identifier.path)) + it.overrideIfEmpty(Identifier.of("firmskyblock", id.identifier.path)) } private val skullTextureCache = diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ItemPredicate.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ItemPredicate.kt index 3cb80c7..4833dc0 100644 --- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ItemPredicate.kt +++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ItemPredicate.kt @@ -17,7 +17,7 @@ class ItemPredicate( val item: Item ) : FirmamentModelPredicate { override fun test(stack: ItemStack): Boolean { - return stack.item == item + return stack.isOf(item) } object Parser : FirmamentModelPredicateParser { |