diff --git a/common/src/main/kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt b/common/src/main/kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt index a317547..b0c2e37 100644 --- a/common/src/main/kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt +++ b/common/src/main/kotlin/dev/erdragh/astralbot/handlers/MinecraftHandler.kt @@ -31,7 +31,7 @@ import kotlin.math.min */ class MinecraftHandler(private val server: MinecraftServer) : ListenerAdapter() { private val playerNames = HashSet(server.maxPlayers); - private val notchPlayer = byName("Notch")?.let { ServerPlayer(this.server, this.server.allLevels.elementAt(0), it) } + private val notchPlayer = byName("Notch")?.let { ServerPlayer(this.server, this.server.allLevels.elementAt(0), it, null) } companion object { diff --git a/common/src/main/kotlin/dev/erdragh/astralbot/util/MessageFormatting.kt b/common/src/main/kotlin/dev/erdragh/astralbot/util/MessageFormatting.kt index e528f92..2cf3550 100644 --- a/common/src/main/kotlin/dev/erdragh/astralbot/util/MessageFormatting.kt +++ b/common/src/main/kotlin/dev/erdragh/astralbot/util/MessageFormatting.kt @@ -81,7 +81,7 @@ fun formatHoverText(text: Component): MessageEmbed { fun formatHoverItems(stack: ItemStack, knownItems: MutableList, player: Player?): MessageEmbed? { if (knownItems.contains(stack)) return null knownItems.add(stack) - val tooltip = stack.getTooltipLines(player, TooltipFlag.NORMAL).map(::formatComponentToMarkdown) + val tooltip = stack.getTooltipLines(player, TooltipFlag.Default.NORMAL).map(::formatComponentToMarkdown) return EmbedBuilder() .setTitle("${tooltip[0]} ${if (stack.count > 1) "(${stack.count})" else ""}") .setDescription(tooltip.drop(1).let { diff --git a/fabric/src/main/kotlin/dev/erdragh/astralbot/fabric/BotMod.kt b/fabric/src/main/kotlin/dev/erdragh/astralbot/fabric/BotMod.kt index 3833484..fd95d4a 100644 --- a/fabric/src/main/kotlin/dev/erdragh/astralbot/fabric/BotMod.kt +++ b/fabric/src/main/kotlin/dev/erdragh/astralbot/fabric/BotMod.kt @@ -29,7 +29,7 @@ object BotMod : ModInitializer { } ServerMessageEvents.CHAT_MESSAGE.register { message, player, _ -> - minecraftHandler?.sendChatToDiscord(player, message.decoratedContent()) + minecraftHandler?.sendChatToDiscord(player, message.serverContent()) } ServerMessageEvents.GAME_MESSAGE.register { _, message, _ -> if (message !is DiscordMessageComponent) {