4 files changed, 55 insertions, 56 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/compat/TextCompat.kt b/src/main/java/at/hannibal2/skyhanni/utils/compat/TextCompat.kt
new file mode 100644
index 000000000..7273160f8
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/compat/TextCompat.kt
@@ -0,0 +1,53 @@
+package at.hannibal2.skyhanni.utils.compat
+
+import net.minecraft.util.IChatComponent
+//#if MC > 1.16
+//$$ import net.minecraft.ChatFormatting
+//$$ import net.minecraft.network.chat.TextColor
+//#endif
+//#if MC > 1.20
+//$$ import net.minecraft.text.MutableText
+//$$ import net.minecraft.text.PlainTextContent
+//#endif
+
+fun IChatComponent.getDirectlyContainedText() =
+//#if MC < 1.16
+    this.unformattedTextForChat
+//#elseif MC < 1.20
+//$$    this.contents
+//#else
+//$$        (this.content as? PlainTextContent)?.string() ?: ""
+//#endif
+
+fun IChatComponent.getFormattedTextCompat() =
+//#if MC < 1.16
+    this.formattedText
+//#else
+//$$run {
+//$$    val sb = StringBuilder()
+//$$    for (component in iterator()) {
+//$$        sb.append(component.style.color?.toChatFormatting()?.toString() ?: "§r")
+//$$        sb.append(component.getDirectlyContainedText())
+//$$        sb.append("§r")
+//$$    }
+//$$    sb.toString()
+//$$}
+//$$
+//$$private val textColorLUT = ChatFormatting.entries
+//$$    .mapNotNull { formatting -> formatting.color?.let { it to formatting } }
+//$$    .toMap()
+//$$
+//$$fun TextColor.toChatFormatting(): ChatFormatting? {
+//$$    return textColorLUT[this.value]
+//$$}
+//$$
+//$$fun Component.iterator(): Sequence<Component> {
+//$$    return sequenceOf(this) + siblings.asSequence().flatMap { it.iterator() } // TODO: in theory we want to properly inherit styles here
+//$$}
+//#endif
+
+//#if MC > 1.20
+//$$fun MutableText.withColor(formatting: Formatting): Text {
+//$$    return this.styled { it.withColor(formatting) }
+//$$}
+//#endif
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt b/src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt
index 48b99b311..f4aa1e0df 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt
@@ -6,18 +6,6 @@ import net.minecraft.entity.Entity
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.potion.Potion
-import net.minecraft.util.IChatComponent
-//#if MC > 1.12
-//$$ import net.minecraft.init.PotionTypes
-//#endif
-//#if MC > 1.16
-//$$ import net.minecraft.ChatFormatting
-//$$ import net.minecraft.network.chat.TextColor
-//#endif
-//#if MC > 1.20
-//$$ import net.minecraft.text.MutableText
-//$$ import net.minecraft.text.PlainTextContent
-//#endif
 
 fun WorldClient.getLoadedPlayers(): List<EntityPlayer> =
 //#if MC < 1.14
@@ -46,48 +34,6 @@ fun Minecraft.isOnMainThread() =
 //$$ this.isSameThread
 //#endif
 
-fun IChatComponent.getDirectlyContainedText() =
-//#if MC < 1.16
-    this.unformattedTextForChat
-//#elseif MC < 1.20
-//$$    this.contents
-//#else
-//$$        (this.content as? PlainTextContent)?.string() ?: ""
-//#endif
-
-fun IChatComponent.getFormattedTextCompat() =
-//#if MC < 1.16
-    this.formattedText
-//#else
-//$$run {
-//$$    val sb = StringBuilder()
-//$$    for (component in iterator()) {
-//$$        sb.append(component.style.color?.toChatFormatting()?.toString() ?: "§r")
-//$$        sb.append(component.getDirectlyContainedText())
-//$$        sb.append("§r")
-//$$    }
-//$$    sb.toString()
-//$$}
-//$$
-//$$private val textColorLUT = ChatFormatting.entries
-//$$    .mapNotNull { formatting -> formatting.color?.let { it to formatting } }
-//$$    .toMap()
-//$$
-//$$fun TextColor.toChatFormatting(): ChatFormatting? {
-//$$    return textColorLUT[this.value]
-//$$}
-//$$
-//$$fun Component.iterator(): Sequence<Component> {
-//$$    return sequenceOf(this) + siblings.asSequence().flatMap { it.iterator() } // TODO: in theory we want to properly inherit styles here
-//$$}
-//#endif
-
-//#if MC > 1.20
-//$$fun MutableText.withColor(formatting: Formatting): Text {
-//$$    return this.styled { it.withColor(formatting) }
-//$$}
-//#endif
-
 object Effects {
     val invisibility =
         //#if MC <1.12
diff --git a/versions/1.21/buildpaths-test.txt b/versions/1.21/buildpaths-test.txt
index 44c9fb263..6a660321a 100644
--- a/versions/1.21/buildpaths-test.txt
+++ b/versions/1.21/buildpaths-test.txt
@@ -1,2 +1,2 @@
-at/hannibal2/skyhanni/utils/compat/World.kt
+at/hannibal2/skyhanni/utils/compat/TextCompat.kt
 TestLegacyColorFormat.kt
diff --git a/versions/1.21/buildpaths.txt b/versions/1.21/buildpaths.txt
index 2b9d32c89..867bab8c0 100644
--- a/versions/1.21/buildpaths.txt
+++ b/versions/1.21/buildpaths.txt
@@ -1 +1 @@
-at/hannibal2/skyhanni/utils/compat/World.kt
+at/hannibal2/skyhanni/utils/compat/TextCompat.kt