Skip to content

Commit

Permalink
Experimental | 重构NMS
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheFloodDragon
TheFloodDragon committed Aug 14, 2024
1 parent ad73a28 commit 0f71ae3
Show file tree
Hide file tree
Showing 9 changed files with 252 additions and 114 deletions.
2 changes: 2 additions & 0 deletions project/module-item/src/main/kotlin/cn/fd/ratziel/module/item/nbt/NBTAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ object NBTAdapter {
else -> BasicAdapter.adapt(target)
} ?: throw UnsupportedTypeException(target)

@Deprecated("Use NMSItem.INSTANCE")
@JvmStatic
fun adaptNms(target: Any) = NmsAdapter.adapt(target)!!

Expand All @@ -38,6 +39,7 @@ object NBTAdapter {

object NmsAdapter {

@Deprecated("Use NMSItem.INSTANCE")
@JvmStatic
fun adapt(target: Any) = target::class.java.let { c ->
when {
Expand Down
5 changes: 5 additions & 0 deletions project/module-item/src/main/kotlin/cn/fd/ratziel/module/item/nbt/NBTCompound.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ open class NBTCompound private constructor(rawData: Any) : NBTData(rawData, NBTT
*/
open fun clone() = this.apply { data = NMSUtil.NtCompound.methodClone.invoke(data)!! }

/**
* 浅克隆数据
*/
open fun cloneShallow() = NBTCompound(HashMap(sourceMap))

/**
* 合并目标数据
* @param replace 是否替换原有的数据 (false时不会 替换/删除 任何一个节点)
Expand Down
4 changes: 1 addition & 3 deletions project/module-item/src/main/kotlin/cn/fd/ratziel/module/item/nbt/NBTSerializer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,7 @@ object NBTSerializer : KSerializer<NBTData> {
val dataStr = target.substringBeforeLast(EXACT_TYPE_CHAR)

// 匹配类型
val type = NBTType.entries.find {
it.alias.contains(typeStr) || it.simpleName == typeStr
} ?: return adaptString(target)
val type = NBTType.entries.find { it.names.contains(typeStr) } ?: return adaptString(target)

return convertBasicString(dataStr, type)
?: convertArrayString(dataStr, type)
Expand Down
2 changes: 2 additions & 0 deletions project/module-item/src/main/kotlin/cn/fd/ratziel/module/item/nbt/NBTType.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ enum class NBTType(val id: Int, val alias: Array<String> = emptyArray()) {

val simpleName get() = name.lowercase()

val names by lazy { alias.plus(simpleName) }

}
1 change: 1 addition & 0 deletions project/module-item/src/main/kotlin/cn/fd/ratziel/module/item/nbt/NMSUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import taboolib.module.nms.nmsClass
* @author TheFloodDragon
* @since 2024/3/15 18:56
*/
@Deprecated("Use NMSItem.INSTANCE")
internal sealed class NMSUtil(val type: NBTType) {

abstract val nmsClass: Class<*>
Expand Down
86 changes: 32 additions & 54 deletions project/module-item/src/main/kotlin/cn/fd/ratziel/module/item/nms/NMS12005.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import com.mojang.serialization.DynamicOps
import net.minecraft.core.IRegistryCustom
import net.minecraft.core.component.DataComponentMap
import net.minecraft.core.component.DataComponentPatch
import net.minecraft.nbt.DynamicOpsNBT
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.resources.RegistryOps
import org.bukkit.Bukkit
import org.bukkit.craftbukkit.v1_20_R4.CraftServer
Expand All @@ -21,7 +19,7 @@ import taboolib.module.nms.nmsProxy
import java.nio.ByteBuffer
import java.util.*
import java.util.stream.Stream
import kotlin.streams.toList
import kotlin.streams.asSequence


/**
Expand Down Expand Up @@ -74,7 +72,10 @@ abstract class NMS12005 {

}

@Suppress("unused")
/**
* 代码参考自: Taboolib/nms-tag-12005
*/
@Suppress("unused", "MemberVisibilityCanBePrivate")
class NMS12005Impl : NMS12005() {

fun <T> parse(codec: Codec<T>, tag: NBTCompound): T? {
Expand All @@ -89,27 +90,15 @@ class NMS12005Impl : NMS12005() {
return if (opt.isPresent) opt.get() as? NBTCompound else null
}

fun <T> parse0(codec: Codec<T>, nbt: NBTTagCompound): T? {
val result = codec.parse(createSerializationContext(DynamicOpsNBT.INSTANCE), nbt)
val opt = result.resultOrPartial { error("Failed to parse: $it") }
return if (opt.isPresent) opt.get() else null
}

fun <T> save0(codec: Codec<T>, obj: T): NBTTagCompound? {
val result = codec.encodeStart(createSerializationContext(DynamicOpsNBT.INSTANCE), obj)
val opt = result.resultOrPartial { error("Failed to save: $it") }
return if (opt.isPresent) opt.get() as? NBTTagCompound else null
}
override fun parsePatch(tag: NBTCompound): Any? = parse(DataComponentPatch.CODEC, tag)

override fun parsePatch(tag: NBTCompound): Any? = parse0(DataComponentPatch.CODEC, tag.getRaw() as NBTTagCompound)
.also { println("Test-parse: " + parse(DataComponentPatch.CODEC, tag)) }
override fun savePatch(dcp: Any): NBTCompound? = save(DataComponentPatch.CODEC, dcp as DataComponentPatch)

override fun savePatch(dcp: Any): NBTCompound? = save0(DataComponentPatch.CODEC, dcp as DataComponentPatch)?.let { NBTCompound.of(it) }
.also { println("Test-save: " + save(DataComponentPatch.CODEC, dcp)) }
override fun parseMap(tag: NBTCompound): Any? = parse(DataComponentMap.CODEC, tag)

override fun parseMap(tag: NBTCompound): Any? = parse0(DataComponentMap.CODEC, tag.getRaw() as NBTTagCompound)
override fun saveMap(dcm: Any): NBTCompound? = save(DataComponentMap.CODEC, dcm as DataComponentMap)

override fun saveMap(dcm: Any): NBTCompound? = save0(DataComponentMap.CODEC, dcm as DataComponentMap)?.let { NBTCompound.of(it) }
fun <V> createSerializationContext(dynamicOps: DynamicOps<V>): RegistryOps<V> = uncheck(method.invoke(access, dynamicOps)!!)

private val access: IRegistryCustom.Dimension by lazy { (Bukkit.getServer() as CraftServer).server.registryAccess() }

Expand All @@ -119,50 +108,36 @@ class NMS12005Impl : NMS12005() {
?: ref.structure.getMethodByType("createSerializationContext", DynamicOps::class.java)
}

fun <V> createSerializationContext(dynamicOps: DynamicOps<V>): RegistryOps<V> = uncheck(method.invoke(access, dynamicOps)!!)

private object InternalOps : DynamicOps<NBTData> {

override fun empty() = NBTCompound()
override fun empty() = NBTEnd

override fun createNumeric(p0: Number) = NBTAdapter.adapt(p0)
override fun createNumeric(number: Number) = NBTAdapter.adapt(number) // TODO

override fun createString(p0: String) = NBTString(p0)
override fun createString(str: String) = NBTString(str)

override fun remove(raw: NBTData, str: String) =
if (raw is NBTCompound) {
val copied = raw.clone() // TODO shallow
copied.remove(str)
copied
} else raw
override fun remove(tag: NBTData, str: String) = if (tag is NBTCompound) tag.cloneShallow().apply { remove(str) } else tag

override fun createList(stream: Stream<NBTData>) = NBTList(stream.toList())
override fun createList(stream: Stream<NBTData>) = NBTList().apply { addAll(stream.asSequence()) }

override fun getStream(data: NBTData): DataResult<Stream<NBTData>> =
if (data is NBTList) {
DataResult.success(data.stream())
} else {
DataResult.error { "Not a list" }
}
override fun getStream(tag: NBTData): DataResult<Stream<NBTData>> =
if (tag is NBTList) DataResult.success(tag.stream()) else DataResult.error { "Not a list: $tag" }

override fun createMap(stream: Stream<Pair<NBTData, NBTData>>) = NBTCompound().also { tag ->
stream.forEach { tag.put((it.first as NBTData).toString(), it.second) }
}
override fun createMap(stream: Stream<Pair<NBTData, NBTData>>) =
NBTCompound().apply { stream.forEach { put((it.first as NBTString).content, it.second) } }

override fun getMapValues(data: NBTData): DataResult<Stream<Pair<NBTData, NBTData>>> =
if (data is NBTCompound) {
DataResult.success(data.entries.stream().map { Pair.of(this.createString(it.key), it.value) })
} else {
DataResult.error { "Not a map: $data" }
}
override fun getMapValues(tag: NBTData): DataResult<Stream<Pair<NBTData, NBTData>>> =
if (tag is NBTCompound)
DataResult.success(tag.entries.stream().map { Pair.of(this.createString(it.key), it.value) })
else DataResult.error { "Not a map: $tag" }

override fun mergeToMap(data1: NBTData, data2: NBTData, data3: NBTData): DataResult<NBTData> {
if (data1 !is NBTCompound) {
if (data1 !is NBTCompound && data1 !is NBTEnd) {
return DataResult.error({ "mergeToMap called with not a map: $data1" }, data1)
} else if (data2 !is NBTString) {
return DataResult.error({ "key is not a string: $data2" }, data1)
} else {
val newMap = data1.clone() // TODO shallowCopy()
val newMap = (data1 as? NBTCompound)?.cloneShallow() ?: NBTCompound()
newMap.put(data2.content, data3)
return DataResult.success(newMap)
}
Expand All @@ -173,13 +148,12 @@ class NMS12005Impl : NMS12005() {
DataResult.success(NBTList(data1.plus(data2.content))) // TODO Improve
else DataResult.error({ "mergeToList called with not a list: $data1" }, data1)

override fun getStringValue(data: NBTData?): DataResult<String> {
return if (data is NBTString) DataResult.success(data.content) else DataResult.error { "Not a string" }
}
override fun getStringValue(data: NBTData): DataResult<String> =
if (data is NBTString) DataResult.success(data.content) else DataResult.error { "Not a string: $data" }

override fun getNumberValue(data: NBTData): DataResult<Number> {
val number = data.content as? Number
return if (number != null) DataResult.success(number) else DataResult.error { "Not a number" }
return if (number != null) DataResult.success(number) else DataResult.error { "Not a number: $data" }
}

override fun <U> convertTo(ops: DynamicOps<U>, data: NBTData): U =
Expand All @@ -202,4 +176,8 @@ class NMS12005Impl : NMS12005() {

}

}

object NBTEnd : NBTData(Unit, NBTType.END) {
override val content = Unit
}
Loading

0 comments on commit 0f71ae3

Please sign in to comment.