From 18afa0c9236c4d4ce1a5f281b943952cf4e38acc Mon Sep 17 00:00:00 2001 From: Ryan Reed Date: Thu, 20 Mar 2025 22:39:11 -0400 Subject: [PATCH] Renaming NodeDataResource to Node3DDataResource --- save_load/components/save_data_component.gd | 2 +- save_load/components/save_level_data_component.gd | 8 ++++---- save_load/resources/node_types/block_data_resource.gd | 2 +- .../{node_data_resource.gd => node3d_data_resource.gd} | 2 +- ...e_data_resource.gd.uid => node3d_data_resource.gd.uid} | 0 ...{node_data_resource.tres => node3d_data_resource.tres} | 2 +- save_load/resources/node_types/player_data_resource.gd | 2 +- save_load/resources/save_game_data_resource.gd | 6 +++--- save_load/resources/save_game_data_resource.tres | 2 +- save_load/resources/scene_data_resource.gd | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) rename save_load/resources/node_types/{node_data_resource.gd => node3d_data_resource.gd} (93%) rename save_load/resources/node_types/{node_data_resource.gd.uid => node3d_data_resource.gd.uid} (100%) rename save_load/resources/node_types/{node_data_resource.tres => node3d_data_resource.tres} (82%) diff --git a/save_load/components/save_data_component.gd b/save_load/components/save_data_component.gd index 631fff3..9c801e1 100644 --- a/save_load/components/save_data_component.gd +++ b/save_load/components/save_data_component.gd @@ -5,7 +5,7 @@ class_name SaveDataComponent extends Node -@export var save_data_resource: NodeDataResource ## The resource describing the type of object being saved +@export var save_data_resource: Node3DDataResource ## The resource describing the type of object being saved @onready var parent_node: Node3D = get_parent() diff --git a/save_load/components/save_level_data_component.gd b/save_load/components/save_level_data_component.gd index 6a778e0..e380e8d 100644 --- a/save_load/components/save_level_data_component.gd +++ b/save_load/components/save_level_data_component.gd @@ -34,8 +34,8 @@ func save_node_data() -> void: for node: Node in nodes: if node is SaveDataComponent: @warning_ignore("unsafe_method_access") - var save_data_resource: NodeDataResource = node._save_data() - var save_final_resource: NodeDataResource = save_data_resource.duplicate() + var save_data_resource: Node3DDataResource = node._save_data() + var save_final_resource: Node3DDataResource = save_data_resource.duplicate() game_data_resource.save_data_nodes.append(save_final_resource) func save_game() -> void: @@ -62,5 +62,5 @@ func load_game() -> void: var root_node: Window = get_tree().root for resource: Resource in game_data_resource.save_data_nodes: - if resource is NodeDataResource: - (resource as NodeDataResource)._load_data(root_node) + if resource is Node3DDataResource: + (resource as Node3DDataResource)._load_data(root_node) diff --git a/save_load/resources/node_types/block_data_resource.gd b/save_load/resources/node_types/block_data_resource.gd index 25ce0e3..344cc45 100644 --- a/save_load/resources/node_types/block_data_resource.gd +++ b/save_load/resources/node_types/block_data_resource.gd @@ -1,6 +1,6 @@ ## The resource utilized for saving a Block class_name BlockDataResource -extends NodeDataResource +extends Node3DDataResource @export var block_id: String = "001" diff --git a/save_load/resources/node_types/node_data_resource.gd b/save_load/resources/node_types/node3d_data_resource.gd similarity index 93% rename from save_load/resources/node_types/node_data_resource.gd rename to save_load/resources/node_types/node3d_data_resource.gd index 45f9d9f..0ac6fb9 100644 --- a/save_load/resources/node_types/node_data_resource.gd +++ b/save_load/resources/node_types/node3d_data_resource.gd @@ -1,5 +1,5 @@ ## The base resource for saving a specific Node -class_name NodeDataResource +class_name Node3DDataResource extends Resource diff --git a/save_load/resources/node_types/node_data_resource.gd.uid b/save_load/resources/node_types/node3d_data_resource.gd.uid similarity index 100% rename from save_load/resources/node_types/node_data_resource.gd.uid rename to save_load/resources/node_types/node3d_data_resource.gd.uid diff --git a/save_load/resources/node_types/node_data_resource.tres b/save_load/resources/node_types/node3d_data_resource.tres similarity index 82% rename from save_load/resources/node_types/node_data_resource.tres rename to save_load/resources/node_types/node3d_data_resource.tres index d97c773..6ee5050 100644 --- a/save_load/resources/node_types/node_data_resource.tres +++ b/save_load/resources/node_types/node3d_data_resource.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="NodeDataResource" load_steps=2 format=3 uid="uid://dald1lud7ktsj"] -[ext_resource type="Script" uid="uid://drj0sfem1gmsk" path="res://save_load/resources/node_types/node_data_resource.gd" id="1_b70a7"] +[ext_resource type="Script" uid="uid://drj0sfem1gmsk" path="res://save_load/resources/node_types/node3d_data_resource.gd" id="1_b70a7"] [resource] script = ExtResource("1_b70a7") diff --git a/save_load/resources/node_types/player_data_resource.gd b/save_load/resources/node_types/player_data_resource.gd index cb43adf..c88bc39 100644 --- a/save_load/resources/node_types/player_data_resource.gd +++ b/save_load/resources/node_types/player_data_resource.gd @@ -1,6 +1,6 @@ ## The resource utilized for saving a Player class_name PlayerDataResource -extends NodeDataResource +extends Node3DDataResource func _save_data(node: Node3D) -> void: diff --git a/save_load/resources/save_game_data_resource.gd b/save_load/resources/save_game_data_resource.gd index 0bc84d2..bf8f8df 100644 --- a/save_load/resources/save_game_data_resource.gd +++ b/save_load/resources/save_game_data_resource.gd @@ -1,7 +1,7 @@ -## The entire save structure that contains all NodeDataResources -## NodeDataResources will be located by the SaveLevelDataComponent +## The entire save structure that contains all Node3DDataResources +## Node3DDataResources will be located by the SaveLevelDataComponent class_name SaveGameDataResource extends Resource -@export var save_data_nodes: Array[NodeDataResource] +@export var save_data_nodes: Array[Node3DDataResource] diff --git a/save_load/resources/save_game_data_resource.tres b/save_load/resources/save_game_data_resource.tres index 18f86c8..9dc8a6b 100644 --- a/save_load/resources/save_game_data_resource.tres +++ b/save_load/resources/save_game_data_resource.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SaveGameDataResource" load_steps=3 format=3 uid="uid://dkniygoky2jcx"] -[ext_resource type="Script" uid="uid://drj0sfem1gmsk" path="res://save_load/resources/node_types/node_data_resource.gd" id="1_7yx7n"] +[ext_resource type="Script" uid="uid://drj0sfem1gmsk" path="res://save_load/resources/node_types/node3d_data_resource.gd" id="1_7yx7n"] [ext_resource type="Script" uid="uid://di6ov7tpewhft" path="res://save_load/resources/save_game_data_resource.gd" id="1_sbw5t"] [resource] diff --git a/save_load/resources/scene_data_resource.gd b/save_load/resources/scene_data_resource.gd index 13f3e75..5478518 100644 --- a/save_load/resources/scene_data_resource.gd +++ b/save_load/resources/scene_data_resource.gd @@ -1,6 +1,6 @@ ## Used with the SaveDataComponent for defining node and scene_file_path class_name SceneDataResource -extends NodeDataResource +extends Node3DDataResource @export var node_name: String