From b025b06b6b799b16cfcfb26ee8ffad27879a1bfb Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Sun, 3 Mar 2024 18:04:45 +0100
Subject: Add not predicate and docs to custom predicates

[no changelog]
---
 .../features/texturepack/AlwaysPredicate.kt        | 22 +++++++++++++++++++++
 .../texturepack/CustomModelOverrideParser.kt       |  1 +
 .../firmament/features/texturepack/NotPredicate.kt | 23 ++++++++++++++++++++++
 .../features/texturepack/StringMatcher.kt          |  2 +-
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 src/main/kotlin/moe/nea/firmament/features/texturepack/AlwaysPredicate.kt
 create mode 100644 src/main/kotlin/moe/nea/firmament/features/texturepack/NotPredicate.kt

(limited to 'src/main/kotlin/moe/nea/firmament')

diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/AlwaysPredicate.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/AlwaysPredicate.kt
new file mode 100644
index 0000000..ec4c1d3
--- /dev/null
+++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/AlwaysPredicate.kt
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package moe.nea.firmament.features.texturepack
+
+import com.google.gson.JsonElement
+import net.minecraft.item.ItemStack
+
+object AlwaysPredicate : FirmamentModelPredicate {
+    override fun test(stack: ItemStack): Boolean {
+        return true
+    }
+
+    object Parser : FirmamentModelPredicateParser {
+        override fun parse(jsonElement: JsonElement): FirmamentModelPredicate {
+            return AlwaysPredicate
+        }
+    }
+}
diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomModelOverrideParser.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomModelOverrideParser.kt
index ac62eaa..ad1f436 100644
--- a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomModelOverrideParser.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomModelOverrideParser.kt
@@ -23,6 +23,7 @@ object CustomModelOverrideParser {
         registerPredicateParser("lore", LorePredicate.Parser)
         registerPredicateParser("all", AndPredicate.Parser)
         registerPredicateParser("any", OrPredicate.Parser)
+        registerPredicateParser("not", NotPredicate.Parser)
     }
 
     fun parsePredicates(predicates: JsonObject): List<FirmamentModelPredicate> {
diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/NotPredicate.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/NotPredicate.kt
new file mode 100644
index 0000000..9d584cf
--- /dev/null
+++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/NotPredicate.kt
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package moe.nea.firmament.features.texturepack
+
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import net.minecraft.item.ItemStack
+
+class NotPredicate(val children: Array<FirmamentModelPredicate>) : FirmamentModelPredicate {
+    override fun test(stack: ItemStack): Boolean {
+        return children.none { it.test(stack) }
+    }
+
+    object Parser : FirmamentModelPredicateParser {
+        override fun parse(jsonElement: JsonElement): FirmamentModelPredicate {
+            return NotPredicate(CustomModelOverrideParser.parsePredicates(jsonElement as JsonObject).toTypedArray())
+        }
+    }
+}
diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/StringMatcher.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/StringMatcher.kt
index 0fb8e00..e9d39a8 100644
--- a/src/main/kotlin/moe/nea/firmament/features/texturepack/StringMatcher.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/StringMatcher.kt
@@ -52,7 +52,7 @@ interface StringMatcher {
             }
             if (jsonElement is JsonObject) {
                 val regex = jsonElement["regex"] as JsonPrimitive?
-                val text = jsonElement["text"] as JsonPrimitive?
+                val text = jsonElement["equals"] as JsonPrimitive?
                 val shouldStripColor = when (val color = (jsonElement["color"] as JsonPrimitive?)?.asString) {
                     "preserve" -> false
                     "strip", null -> true
-- 
cgit