bump mod to 1.20.4 support

3 files changed, 17 insertions, 16 deletions

diff --git a/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt b/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt
index 93db1a0..ccd5dd2 100644
--- a/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt
+++ b/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt
@@ -21,15 +21,17 @@ import com.dulkirfabric.util.render.AnimationPreset
 import com.dulkirfabric.util.render.HudElement
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import me.shedaniel.clothconfig2.api.ConfigBuilder
 import moe.nea.jarvis.api.Point
 import net.minecraft.client.gui.screen.Screen
-import net.minecraft.client.util.InputUtil
-import net.minecraft.client.util.InputUtil.*
-import net.minecraft.text.*
+import net.minecraft.client.util.InputUtil.Key
+import net.minecraft.client.util.InputUtil.UNKNOWN_KEY
+import net.minecraft.text.MutableText
+import net.minecraft.text.PlainTextContent.Literal
+import net.minecraft.text.Text
+import net.minecraft.text.TextColor
 import net.minecraft.util.Formatting
 import net.minecraft.util.Identifier
 import java.io.File
@@ -37,7 +39,7 @@ import java.io.File
 class DulkirConfig {
 
     private val buttonText: Text =
-        MutableText.of(LiteralTextContent("Dulkir")).formatted(Formatting.BOLD, Formatting.YELLOW)
+        MutableText.of(Literal("Dulkir")).formatted(Formatting.BOLD, Formatting.YELLOW)
     var screen: Screen = buildScreen(null)
 
     fun buildScreen(parentScreen: Screen? = null): Screen {
diff --git a/src/main/kotlin/com/dulkirfabric/util/ScoreBoardUtils.kt b/src/main/kotlin/com/dulkirfabric/util/ScoreBoardUtils.kt
index c62cbab..d8acd4b 100644
--- a/src/main/kotlin/com/dulkirfabric/util/ScoreBoardUtils.kt
+++ b/src/main/kotlin/com/dulkirfabric/util/ScoreBoardUtils.kt
@@ -23,12 +23,12 @@ object ScoreBoardUtils {
     fun getLines(): MutableList<String>? {
         val scoreboard = DulkirModFabric.mc.player?.scoreboard ?: return null
         // This returns null if we're not in skyblock curiously
-        val sidebarObjective = scoreboard.getObjective("SBScoreboard") ?: return null
-        val scores = scoreboard.getAllPlayerScores(sidebarObjective)
+        val sidebarObjective = scoreboard.getNullableObjective("SBScoreboard") ?: return null
+        val scores = scoreboard.getScoreboardEntries(sidebarObjective)
         val lines: MutableList<String> = ArrayList()
         for (score in scores.reversed()) {
-            val team = scoreboard.getPlayerTeam(score.playerName)
-            var str = Team.decorateName(team, Text.literal(score.playerName)).string
+            val team = scoreboard.getTeam(score.owner)
+            var str = Team.decorateName(team, Text.literal(score.owner)).string
                 .replace("§[^a-f0-9]".toRegex(), "")
             lines.add(str)
         }
@@ -42,12 +42,12 @@ object ScoreBoardUtils {
     fun getLinesWithColor(): MutableList<String>? {
         val scoreboard = DulkirModFabric.mc.player?.scoreboard ?: return null
         // This returns null if we're not in skyblock curiously
-        val sidebarObjective = scoreboard.getObjective("SBScoreboard") ?: return null
-        val scores = scoreboard.getAllPlayerScores(sidebarObjective)
+        val sidebarObjective = scoreboard.getNullableObjective("SBScoreboard") ?: return null
+        val scores = scoreboard.getScoreboardEntries(sidebarObjective)
         val lines: MutableList<String> = ArrayList()
         for (score in scores.reversed()) {
-            val team = scoreboard.getPlayerTeam(score.playerName)
-            lines.add(Team.decorateName(team, Text.literal(score.playerName)).formattedString())
+            val team = scoreboard.getTeam(score.owner)
+            lines.add(Team.decorateName(team, Text.literal(score.owner)).formattedString())
         }
         return lines
     }
@@ -97,7 +97,7 @@ object ScoreBoardUtils {
         if (event.sound.id.path != "entity.wither.shoot") return
         if (event.sound.pitch != 0.6984127f) return
         if (event.sound.volume != .5f) return
-        SlayerBossEvents.Spawn(slayerType?: return err()).post()
+        SlayerBossEvents.Spawn(slayerType ?: return err()).post()
     }
 
     fun err() {
diff --git a/src/main/kotlin/com/dulkirfabric/util/Utils.kt b/src/main/kotlin/com/dulkirfabric/util/Utils.kt
index a0fec78..342dc48 100644
--- a/src/main/kotlin/com/dulkirfabric/util/Utils.kt
+++ b/src/main/kotlin/com/dulkirfabric/util/Utils.kt
@@ -6,7 +6,6 @@ import com.dulkirfabric.events.WorldLoadEvent
 import com.dulkirfabric.events.chat.ChatEvents
 import meteordevelopment.orbit.EventHandler
 import net.minecraft.block.entity.SkullBlockEntity
-import net.minecraft.client.texture.PlayerSkinProvider
 import net.minecraft.entity.Entity
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtHelper
@@ -74,6 +73,6 @@ object Utils {
 
     fun getSkullTexture(itemStack: ItemStack): String? {
         return itemStack.getSubNbt(SkullBlockEntity.SKULL_OWNER_KEY)?.let(NbtHelper::toGameProfile)?.properties?.get(
-            PlayerSkinProvider.TEXTURES)?.first()?.value
+            "textures")?.first()?.value
     }
 }
\ No newline at end of file