Add tint override to texture packs

18 files changed, 154 insertions, 83 deletions

diff --git a/src/main/kotlin/features/texturepack/BakedModelExtra.kt b/src/main/kotlin/features/texturepack/BakedModelExtra.kt
index ae1f6d5..32f419a 100644
--- a/src/main/kotlin/features/texturepack/BakedModelExtra.kt
+++ b/src/main/kotlin/features/texturepack/BakedModelExtra.kt
@@ -4,6 +4,8 @@ package moe.nea.firmament.features.texturepack
 import net.minecraft.client.render.model.BakedModel
 
 interface BakedModelExtra {
-    fun getHeadModel_firmament(): BakedModel?
+	var tintOverrides_firmament: TintOverrides?
+
+	fun getHeadModel_firmament(): BakedModel?
     fun setHeadModel_firmament(headModel: BakedModel?)
 }
diff --git a/src/main/kotlin/features/texturepack/CustomModelOverrideParser.kt b/src/main/kotlin/features/texturepack/CustomModelOverrideParser.kt
index a4e7c02..c5fc20b 100644
--- a/src/main/kotlin/features/texturepack/CustomModelOverrideParser.kt
+++ b/src/main/kotlin/features/texturepack/CustomModelOverrideParser.kt
@@ -6,6 +6,14 @@ import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import moe.nea.firmament.features.texturepack.predicates.AndPredicate
+import moe.nea.firmament.features.texturepack.predicates.DisplayNamePredicate
+import moe.nea.firmament.features.texturepack.predicates.ExtraAttributesPredicate
+import moe.nea.firmament.features.texturepack.predicates.ItemPredicate
+import moe.nea.firmament.features.texturepack.predicates.LorePredicate
+import moe.nea.firmament.features.texturepack.predicates.NotPredicate
+import moe.nea.firmament.features.texturepack.predicates.OrPredicate
+import moe.nea.firmament.features.texturepack.predicates.PetPredicate
 import net.minecraft.item.ItemStack
 import net.minecraft.util.Identifier
 
diff --git a/src/main/kotlin/features/texturepack/JsonUnbakedModelFirmExtra.kt b/src/main/kotlin/features/texturepack/JsonUnbakedModelFirmExtra.kt
index ab9e27d..0d0f8f2 100644
--- a/src/main/kotlin/features/texturepack/JsonUnbakedModelFirmExtra.kt
+++ b/src/main/kotlin/features/texturepack/JsonUnbakedModelFirmExtra.kt
@@ -7,4 +7,8 @@ interface JsonUnbakedModelFirmExtra {
 
     fun setHeadModel_firmament(identifier: Identifier?)
     fun getHeadModel_firmament(): Identifier?
+
+	fun setTintOverrides_firmament(tintOverrides: TintOverrides?)
+	fun getTintOverrides_firmament(): TintOverrides
+
 }
