spinoff fix

CHANGELOG.md

@@ -1,4 +1,4 @@
-### 1.7.34 (build 21812, api 8, 2024-04-24)
+### 1.7.34 (build 21813, api 8, 2024-04-24)
 - Bumped Python version from 3.11 to 3.12 for all builds and project tools. One
   of the things this means is that we can use `typing.override` instead of the
   `typing_extensions` version so the annoying requirement of installing

src/assets/ba_data/python/babase/_app.py

@@ -388,7 +388,6 @@ def _get_subsystem_property(
 
     # __FEATURESET_APP_SUBSYSTEM_PROPERTIES_BEGIN__
     # This section generated by batools.appmodule; do not edit.
-
     @property
     def classic(self) -> ClassicSubsystem | None:
         """Our classic subsystem (if available)."""
@@ -399,7 +398,6 @@ def classic(self) -> ClassicSubsystem | None:
     @staticmethod
     def _create_classic_subsystem() -> ClassicSubsystem | None:
         # pylint: disable=cyclic-import
-
         try:
             from baclassic import ClassicSubsystem
 
@@ -409,7 +407,6 @@ def _create_classic_subsystem() -> ClassicSubsystem | None:
         except Exception:
             logging.exception('Error importing baclassic.')
             return None
-
     @property
     def plus(self) -> PlusSubsystem | None:
         """Our plus subsystem (if available)."""
@@ -420,7 +417,6 @@ def plus(self) -> PlusSubsystem | None:
     @staticmethod
     def _create_plus_subsystem() -> PlusSubsystem | None:
         # pylint: disable=cyclic-import
-
         try:
             from baplus import PlusSubsystem
 
@@ -430,7 +426,6 @@ def _create_plus_subsystem() -> PlusSubsystem | None:
         except Exception:
             logging.exception('Error importing baplus.')
             return None
-
     @property
     def ui_v1(self) -> UIV1Subsystem:
         """Our ui_v1 subsystem (always available)."""

src/assets/ba_data/python/baenv.py

@@ -52,7 +52,7 @@
 
 # Build number and version of the ballistica binary we expect to be
 # using.
-TARGET_BALLISTICA_BUILD = 21812
+TARGET_BALLISTICA_BUILD = 21813
 TARGET_BALLISTICA_VERSION = '1.7.34'
 
 

src/ballistica/shared/ballistica.cc

@@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
 namespace ballistica {
 
 // These are set automatically via script; don't modify them here.
-const int kEngineBuildNumber = 21812;
+const int kEngineBuildNumber = 21813;
 const char* kEngineVersion = "1.7.34";
 const int kEngineApiVersion = 8;
 

tools/batools/appmodule.py

@@ -69,11 +69,10 @@ def generate_app_module(
     contents = ''
 
     for fsetname in sorted(all_fset_names):
-        # for _fsname, fset in sorted(fsets.items()):
         if fsetname in missing_soft_fset_names:
             contents += (
                 f'\n'
-                f'@cached_property\n'
+                f'@property\n'
                 f'def {fsetname}(self) -> Any | None:\n'
                 f'    """Our {fsetname} subsystem (not available'
                 f' in this project)."""\n'
@@ -94,10 +93,6 @@ def generate_app_module(
                 # so we need to be consistent.
                 if fset.allow_as_soft_requirement:
                     contents += (
-                        # f'\n'
-                        # f'_{fset.name}_init_lock = Lock()\n'
-                        f'\n'
-                        # f'@cached_property\n'
                         f'@property\n'
                         f'def {fset.name}(self) -> {classname} | None:\n'
                         f'    """Our {fset.name} subsystem (if available)."""\n'
@@ -110,12 +105,6 @@ def generate_app_module(
                         f'def _create_{fset.name}_subsystem()'
                         f' -> {classname} | None:\n'
                         f'    # pylint: disable=cyclic-import\n'
-                        f'\n'
-                        # f'    # cached_property is not thread safe as of'
-                        # f' Python 3.12, so we\n'
-                        # f'    # need to wrangle that ourself'
-                        # f' to avoid multiple instantiations.\n'
-                        # f'\n'
                         f'    try:\n'
                         f'        from {modname} import {classname}\n'
                         f'\n'
@@ -129,8 +118,6 @@ def generate_app_module(
                     )
                 else:
                     contents += (
-                        f'\n'
-                        # f'@cached_property\n'
                         '@property\n'
                         f'def {fset.name}(self) -> {classname}:\n'
                         f'    """Our {fset.name} subsystem'