tools: Fix imports

tools/ai_common.py

@@ -1,8 +1,8 @@
 from typing import Dict, List
 import yaml
 
-from util import utils
+from common.util import utils
-from util.graph import Graph
+from common.util.graph import Graph
 
 BaseClasses = {
     0x71024d8d68,

tools/ai_generate_actions.py

@@ -7,7 +7,8 @@ from typing import List, Dict, Iterable, Optional, Set
 
 from pathlib import Path
 import textwrap
-from util import ai_common, elf
+import ai_common
+from common.util import elf
 
 
 def get_member_name(entry) -> str:

tools/ai_generate_ais.py

@@ -7,7 +7,8 @@ from typing import List, Dict, Iterable, Optional, Set
 
 from pathlib import Path
 import textwrap
-from util import ai_common, elf
+import ai_common
+from common.util import elf
 
 
 def get_member_name(entry) -> str:

tools/ai_identify_matching_stubs.py

@@ -8,12 +8,13 @@ import cxxfilt
 from pathlib import Path
 from typing import Dict, Iterable
 
-import util.checker
+import common.util.checker
-import util.elf
+import common.util.elf
-from util import utils, ai_common
+from common.util import utils
+import ai_common
 
 
-def identify(functions: Dict[str, utils.FunctionInfo], checker: util.checker.FunctionChecker,
+def identify(functions: Dict[str, utils.FunctionInfo], checker: common.util.checker.FunctionChecker,
              new_matches: Dict[int, str], class_names: Iterable[str], get_pairs) -> None:
     for name in class_names:
         orig_name = name
@@ -27,9 +28,9 @@ def identify(functions: Dict[str, utils.FunctionInfo], checker: util.checker.Fun
             if orig_fn_info.status != utils.FunctionStatus.NotDecompiled:
                 continue
 
-            orig_fn = util.elf.get_fn_from_base_elf(orig_fn_info.addr, orig_fn_info.size)
+            orig_fn = common.util.elf.get_fn_from_base_elf(orig_fn_info.addr, orig_fn_info.size)
             try:
-                decomp_fn = util.elf.get_fn_from_my_elf(fn_name)
+                decomp_fn = common.util.elf.get_fn_from_my_elf(fn_name)
             except KeyError:
                 continue
 
@@ -47,7 +48,7 @@ def main() -> None:
     type_: str = args.type
 
     new_matches: Dict[int, str] = dict()
-    checker = util.checker.FunctionChecker()
+    checker = common.util.checker.FunctionChecker()
     functions: Dict[str, utils.FunctionInfo] = {fn.name: fn for fn in utils.get_functions()}
 
     aidef = oead.byml.from_text(Path(args.aidef).read_text(encoding="utf-8"))

tools/ai_progress.py

@@ -5,7 +5,7 @@ from typing import Dict, Optional
 import yaml
 from colorama import Fore
 
-from util import utils
+from common.util import utils
 
 # TODO: add behaviors after they have been generated
 _TYPES = ("action", "ai", "query")

tools/ai_show_nontrivial_hierarchies.py

@@ -5,9 +5,9 @@ from typing import Union
 
 import yaml
 
-from util import ai_common
+import ai_common
-from util.ai_common import BaseClasses
+from ai_common import BaseClasses
-from util.graph import Graph
+from common.util.graph import Graph
 
 _known_vtables = {
     0x71024d8d68: "ActionBase",

tools/common

@@ -1 +1 @@
-Subproject commit c7ad8e6b7d321a41cdc7004f3547e76a1d8dc79b
+Subproject commit e4774884e39e1a901f993f06e841caa391e407f7

tools/ida_ai_rename_action_vfns.py

@@ -1,10 +1,11 @@
 import struct
 from typing import Dict
 
-from util import utils, ai_common
+from common.util import utils
+import ai_common
 import idaapi
 
-from util.ai_common import BaseClasses
+from ai_common import BaseClasses
 
 _vtable_fn_names = [
     "_ZNK5uking6action{}27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE",

tools/ida_ai_rename_ai_vfns.py

@@ -1,10 +1,11 @@
 import struct
 from typing import Dict
 
-from util import utils, ai_common
+from common.util import utils
+import ai_common
 import idaapi
 
-from util.ai_common import BaseClasses
+from ai_common import BaseClasses
 
 _vtable_fn_names = [
     "_ZNK5uking2ai{}27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE",