diff --git a/.efrocachemap b/.efrocachemap index 149f3598..3695e987 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -432,7 +432,7 @@ "build/assets/ba_data/audio/zoeOw.ogg": "b2d705c31c9dcc1efdc71394764c3beb", "build/assets/ba_data/audio/zoePickup01.ogg": "e9366dc2d2b8ab8b0c4e2c14c02d0789", "build/assets/ba_data/audio/zoeScream01.ogg": "903e0e45ee9b3373e9d9ce20c814374e", - "build/assets/ba_data/data/langdata.json": "917f90e60eb23ea35d6053765dbd00b9", + "build/assets/ba_data/data/langdata.json": "ce9b8659bc3402bcb95eea4d7153d47f", "build/assets/ba_data/data/languages/arabic.json": "d95c590f7db91a9e8b7df4b9b58c8529", "build/assets/ba_data/data/languages/belarussian.json": "009b452aa308bf2b2f7e92d9b78ba5ff", "build/assets/ba_data/data/languages/chinese.json": "a8f1d5549dbbec0600499884028669a1", @@ -450,7 +450,7 @@ "build/assets/ba_data/data/languages/greek.json": "d28d1092fbb00ed857cbd53124c0dc78", "build/assets/ba_data/data/languages/hindi.json": "567e6976b3c72f891431ad7fcc62ab16", "build/assets/ba_data/data/languages/hungarian.json": "af801baffb2c06460635dfb04c34bb3e", - "build/assets/ba_data/data/languages/indonesian.json": "7bf2cc8a208b9bb3ac38a8ace1aff7dc", + "build/assets/ba_data/data/languages/indonesian.json": "8cb51ee8ec6f901f21733c290a17c8b8", "build/assets/ba_data/data/languages/italian.json": "efddc0d1740328da9655e4bc68693ce9", "build/assets/ba_data/data/languages/korean.json": "360760d72832863e1a3451b0a514cb08", "build/assets/ba_data/data/languages/malay.json": "0212e18e54efa202c17505376e5b82fb", @@ -468,7 +468,7 @@ "build/assets/ba_data/data/languages/thai.json": "383540a1e9c7c131ac579f51afc87471", "build/assets/ba_data/data/languages/turkish.json": "457b05da532950390e19e7e5ce7f1d3f", "build/assets/ba_data/data/languages/ukrainian.json": "2e6877453e200d91ed5df5bfe6289020", - "build/assets/ba_data/data/languages/venetian.json": "acea003316bef657925d776dd460e713", + "build/assets/ba_data/data/languages/venetian.json": "d9ce5b0e0fd816e88a9c849e74a684af", "build/assets/ba_data/data/languages/vietnamese.json": "cc578c670bfb9855f93bbdc51922d267", "build/assets/ba_data/data/maps/big_g.json": "1dd301d490643088a435ce75df971054", "build/assets/ba_data/data/maps/bridgit.json": "6aea74805f4880cc11237c5734a24422", @@ -4179,14 +4179,14 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "18e34e52720167aba40b215de362bb08", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "fd3fc62b833feac849e091851d057e47", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "0d8470ea4239af9f9a52ec1431fade78", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "05b7d86a17969d8950edd3d10268758e", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "ba63f9fd580605cd35280ac858fe6096", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "4afef96d995be4984f00aa397cf998ec", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "a610a23c317c26b2138e955578ff7138", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "cd5da22b58f929d6a92e18b95fa9adaf", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "e9c1ca6c0a078efbf64239878aaf287c", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "b8a19e2b943b7f7be546d54d6a10346c", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "6180f44b6b280ec97d8ee6ae595d56f0", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "a1531a016108afe29e5b8e29e0bd775c", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "fd1bccec899c46b1e10a961b8152bdbd", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "00faa44103dcf7ee09b99a19abf3dcce", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "a4218d6db7f17fbb504d668842515e40", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "be9176a7b60dfaf87a71b14f541e1bf7", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "b0b1607619567d10c635e7c0ce98e68e", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "5c7b118a1780cbf24c8b4bf6fd30ddb0", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "69a28ff5f0d1fb79a012449c90e3c0d0", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "5c7b118a1780cbf24c8b4bf6fd30ddb0", @@ -4199,14 +4199,14 @@ "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "593606fabbdd503bab555d49b7963ad1", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "07143cfbe795a2cbaa47a09daf1261b3", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "593606fabbdd503bab555d49b7963ad1", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "02a58be3ea5fcb38e9c4d41fb39e50e1", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "599dadcd922f9e41ed9fd6d104b3428b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "c556ebb50c7d1787f18575d949c9fd25", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "c13731a3011a820f2ba4150675bdeb27", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "0f9ab5a015991af3327d8ee6be17cd52", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "f32cfdf8eeaee850458f972c45f96e79", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "4ad000891eb8d5559a7d0e847e227449", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "10222415bd09e10e381773c9a240cdd4", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "63fed3d1b8425fab45416cb279f5a0f4", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "95aeffeb4fbda07f7b1b2f8cc04bdf86", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "1be60622bebdb48d323157c295c4e355", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "4814b0be1935dbe3637977da4991d1b4", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "105fa9614ab0d6d6cbaba248d462589c", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "a4218539439adfe16445eeae295c8940", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "f94b1fd370bf57f805d25016c5ab82c1", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "3a7955bfb56941d04c749637a5948d48", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad", "src/ballistica/base/mgen/pyembed/binding_base.inc": "06042d31df0ff9af96b99477162e2a91", diff --git a/tools/efro/util.py b/tools/efro/util.py index 85efc836..f3731d83 100644 --- a/tools/efro/util.py +++ b/tools/efro/util.py @@ -336,7 +336,7 @@ class DispatchMethodWrapper(Generic[ArgT, RetT]): @staticmethod def register( - func: Callable[[Any, Any], RetT] + func: Callable[[Any, Any], RetT], ) -> Callable[[Any, Any], RetT]: """Register a new dispatch handler for this dispatch-method.""" raise RuntimeError('Should not get here') @@ -346,7 +346,7 @@ class DispatchMethodWrapper(Generic[ArgT, RetT]): # noinspection PyProtectedMember,PyTypeHints def dispatchmethod( - func: Callable[[Any, ArgT], RetT] + func: Callable[[Any, ArgT], RetT], ) -> DispatchMethodWrapper[ArgT, RetT]: """A variation of functools.singledispatch for methods. @@ -430,7 +430,7 @@ class ValueDispatcher(Generic[ValT, RetT]): def valuedispatch1arg( - call: Callable[[ValT, ArgT], RetT] + call: Callable[[ValT, ArgT], RetT], ) -> ValueDispatcher1Arg[ValT, ArgT, RetT]: """Like valuedispatch but for functions taking an extra argument.""" return ValueDispatcher1Arg(call) @@ -481,7 +481,7 @@ if TYPE_CHECKING: def valuedispatchmethod( - call: Callable[[SelfT, ValT], RetT] + call: Callable[[SelfT, ValT], RetT], ) -> ValueDispatcherMethod[ValT, RetT]: """Like valuedispatch but works with methods instead of functions.""" diff --git a/tools/efrotools/project.py b/tools/efrotools/project.py index 908f9b8b..f784ee32 100644 --- a/tools/efrotools/project.py +++ b/tools/efrotools/project.py @@ -18,7 +18,7 @@ _g_local_configs: dict[str, dict[str, Any]] = {} def get_public_legal_notice( - style: Literal['python', 'c++', 'makefile', 'raw'] + style: Literal['python', 'c++', 'makefile', 'raw'], ) -> str: """Return the license notice as used for our public facing stuff.