move data outside oot submodule

Fast-64 · Jan 5, 2025 · bd4bc84 · bd4bc84
1 parent 179596f
commit bd4bc84
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 3 deletions.
diff --git a/fast64_internal/constants.py b/fast64_internal/constants.py
@@ -3,7 +3,7 @@
 
 class GameData:
     def __init__(self, game_editor_mode: Optional[str] = None):
-        from .oot.data import OoT_Data
+        from .data.oot import OoT_Data
 
         self.z64 = OoT_Data()
 

diff --git a/fast64_internal/oot/data/__init__.py → fast64_internal/data/oot/__init__.py b/fast64_internal/oot/data/__init__.py → fast64_internal/data/oot/__init__.py
diff --git a/fast64_internal/oot/data/oot_actor_data.py → fast64_internal/data/oot/oot_actor_data.py b/fast64_internal/oot/data/oot_actor_data.py → fast64_internal/data/oot/oot_actor_data.py
diff --git a/fast64_internal/oot/data/oot_data.py → fast64_internal/data/oot/oot_data.py b/fast64_internal/oot/data/oot_data.py → fast64_internal/data/oot/oot_data.py
diff --git a/fast64_internal/oot/data/oot_enum_data.py → fast64_internal/data/oot/oot_enum_data.py b/fast64_internal/oot/data/oot_enum_data.py → fast64_internal/data/oot/oot_enum_data.py
diff --git a/fast64_internal/oot/data/oot_getters.py → fast64_internal/data/oot/oot_getters.py b/fast64_internal/oot/data/oot_getters.py → fast64_internal/data/oot/oot_getters.py
diff --git a/fast64_internal/oot/data/oot_object_data.py → fast64_internal/data/oot/oot_object_data.py b/fast64_internal/oot/data/oot_object_data.py → fast64_internal/data/oot/oot_object_data.py
diff --git a/fast64_internal/oot/data/xml/ActorList.xml → fast64_internal/data/oot/xml/ActorList.xml b/fast64_internal/oot/data/xml/ActorList.xml → fast64_internal/data/oot/xml/ActorList.xml
diff --git a/fast64_internal/oot/data/xml/EnumData.xml → fast64_internal/data/oot/xml/EnumData.xml b/fast64_internal/oot/data/xml/EnumData.xml → fast64_internal/data/oot/xml/EnumData.xml
diff --git a/fast64_internal/oot/data/xml/ObjectList.xml → fast64_internal/data/oot/xml/ObjectList.xml b/fast64_internal/oot/data/xml/ObjectList.xml → fast64_internal/data/oot/xml/ObjectList.xml
diff --git a/fast64_internal/oot/oot_constants.py b/fast64_internal/oot/oot_constants.py
@@ -1,4 +1,4 @@
-from .data import OoT_Data
+from ..data.oot import OoT_Data
 
 ootData = OoT_Data()
 

diff --git a/fast64_internal/oot/oot_upgrade.py b/fast64_internal/oot/oot_upgrade.py
@@ -5,7 +5,7 @@
 import bpy
 from bpy.types import Object, CollectionProperty
 from ..utility import PluginError
-from .data import OoT_ObjectData
+from ..data.oot import OoT_ObjectData
 from .oot_utility import getEvalParams, get_actor_prop_from_obj
 from .oot_constants import ootData
 from .cutscene.constants import ootEnumCSMotionCamMode