Added players.helpers.get_client_language function.

PlayerEntity.language now just uses the imported get_client_language function.

Author: satoon101

addons/source-python/packages/source-python/players/classes/language/__init__.py

@@ -11,13 +11,8 @@
 
 
 # =============================================================================
-# >> CLASSES
+# >> FUNCTIONS
 # =============================================================================
-class _LanguagePropertyBase(object):
-
-    """Provides a property to get the player's language."""
-
-    @property
-    def language(self):
-        """Return the player's language."""
-        return engine_server.get_client_convar_value(self.index, 'cl_language')
+def get_client_language(index):
+    """Return the language of the given client."""
+    return engine_server.get_client_convar_value(index, 'cl_language')

addons/source-python/packages/source-python/players/classes/language/cache.py

@@ -13,8 +13,6 @@
 from listeners import client_disconnect_listener_manager
 from listeners import client_fully_connect_listener_manager
 from listeners import on_query_cvar_value_finished_listener_manager
-#   Players
-from players.helpers import edict_from_index
 
 
 # =============================================================================
@@ -57,6 +55,7 @@ def client_disconnect(self, index):
     @staticmethod
     def client_fully_connect(index):
         """Query the player's language when they are fully connected."""
+        from players.helpers import edict_from_index
         engine_server.start_query_cvar_value(
             edict_from_index(index), 'cl_language')
 
@@ -70,11 +69,9 @@ def client_fully_connect(index):
     _language_cache.client_disconnect)
 
 
-class _LanguagePropertyCache(object):
-
-    """Provides a property to get the player's cached language."""
-
-    @property
-    def language(self):
-        """Return the player's cached language."""
-        return _language_cache[self.index]
+# =============================================================================
+# >> FUNCTIONS
+# =============================================================================
+def get_client_language(index):
+    """Return the language of the given client."""
+    return _language_cache[index]

addons/source-python/packages/source-python/players/entity.py

@@ -15,7 +15,6 @@
 #   Constants
 from constants import MAX_TRACE_LENGTH
 #   Engines
-from engines.server import engine_server
 from engines.trace import engine_trace
 from engines.trace import ContentMasks
 from engines.trace import GameTrace
@@ -29,11 +28,11 @@
 #   Memory
 from memory import Pointer
 #   Players
-from players.helpers import playerinfo_from_index
 from players.helpers import address_from_playerinfo
+from players.helpers import get_client_language
+from players.helpers import playerinfo_from_index
 from players.helpers import uniqueid_from_playerinfo
-from players.games import _game_classes
-from players.games import _game_weapons
+from players.games import _GameWeapons
 from players.weapons import _PlayerWeapons
 
 
@@ -47,7 +46,7 @@
 # =============================================================================
 # >> CLASSES
 # =============================================================================
-class PlayerEntity(BaseEntity, _game_classes, _game_weapons, _PlayerWeapons):
+class PlayerEntity(BaseEntity, _GameWeapons, _PlayerWeapons):
 
     """Class used to interact directly with players."""
 
@@ -123,6 +122,11 @@ def set_team(self, value):
         get_team, set_team,
         doc="""Property to get/set the player's team.""")
 
+    @property
+    def language(self):
+        """Return the player's language."""
+        return get_client_language(self.index)
+
     def get_trace_ray(self, mask=ContentMasks.ALL, trace_filter=None):
         """Return the player's current trace data."""
         # Get the eye location of the player

addons/source-python/packages/source-python/players/games/__init__.py

@@ -26,23 +26,17 @@
     # Get the game's module
     _game_module = import_module('players.games.{0}'.format(GAME_NAME))
 
+# If the module doesn't exist, set the variable to None
 except ImportError:
-
-    # Set the variable to None
     _game_module = None
 
-# Use try/except to store the game specific weapons
-try:
-    _game_weapons = _game_module._GameWeapons
-
-# If the module doesn't contain the class, use the base class
-except AttributeError:
-    _game_weapons = _base_module._GameWeapons
+# Loop through each object to import
+for object_name in ('_GameWeapons', 'get_client_language'):
 
-# Use try/except to store the game specific classes
-try:
-    _game_classes = _game_module._GameClasses
+    # Use try/except to get the game specific object
+    try:
+        globals()[object_name] = getattr(_game_module, object_name)
 
-# If the module doesn't contain the class, use the base class
-except AttributeError:
-    _game_classes = _base_module._GameClasses
+    # If their is no game specific object, use the base object
+    except AttributeError:
+        globals()[object_name] = getattr(_base_module, object_name)

addons/source-python/packages/source-python/players/games/base.py

@@ -5,9 +5,7 @@
 # =============================================================================
 # >> IMPORTS
 # =============================================================================
-# Source.Python Imports
-#   Players
-from players.classes.language import _LanguagePropertyBase
+from players.classes.language import get_client_language
 
 
 # =============================================================================
@@ -16,8 +14,3 @@
 class _GameWeapons(object):
 
     """Base class for game specific weapon functionality."""
-
-
-class _GameClasses(_LanguagePropertyBase):
-
-    """Base class for game specific functionality."""

addons/source-python/packages/source-python/players/games/csgo.py

@@ -7,7 +7,7 @@
 # =============================================================================
 # Source.Python Imports
 #   Players
-from players.classes.language.cache import _LanguagePropertyCache
+from players.classes.language.cache import get_client_language
 from players.weapons.projectiles import _HEGrenade
 from players.weapons.projectiles import _Flashbang
 from players.weapons.projectiles import _SmokeGrenade
@@ -23,8 +23,3 @@ class _GameWeapons(
         _HEGrenade, _Flashbang, _SmokeGrenade, _Decoy, _Incendiary, _C4):
 
     """CS:GO specific player weapon functionality."""
-
-
-class _GameClasses(_LanguagePropertyCache):
-
-    """CS:GO specific player functionality."""

addons/source-python/packages/source-python/players/helpers.py

@@ -10,6 +10,7 @@
 from engines.server import engine_server
 #   Players
 from players import PlayerGenerator
+from players.games import get_client_language
 
 
 # =============================================================================
@@ -77,6 +78,7 @@
            'edict_from_playerinfo',
            'edict_from_pointer',
            'edict_from_userid',
+           'get_client_language',
            'index_from_basehandle',
            'index_from_edict',
            'index_from_inthandle',