Commit 0a928407 authored by Him188's avatar Him188

Remove `@Serializable` from core module

parent 36fd7ccd
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
package net.mamoe.mirai.message.data package net.mamoe.mirai.message.data
import kotlinx.io.core.* import kotlinx.io.core.*
import kotlinx.serialization.* import kotlinx.serialization.KSerializer
import kotlinx.serialization.builtins.ByteArraySerializer import kotlinx.serialization.Serializable
import kotlinx.serialization.UnstableDefault
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonConfiguration import kotlinx.serialization.json.JsonConfiguration
import kotlinx.serialization.protobuf.ProtoBuf import kotlinx.serialization.protobuf.ProtoBuf
...@@ -35,7 +36,6 @@ import kotlin.jvm.JvmOverloads ...@@ -35,7 +36,6 @@ import kotlin.jvm.JvmOverloads
* *
* @see CustomMessageMetadata 自定义消息元数据 * @see CustomMessageMetadata 自定义消息元数据
*/ */
@Serializable(with = CustomMessage.MessageSerializer::class)
@MiraiExperimentalAPI @MiraiExperimentalAPI
sealed class CustomMessage : SingleMessage { sealed class CustomMessage : SingleMessage {
/** /**
......
...@@ -22,6 +22,7 @@ import net.mamoe.mirai.utils.MiraiExperimentalAPI ...@@ -22,6 +22,7 @@ import net.mamoe.mirai.utils.MiraiExperimentalAPI
import net.mamoe.mirai.utils.currentTimeSeconds import net.mamoe.mirai.utils.currentTimeSeconds
import kotlin.jvm.JvmOverloads import kotlin.jvm.JvmOverloads
import kotlin.jvm.JvmSynthetic import kotlin.jvm.JvmSynthetic
import kotlin.jvm.Transient
/** /**
...@@ -87,7 +88,7 @@ class ForwardMessage @JvmOverloads constructor( ...@@ -87,7 +88,7 @@ class ForwardMessage @JvmOverloads constructor(
* 消息列表 * 消息列表
*/ */
val nodeList: Collection<INode>, val nodeList: Collection<INode>,
val displayStrategy: DisplayStrategy = DisplayStrategy.Default @Transient val displayStrategy: DisplayStrategy = DisplayStrategy.Default
) : MessageContent { ) : MessageContent {
init { init {
require(nodeList.isNotEmpty()) { require(nodeList.isNotEmpty()) {
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
package net.mamoe.mirai.message.data package net.mamoe.mirai.message.data
import kotlinx.serialization.Serializable
import net.mamoe.mirai.message.data.PokeMessage.Types import net.mamoe.mirai.message.data.PokeMessage.Types
import net.mamoe.mirai.message.data.VipFace.Companion import net.mamoe.mirai.message.data.VipFace.Companion
import net.mamoe.mirai.utils.PlannedRemoval import net.mamoe.mirai.utils.PlannedRemoval
...@@ -235,7 +234,6 @@ data class VipFace internal constructor( ...@@ -235,7 +234,6 @@ data class VipFace internal constructor(
* *
* @see Image 查看图片相关信息 * @see Image 查看图片相关信息
*/ */
@Serializable
sealed class FlashImage : MessageContent, HummerMessage() { sealed class FlashImage : MessageContent, HummerMessage() {
companion object Key : Message.Key<FlashImage> { companion object Key : Message.Key<FlashImage> {
/** /**
...@@ -290,7 +288,6 @@ inline fun Image.flash(): FlashImage = FlashImage(this) ...@@ -290,7 +288,6 @@ inline fun Image.flash(): FlashImage = FlashImage(this)
* @see FlashImage.invoke * @see FlashImage.invoke
*/ */
@PlannedRemoval("1.3.0") // internal @PlannedRemoval("1.3.0") // internal
@Serializable
@Suppress("DEPRECATION", "DEPRECATION_ERROR") @Suppress("DEPRECATION", "DEPRECATION_ERROR")
@Deprecated( @Deprecated(
"use FlashImage instead", "use FlashImage instead",
...@@ -329,7 +326,6 @@ constructor(override val image: Image) : FlashImage() { ...@@ -329,7 +326,6 @@ constructor(override val image: Image) : FlashImage() {
* @see FlashImage.invoke * @see FlashImage.invoke
*/ */
@PlannedRemoval("1.3.0") // internal @PlannedRemoval("1.3.0") // internal
@Serializable
@Suppress("DEPRECATION", "DEPRECATION_ERROR") @Suppress("DEPRECATION", "DEPRECATION_ERROR")
@Deprecated( @Deprecated(
"use FlashImage instead", "use FlashImage instead",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment