Skip to content

🚑️ 不再允许通过不同子树访问/修改同一个对象 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
way-zer merged 1 commit into from
Sep 6, 2025
Merged

🚑️ 不再允许通过不同子树访问/修改同一个对象 #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/main/kotlin/cf/wayzer/contentsTweaker/CTNode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import arc.util.serialization.JsonWriter
import cf.wayzer.contentsTweaker.CTNode.*
import cf.wayzer.contentsTweaker.util.ExtendableClass
import cf.wayzer.contentsTweaker.util.ExtendableClassDSL
import java.util.*

/**
* 所有节点都是[CTNode]
Expand Down Expand Up @@ -45,8 +46,10 @@ class CTNode private constructor() : ExtendableClass<CTExtInfo>() {
val node = children[name]
?: getAll<IndexableRaw>().firstNotNullOfOrNull { it.resolve(name) }
?: error("Not found child $name")
node.collectAll()
return node
//If it's a duplicate Node for object, only Modifiers are accessible.
if (get<ObjInfo<*>>()?.isDuplicated == true && node.get<Modifier>() == null)
error("Duplicated Object Node, cannot visit children")
return node.collectAll()
}

/** 供[ContentsTweaker.NodeCollector]使用，解析清使用[resolve]*/
Expand All @@ -61,7 +64,13 @@ class CTNode private constructor() : ExtendableClass<CTExtInfo>() {
val elementType: Class<*>? = null, // List.T or Map.V
val keyType: Class<*>? = null // Map.K
) : CTExtInfo {
val isDuplicated = duplicatedObjects.put(obj, Unit) != null

constructor(obj: T & Any) : this(obj, obj::class.java)

companion object {
val duplicatedObjects = IdentityHashMap<Any, Unit>()
}
}

fun interface Resettable : CTExtInfo {
Expand Down Expand Up @@ -184,6 +193,7 @@ class CTNode private constructor() : ExtendableClass<CTExtInfo>() {

Root.children.clear()
Root.collected = false
ObjInfo.duplicatedObjects.clear()
}

fun handle(json: JsonValue, node: CTNode = Root.collectAll()) {
Expand Down
Loading