feat: Allow loading armors from the 1.21.0 format

2 files changed, 4 insertions, 2 deletions

diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomGlobalArmorOverrides.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomGlobalArmorOverrides.kt
index 85dfa32..aafc85a 100644
--- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomGlobalArmorOverrides.kt
+++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomGlobalArmorOverrides.kt
@@ -145,6 +145,7 @@ object CustomGlobalArmorOverrides {
 						null
 					}
 				}
+				bakedOverrides.clear()
 				val associatedMap = overrides.flatMap { obj -> obj.itemIds.map { it to obj } }
 					.toMap()
 				associatedMap.forEach { it.value.bake(manager) }
@@ -152,7 +153,6 @@ object CustomGlobalArmorOverrides {
 			}
 
 			override fun apply(prepared: Map<String, ArmorOverride>, manager: ResourceManager, profiler: Profiler) {
-				bakedOverrides.clear()
 				overrides = prepared
 			}
 		})
@@ -160,11 +160,13 @@ object CustomGlobalArmorOverrides {
 
 	@JvmStatic
 	fun overrideArmor(itemStack: ItemStack, slot: EquipmentSlot): Optional<EquippableComponent> {
+		if (!CustomSkyBlockTextures.TConfig.enableArmorOverrides) return Optional.empty()
 		return overrideCache.invoke(itemStack, slot)
 	}
 
 	@JvmStatic
 	fun overrideArmorLayer(id: Identifier): EquipmentModel? {
+		if (!CustomSkyBlockTextures.TConfig.enableArmorOverrides) return null
 		return bakedOverrides[id]
 	}
 
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 0de9eb5..e9437ef 100644
--- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt
+++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt
@@ -3,7 +3,6 @@ package moe.nea.firmament.features.texturepack
 import com.mojang.authlib.minecraft.MinecraftProfileTexture
 import com.mojang.authlib.properties.Property
 import java.util.Optional
-import org.jetbrains.annotations.Nullable
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 import kotlin.jvm.optionals.getOrNull
 import net.minecraft.block.SkullBlock
@@ -34,6 +33,7 @@ object CustomSkyBlockTextures : FirmamentFeature {
 		val enableModelOverrides by toggle("model-overrides") { true }
 		val enableArmorOverrides by toggle("armor-overrides") { true }
 		val enableBlockOverrides by toggle("block-overrides") { true }
+		val enableLegacyMinecraftCompat by toggle("legacy-minecraft-path-support") { true }
 		val enableLegacyCIT by toggle("legacy-cit") { true }
 		val allowRecoloringUiText by toggle("recolor-text") { true }
 	}