diff --git a/src/main/kotlin/features/texturepack/ModelOverrideFilterSet.kt b/src/main/kotlin/features/texturepack/ModelOverrideFilterSet.kt
deleted file mode 100644
index 4ef8d06..0000000
--- a/src/main/kotlin/features/texturepack/ModelOverrideFilterSet.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-package moe.nea.firmament.features.texturepack
-
-import com.google.gson.JsonElement
-import moe.nea.firmament.util.filter.IteratorFilterSet
-
-class ModelOverrideFilterSet(original: java.util.Set<Map.Entry<String, JsonElement>>) :
-    IteratorFilterSet<Map.Entry<String, JsonElement>>(original) {
-    companion object {
-        @JvmStatic
-        fun createFilterSet(set: java.util.Set<*>): java.util.Set<*> {
-            return ModelOverrideFilterSet(set as java.util.Set<Map.Entry<String, JsonElement>>) as java.util.Set<*>
-        }
-    }
-
-    override fun shouldKeepElement(element: Map.Entry<String, JsonElement>): Boolean {
-        return !element.key.startsWith("firmament:")
-    }
-}
diff --git a/src/main/kotlin/features/texturepack/TintOverrides.kt b/src/main/kotlin/features/texturepack/TintOverrides.kt
new file mode 100644
index 0000000..8006db8
--- /dev/null
+++ b/src/main/kotlin/features/texturepack/TintOverrides.kt
@@ -0,0 +1,75 @@
+package moe.nea.firmament.features.texturepack
+
+import com.google.gson.JsonObject
+import com.google.gson.JsonPrimitive
+import moe.nea.firmament.util.ErrorUtil
+import moe.nea.firmament.util.assertNotNullOr
+
+data class TintOverrides(
+	val layerMap: Map<Int, TintOverride> = mapOf()
+) {
+	val hasOverrides by lazy { layerMap.values.any { it !is Reset } }
+
+	companion object {
+		val EMPTY = TintOverrides()
+		private val threadLocal = object : ThreadLocal<TintOverrides>() {}
+		fun enter(overrides: TintOverrides?) {
+			ErrorUtil.softCheck("Double entered tintOverrides") {
+				threadLocal.get() == null
+			}
+			threadLocal.set(overrides ?: EMPTY)
+		}
+
+		fun exit(overrides: TintOverrides?) {
+			ErrorUtil.softCheck("Exited with non matching enter tintOverrides") {
+				threadLocal.get() == (overrides ?: EMPTY)
+			}
+			threadLocal.remove()
+		}
+
+		fun getCurrentOverrides() =
+			assertNotNullOr(threadLocal.get(), "Got current tintOverrides without entering") { EMPTY }
+
+		fun parse(jsonObject: JsonObject): TintOverrides {
+			val map = mutableMapOf<Int, TintOverride>()
+			for ((key, value) in jsonObject.entrySet()) {
+				val layerIndex =
+					ErrorUtil.notNullOr(key.toIntOrNull(),
+					                    "Unknown layer index $value. Should be integer") { continue }
+				if (value.isJsonNull) {
+					map[layerIndex] = Reset
+					continue
+				}
+				val override = (value as? JsonPrimitive)
+					?.takeIf(JsonPrimitive::isNumber)
+					?.asInt
+					?.let(::Fixed)
+				if (override == null) {
+					ErrorUtil.softError("Invalid tint override for a layer: $value")
+					continue
+				}
+				map[layerIndex] = override
+			}
+			return TintOverrides(map)
+		}
+	}
+
+	fun mergeWithParent(parent: TintOverrides): TintOverrides {
+		val mergedMap = parent.layerMap.toMutableMap()
+		mergedMap.putAll(this.layerMap)
+		return TintOverrides(mergedMap)
+	}
+
+	fun hasOverrides(): Boolean = hasOverrides
+	fun getOverride(tintIndex: Int): Int? {
+		return when (val tint = layerMap[tintIndex]) {
+			is Reset -> null
+			is Fixed -> tint.color
+			null -> null
+		}
+	}
+
+	sealed interface TintOverride
+	data object Reset : TintOverride
+	data class Fixed(val color: Int) : TintOverride
+}
diff --git a/src/main/kotlin/features/texturepack/AlwaysPredicate.kt b/src/main/kotlin/features/texturepack/predicates/AlwaysPredicate.kt
index 4dd28df..7e0ddb1 100644
--- a/src/main/kotlin/features/texturepack/AlwaysPredicate.kt
+++ b/src/main/kotlin/features/texturepack/predicates/AlwaysPredicate.kt
@@ -1,7 +1,9 @@
 
