Make 1.8.9 compile again

4 files changed, 19 insertions, 8 deletions

diff --git a/src/main/kotlin/datamodel/ChatType.kt b/src/main/kotlin/datamodel/ChatType.kt
index 1fcc522..9f20c41 100644
--- a/src/main/kotlin/datamodel/ChatType.kt
+++ b/src/main/kotlin/datamodel/ChatType.kt
@@ -1,6 +1,7 @@
 package moe.nea.ultranotifier.datamodel
 
 import net.minecraft.text.Text
+import java.util.function.Predicate
 import java.util.regex.Pattern
 
 data class ChatTypeId(
@@ -17,7 +18,12 @@ data class ChatPattern(
 	val text: String
 ) {
 	val pattern = Pattern.compile(text)
-	val predicate = pattern.asMatchPredicate()
+	val predicate: Predicate<String> =
+//#if JAVA > 11
+		pattern.asMatchPredicate()
+//#else
+//$$		Predicate { it: String -> pattern.matcher(it).matches() }
+//#endif
 }
 
 data class ChatCategory(
@@ -89,8 +95,8 @@ object ChatCategoryArbiter {
 		)
 	)
 
-	fun categorize(content: Text): CategorizedChatLine {
-		universe.categorize(content.lit)
+	fun categorize(content: Any): CategorizedChatLine {
+		TODO()
 	}
 }
 
diff --git a/src/main/kotlin/gui/ChatUi.kt b/src/main/kotlin/gui/ChatUi.kt
index 0ec3063..e88c375 100644
--- a/src/main/kotlin/gui/ChatUi.kt
+++ b/src/main/kotlin/gui/ChatUi.kt
@@ -10,6 +10,8 @@ import java.awt.Color
 
 class ChatUi(val chatScreen: ChatScreen) {
 
+	val Double.value get() = this
+	val Float.value get() = this
 	fun getChatBgOpacity(opacityMultiplier: Double = 1.0): Color {
 		return Color((MC.instance.options.textBackgroundOpacity.value * opacityMultiplier * 255).toInt() shl 24, true)
 	}
@@ -21,7 +23,7 @@ class ChatUi(val chatScreen: ChatScreen) {
 			40
 		val chatTop =
 			(chatScreen.height - chatOffset) / ch.chatScale - ch.visibleLineCount * ch.lineHeight_ultranotifier
-		return chatTop
+		return chatTop.toDouble()
 	}
 
 	var selectedTab = "Bazaar"
diff --git a/src/main/kotlin/util/minecrat/infer.kt b/src/main/kotlin/util/minecrat/infer.kt
index a109bbd..79973b9 100644
--- a/src/main/kotlin/util/minecrat/infer.kt
+++ b/src/main/kotlin/util/minecrat/infer.kt
@@ -2,11 +2,14 @@
 
 package moe.nea.ultranotifier.util.minecrat
 
-import moe.nea.ultranotifier.mixin.AccessorChatHud
 import net.minecraft.client.gui.hud.ChatHud
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 
+interface AccessorChatHud {
+	val lineHeight_ultranotifier: Int
+}
+
 fun ChatHud.accessor(): AccessorChatHud {
 	contract {
 		returns() implies (this@accessor is AccessorChatHud)
diff --git a/src/main/kotlin/util/render/ScreenRenderUtils.kt b/src/main/kotlin/util/render/ScreenRenderUtils.kt
index af8424a..959d0a8 100644
--- a/src/main/kotlin/util/render/ScreenRenderUtils.kt
+++ b/src/main/kotlin/util/render/ScreenRenderUtils.kt
@@ -1,15 +1,15 @@
 package moe.nea.ultranotifier.util.render
 
-//#if MC > 1.16
 import gg.essential.universal.UGraphics
 import gg.essential.universal.UMatrixStack
 import juuxel.libninepatch.NinePatch
 import juuxel.libninepatch.TextureRenderer
 import moe.nea.ultranotifier.util.minecrat.MC
-import net.minecraft.client.gui.DrawContext
-import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.util.Identifier
 import java.awt.Color
+//#if MC > 1.16
+import net.minecraft.client.gui.DrawContext
+import net.minecraft.client.util.math.MatrixStack
 
 //#endif