Skip to content

Commit 1ed0def

Browse files
committed
nodes -> node
1 parent 5ac0a62 commit 1ed0def

4 files changed

Lines changed: 23 additions & 21 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ import json
284284
for obj in env.objects:
285285
if obj.type.name == "MonoBehaviour":
286286
# export
287-
if obj.serialized_type.nodes:
287+
if obj.serialized_type.node:
288288
# save decoded data
289289
tree = obj.read_typetree()
290290
fp = os.path.join(extract_dir, f"{tree['m_Name']}.json")
@@ -298,7 +298,7 @@ for obj in env.objects:
298298
f.write(data.raw_data)
299299

300300
# edit
301-
if obj.serialized_type.nodes:
301+
if obj.serialized_type.node:
302302
tree = obj.read_typetree()
303303
# apply modifications to the data within the tree
304304
obj.save_typetree(tree)

‎UnityPy/files/ObjectReader.py‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
from typing import TYPE_CHECKING, Generic, TypeVar, Union, List, Optional
2-
from ..enums import ClassIDType
1+
from __future__ import annotations
32

4-
from ..streams import EndianBinaryReader, EndianBinaryWriter
3+
from typing import TYPE_CHECKING, Generic, List, Optional, TypeVar, Union
4+
5+
from ..enums import ClassIDType
6+
from ..exceptions import TypeTreeError
57
from ..helpers import TypeTreeHelper
68
from ..helpers.Tpk import get_typetree_node
79
from ..helpers.TypeTreeNode import TypeTreeNode
8-
from ..exceptions import TypeTreeError
10+
from ..streams import EndianBinaryReader, EndianBinaryWriter
911

1012
if TYPE_CHECKING:
1113
from ..files import SerializedFile
@@ -20,14 +22,14 @@ class ObjectReader(Generic[T]):
2022
class_id: int
2123
type: ClassIDType
2224
path_id: int
23-
assets_file: "SerializedFile"
25+
assets_file: SerializedFile
2426
_read_until: int
2527

2628
# saves where the parser stopped
2729
# in case that not all data is read
2830
# and the obj.data is changed, the unknown data can be added again
2931

30-
def __init__(self, assets_file: "SerializedFile", reader: EndianBinaryReader):
32+
def __init__(self, assets_file: SerializedFile, reader: EndianBinaryReader):
3133
self.assets_file = assets_file
3234
self.reader = reader
3335
self.data = b""
@@ -226,19 +228,19 @@ def get_raw_data(self) -> bytes:
226228
return ret
227229

228230
def _get_typetree_node(
229-
self, nodes: Optional[Union[TypeTreeNode, List[dict]]] = None
231+
self, node: Optional[Union[TypeTreeNode, List[dict]]] = None
230232
) -> TypeTreeNode:
231-
if isinstance(nodes, TypeTreeNode):
232-
return nodes
233-
elif isinstance(nodes, list):
234-
return TypeTreeNode.from_list(nodes)
235-
elif nodes is not None:
233+
if isinstance(node, TypeTreeNode):
234+
return node
235+
elif isinstance(node, list):
236+
return TypeTreeNode.from_list(node)
237+
elif node is not None:
236238
raise ValueError("nodes must be a list[dict] or TypeTreeNode")
237239

238240
if self.serialized_type:
239-
nodes = self.serialized_type.nodes
240-
if not nodes:
241-
nodes = get_typetree_node(self.class_id, self.version)
242-
if not nodes:
241+
node = self.serialized_type.node
242+
if not node:
243+
node = get_typetree_node(self.class_id, self.version)
244+
if not node:
243245
raise TypeTreeError("There are no TypeTree nodes for this object.")
244-
return nodes
246+
return node

‎UnityPy/tools/extractor.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def exportMonoBehaviour(
192192
) -> List[int]:
193193
export = None
194194
# TODO - add generic way to add external typetrees
195-
if obj.serialized_type and obj.serialized_type.nodes:
195+
if obj.serialized_type and obj.serialized_type.node:
196196
extension = ".json"
197197
export = json.dumps(obj.read_typetree(), indent=4, ensure_ascii=False).encode(
198198
"utf8", errors="surrogateescape"

‎examples/MonoBehaviourFromAssembly/monobehaviour_from_assembly.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def export_monobehaviours(asset_path: str, trees: dict):
4747
for obj in env.objects:
4848
if obj.type == "MonoBehaviour":
4949
d = obj.read()
50-
if obj.serialized_type and obj.serialized_type.nodes:
50+
if obj.serialized_type and obj.serialized_type.node:
5151
tree = obj.read_typetree()
5252
else:
5353
if not d.m_Script:

0 commit comments

Comments
 (0)