-package moe.nea.firmament.features.texturepack
+package moe.nea.firmament.features.texturepack.predicates
 
 import com.google.gson.JsonElement
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicate
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicateParser
 import net.minecraft.item.ItemStack
 
 object AlwaysPredicate : FirmamentModelPredicate {
diff --git a/src/main/kotlin/features/texturepack/AndPredicate.kt b/src/main/kotlin/features/texturepack/predicates/AndPredicate.kt
index dc8e852..99abaaa 100644
--- a/src/main/kotlin/features/texturepack/AndPredicate.kt
+++ b/src/main/kotlin/features/texturepack/predicates/AndPredicate.kt
@@ -1,8 +1,11 @@
-package moe.nea.firmament.features.texturepack
+package moe.nea.firmament.features.texturepack.predicates
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import moe.nea.firmament.features.texturepack.CustomModelOverrideParser
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicate
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicateParser
 import net.minecraft.item.ItemStack
 
 class AndPredicate(val children: Array<FirmamentModelPredicate>) : FirmamentModelPredicate {
@@ -15,7 +18,7 @@ class AndPredicate(val children: Array<FirmamentModelPredicate>) : FirmamentMode
             val children =
                 (jsonElement as JsonArray)
                     .flatMap {
-                        CustomModelOverrideParser.parsePredicates(it as JsonObject)
+	                    CustomModelOverrideParser.parsePredicates(it as JsonObject)
                     }
                     .toTypedArray()
             return AndPredicate(children)
diff --git a/src/main/kotlin/features/texturepack/DisplayNamePredicate.kt b/src/main/kotlin/features/texturepack/predicates/DisplayNamePredicate.kt
index 100aaf4..04c7a2b 100644
--- a/src/main/kotlin/features/texturepack/DisplayNamePredicate.kt
+++ b/src/main/kotlin/features/texturepack/predicates/DisplayNamePredicate.kt
@@ -1,12 +1,12 @@
 
-package moe.nea.firmament.features.texturepack
+package moe.nea.firmament.features.texturepack.predicates
 
 import com.google.gson.JsonElement
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicate
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicateParser
+import moe.nea.firmament.features.texturepack.StringMatcher
 import net.minecraft.item.ItemStack
-import net.minecraft.nbt.NbtElement
-import net.minecraft.nbt.NbtString
 import moe.nea.firmament.util.mc.displayNameAccordingToNbt
-import moe.nea.firmament.util.mc.loreAccordingToNbt
 
 data class DisplayNamePredicate(val stringMatcher: StringMatcher) : FirmamentModelPredicate {
     override fun test(stack: ItemStack): Boolean {
diff --git a/src/main/kotlin/features/texturepack/ExtraAttributesPredicate.kt b/src/main/kotlin/features/texturepack/predicates/ExtraAttributesPredicate.kt
index 4114f45..3c8023d 100644
--- a/src/main/kotlin/features/texturepack/ExtraAttributesPredicate.kt
+++ b/src/main/kotlin/features/texturepack/predicates/ExtraAttributesPredicate.kt
@@ -1,10 +1,13 @@
 
-package moe.nea.firmament.features.texturepack
+package moe.nea.firmament.features.texturepack.predicates
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicate
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicateParser
+import moe.nea.firmament.features.texturepack.StringMatcher
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtByte
 import net.minecraft.nbt.NbtCompound
@@ -210,8 +213,8 @@ fun interface NbtMatcher {
 }
 
 data class ExtraAttributesPredicate(
-    val path: NbtPrism,
-    val matcher: NbtMatcher,
+	val path: NbtPrism,
+	val matcher: NbtMatcher,
 ) : FirmamentModelPredicate {
 
     object Parser : FirmamentModelPredicateParser {
diff --git a/src/main/kotlin/features/texturepack/ItemPredicate.kt b/src/main/kotlin/features/texturepack/predicates/ItemPredicate.kt
index 4302b53..3cb80c7 100644
--- a/src/main/kotlin/features/texturepack/ItemPredicate.kt
+++ b/src/main/kotlin/features/texturepack/predicates/ItemPredicate.kt
@@ -1,8 +1,10 @@
 
-package moe.nea.firmament.features.texturepack
+package moe.nea.firmament.features.texturepack.predicates
 
 import com.google.gson.JsonElement
 import com.google.gson.JsonPrimitive
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicate
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicateParser
 import kotlin.jvm.optionals.getOrNull
 import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
diff --git a/src/main/kotlin/features/texturepack/LorePredicate.kt b/src/main/kotlin/features/texturepack/predicates/LorePredicate.kt
index f2b7e76..f0b4737 100644
--- a/src/main/kotlin/features/texturepack/LorePredicate.kt
+++ b/src/main/kotlin/features/texturepack/predicates/LorePredicate.kt
@@ -1,7 +1,10 @@
 
-package moe.nea.firmament.features.texturepack
+package moe.nea.firmament.features.texturepack.predicates
 
 import com.google.gson.JsonElement
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicate
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicateParser
+import moe.nea.firmament.features.texturepack.StringMatcher
 import net.minecraft.item.ItemStack
 import moe.nea.firmament.util.mc.loreAccordingToNbt
 
diff --git a/src/main/kotlin/features/texturepack/NotPredicate.kt b/src/main/kotlin/features/texturepack/predicates/NotPredicate.kt
index ecd67c3..4986ad9 100644
--- a/src/main/kotlin/features/texturepack/NotPredicate.kt
+++ b/src/main/kotlin/features/texturepack/predicates/NotPredicate.kt
@@ -1,8 +1,11 @@
 
-package moe.nea.firmament.features.texturepack
+package moe.nea.firmament.features.texturepack.predicates
 
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import moe.nea.firmament.features.texturepack.CustomModelOverrideParser
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicate
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicateParser
 import net.minecraft.item.ItemStack
 
 class NotPredicate(val children: Array<FirmamentModelPredicate>) : FirmamentModelPredicate {
diff --git a/src/main/kotlin/features/texturepack/NumberMatcher.kt b/src/main/kotlin/features/texturepack/predicates/NumberMatcher.kt
index e6f2d01..b0d5178 100644
--- a/src/main/kotlin/features/texturepack/NumberMatcher.kt
+++ b/src/main/kotlin/features/texturepack/predicates/NumberMatcher.kt
@@ -1,4 +1,4 @@
-package moe.nea.firmament.features.texturepack
+package moe.nea.firmament.features.texturepack.predicates
 
 import com.google.gson.JsonElement
 import com.google.gson.JsonPrimitive
diff --git a/src/main/kotlin/features/texturepack/OrPredicate.kt b/src/main/kotlin/features/texturepack/predicates/OrPredicate.kt
index 32f556b..e3093cd 100644
--- a/src/main/kotlin/features/texturepack/OrPredicate.kt
+++ b/src/main/kotlin/features/texturepack/predicates/OrPredicate.kt
@@ -1,9 +1,12 @@
 
-package moe.nea.firmament.features.texturepack
+package moe.nea.firmament.features.texturepack.predicates
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import moe.nea.firmament.features.texturepack.CustomModelOverrideParser
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicate
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicateParser
 import net.minecraft.item.ItemStack
 
 class OrPredicate(val children: Array<FirmamentModelPredicate>) : FirmamentModelPredicate {
@@ -16,7 +19,7 @@ class OrPredicate(val children: Array<FirmamentModelPredicate>) : FirmamentModel
             val children =
                 (jsonElement as JsonArray)
                     .flatMap {
-                        CustomModelOverrideParser.parsePredicates(it as JsonObject)
+	                    CustomModelOverrideParser.parsePredicates(it as JsonObject)
                     }
                     .toTypedArray()
             return OrPredicate(children)
diff --git a/src/main/kotlin/features/texturepack/PetPredicate.kt b/src/main/kotlin/features/texturepack/predicates/PetPredicate.kt
index 5e5d750..b30b7c9 100644
--- a/src/main/kotlin/features/texturepack/PetPredicate.kt
+++ b/src/main/kotlin/features/texturepack/predicates/PetPredicate.kt
@@ -1,18 +1,22 @@
 
-package moe.nea.firmament.features.texturepack
+package moe.nea.firmament.features.texturepack.predicates
 
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicate
+import moe.nea.firmament.features.texturepack.FirmamentModelPredicateParser
+import moe.nea.firmament.features.texturepack.RarityMatcher
+import moe.nea.firmament.features.texturepack.StringMatcher
 import net.minecraft.item.ItemStack
 import moe.nea.firmament.repo.ExpLadders
 import moe.nea.firmament.util.petData
 
-class PetPredicate(
-    val petId: StringMatcher?,
-    val tier: RarityMatcher?,
-    val exp: NumberMatcher?,
-    val candyUsed: NumberMatcher?,
-    val level: NumberMatcher?,
+data class PetPredicate(
+	val petId: StringMatcher?,
+	val tier: RarityMatcher?,
+	val exp: NumberMatcher?,
+	val candyUsed: NumberMatcher?,
+	val level: NumberMatcher?,
 ) : FirmamentModelPredicate {
 
     override fun test(stack: ItemStack): Boolean {
@@ -59,8 +63,4 @@ class PetPredicate(
             )
         }
     }
-
-    override fun toString(): String {
-        return super.toString()
-    }
 }
diff --git a/src/main/kotlin/repo/RepoManager.kt b/src/main/kotlin/repo/RepoManager.kt
index 9f8f422..c052fb9 100644
--- a/src/main/kotlin/repo/RepoManager.kt
+++ b/src/main/kotlin/repo/RepoManager.kt
@@ -9,13 +9,13 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
 import kotlinx.coroutines.launch
 import net.minecraft.client.MinecraftClient
 import net.minecraft.network.packet.s2c.play.SynchronizeRecipesS2CPacket
-import net.minecraft.text.Text
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.Firmament.logger
 import moe.nea.firmament.events.ReloadRegistrationEvent
 import moe.nea.firmament.gui.config.ManagedConfig
 import moe.nea.firmament.util.MinecraftDispatcher
 import moe.nea.firmament.util.SkyblockId
+import moe.nea.firmament.util.tr
 
 object RepoManager {
 	object Config : ManagedConfig("repo", Category.META) {
@@ -108,12 +108,13 @@ object RepoManager {
 		try {
 			ItemCache.ReloadProgressHud.reportProgress("Reloading from Disk",
 			                                           0,
-			                                           -1) // TODO: replace with a proper boundy bar
+			                                           -1) // TODO: replace with a proper bouncy bar
 			ItemCache.ReloadProgressHud.isEnabled = true
 			neuRepo.reload()
 		} catch (exc: NEURepositoryException) {
 			MinecraftClient.getInstance().player?.sendMessage(
-				Text.literal("Failed to reload repository. This will result in some mod features not working.")
+				tr("firmament.repo.reloadfail",
+				   "Failed to reload repository. This will result in some mod features not working.")
 			)
 			ItemCache.ReloadProgressHud.isEnabled = false
 			exc.printStackTrace()
diff --git a/src/main/kotlin/util/ErrorUtil.kt b/src/main/kotlin/util/ErrorUtil.kt
index 4f229af..afecf25 100644
--- a/src/main/kotlin/util/ErrorUtil.kt
+++ b/src/main/kotlin/util/ErrorUtil.kt
@@ -7,10 +7,24 @@ object ErrorUtil {
 		Thread.currentThread().stackTrace.any { it.className.startsWith("org.junit.") } || Firmament.DEBUG
 	}
 
+	inline fun softCheck(message: String, func: () -> Boolean) {
+		if (!aggressiveErrors) return
+		if (func()) return
+		error(message)
+	}
+
 	@Suppress("NOTHING_TO_INLINE") // Suppressed since i want the logger to not pick up the ErrorUtil stack-frame
 	inline fun softError(message: String) {
 		if (aggressiveErrors) error(message)
 		else Firmament.logger.error(message)
 	}
 
+	inline fun <T : Any> notNullOr(nullable: T?, message: String, orElse: () -> T): T {
+		if (nullable == null) {
+			softError(message)
+			return orElse()
+		}
+		return nullable
+	}
+
 }
diff --git a/src/main/kotlin/util/filter/IteratorFilterSet.kt b/src/main/kotlin/util/filter/IteratorFilterSet.kt
deleted file mode 100644
index 483b8d9..0000000
--- a/src/main/kotlin/util/filter/IteratorFilterSet.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-
-package moe.nea.firmament.util.filter
-
-abstract class IteratorFilterSet<K>(val original: java.util.Set<K>) : java.util.Set<K> by original {
-    abstract fun shouldKeepElement(element: K): Boolean
-
-    override fun iterator(): MutableIterator<K> {
-        val parentIterator = original.iterator()
-        return object : MutableIterator<K> {
-            var lastEntry: K? = null
-            override fun hasNext(): Boolean {
-                while (lastEntry == null) {
-                    if (!parentIterator.hasNext())
-                        break
-                    val element = parentIterator.next()
-                    if (!shouldKeepElement(element)) continue
-                    lastEntry = element
-                }
-                return lastEntry != null
-            }
-
-            override fun next(): K {
-                if (!hasNext()) throw NoSuchElementException()
-                return lastEntry ?: throw NoSuchElementException()
-            }
-
-            override fun remove() {
-                TODO("Not yet implemented")
-            }
-        }
-    }
-}
-