Added new conversions_c module to implement all entity/player type conversions directly to the build. Made changes in entities.helpers and players.helpers to accomodate this change.

Updated entities.entity.BaseEntity and players.entity.PlayerEntity to use conversion in place of instantiation.

Updated getting/setting of properties, keyvalues, and offsets for BaseEntity classes.

Updated players.entity.PlayerEntity to use __new__ in place of __init__ to more easily allow inheritance by other classes.

Added ServerUnknown.get_base_entity() to return the BaseEntity pointer of the entity.

Author: satoon101

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

@@ -5,7 +5,7 @@
 # =============================================================================
 # Source.Python Imports
 #from Source import Binutils
-from entity_c import Edict
+from conversions_c import edict_from_index
 from public import public
 #   Entities
 #from entities.functions import Functions
@@ -28,10 +28,10 @@ def __new__(cls, index, *entities):
             is of the correct entity type and add the index attribute'''
 
         # Get the given indexes edict
-        edict = Edict(index)
+        edict = edict_from_index(index)
 
         # Is the edict valid?
-        if edict.is_free() or not edict.is_valid():
+        if not edict or edict.is_free():
 
             # If not raise an error
             raise ValueError(
@@ -78,32 +78,28 @@ def __getattr__(self, attr):
             # Return the offset's value
             return self._get_offset(attr)
 
+        '''
+
         # Is the attribute a function of this entity?
         if attr in self.functions:
 
             # Return the function
             return self._get_function(attr)
 
+        '''
+
         # If the attribute is not found, raise an error
         raise AttributeError('Attribute "{0}" not found'.format(attr))
 
     def _get_property(self, item):
         '''Gets the value of the given property'''
 
-        # Get the property's instance
-        prop = self.edict.get_prop(self.properties[item].prop)
-
         # Get the property's type
         prop_type = self.properties[item].type
 
-        # Is the property's type a known type?
-        if not hasattr(prop, 'get_{0}'.format(prop_type)):
-
-            # If not a proper type, raise an error
-            raise TypeError('Invalid property type "{0}"'.format(prop_type))
-
         # Get the property's value
-        value = getattr(prop, 'get_{0}'.format(prop_type))()
+        value = getattr(self.edict, 'get_prop_{0}'.format(
+            prop_type))(self.properties[item].prop)
 
         # Is the property a True/False property?
         if 'True' in self.properties[item]:
@@ -117,24 +113,24 @@ def _get_property(self, item):
     def _get_keyvalue(self, item):
         '''Gets the value of the given keyvalue'''
 
+        # Get the keyvalue's type
+        kv_type = self.keyvalues[item].type
+
         # Return the value of the given keyvalue
-        return self.edict.GetKeyValue(item)
+        return getattr(self.edict, 'get_keyvalue_{0}'.format(kv_type))(item)
 
     def _get_offset(self, item):
-        '''Gets teh value of the given offset'''
+        '''Gets the value of the given offset'''
 
         # Get the offset's type
         offset_type = self.offsets[item].type
 
-        # Is the offset's type a known type?
-        if not hasattr(Binutils, 'GetLoc{0}'.format(offset_type)):
-
-            # If not a proper type, raise an error
-            raise TypeError('Invalid offset type "{0}"'.format(offset_type))
+        # Get the CPointer instance for the entity
+        pointer = CPointer(self.pointer)
 
         # Return the value of the offset
-        return getattr(Binutils, 'GetLoc{0}'.format(offset_type))(
-            self.pointer + self.offsets[item].offset)
+        return getattr(pointer, 'get_{0}'.format(
+            offset_type))(self.offsets[item].offset)
 
     def _get_function(self, item):
         '''Calls a dynamic function'''
@@ -171,19 +167,6 @@ def __setattr__(self, attr, value):
             raise ValueError(
                 'Invalid private attribute "{0}" given.'.format(attr))
 
-        # Loop through all instances
-        # (used to set using edict/IPlayerInfo attributes)
-        for instance in self.instances:
-
-            # Does the current instance contain the given attribute?
-            if hasattr(instance, attr):
-
-                # Get the attribute's instance and use it to set the value
-                setattr(instance, attr, value)
-
-                # No need to go further
-                return
-
         # Is the attribute a property of this entity?
         if attr in self.properties:
 
@@ -205,63 +188,46 @@ def __setattr__(self, attr, value):
         # Was the attribute not found?
         else:
 
-            # If the attribute is not found, raise an error
-            raise LookupError('Attribute "{0}" not found'.format(attr))
+            # If the attribute is not found, just set the attribute
+            super(BaseEntity, self).__setattr__(attr, value)
 
     def _set_property(self, item, value):
         '''Sets the value of the given propery'''
 
-        # Get the property's instance
-        prop = self.edict.get_prop(self.properties[item].prop)
-
         # Get the property's type
         prop_type = self.properties[item].type
 
-        # Is the property's type a known type?
-        if not hasattr(prop, 'set_{0}'.format(prop_type)):
-
-            # Raise an error
-            raise TypeError('Invalid property type "{0}"'.format(prop_type))
-
         # Is the property a True/False property?
         if 'True' in self.properties[item]:
 
             # Get the exact value to set the property to
             value = self.properties[item][str(value)]
 
         # Set the property's value
-        getattr(prop, 'set_{0}'.format(prop_type))(value)
+        getattr(prop, 'set_prop_{0}'.format(
+            prop_type))(self.properties[item].prop, value)
 
     def _set_keyvalue(self, item, value):
         '''Sets the value of the given keyvalue'''
 
         # Get the keyvalue's type
         kv_type = self.keyvalues[item]
 
-        # Is the keyvalue's type a known type?
-        if not hasattr(self.edict, 'SetKeyValue{0}'.format(kv_type)):
-
-            # Raise an error
-            raise TypeError('Invalid keyvalue type "{0}"'.format(kv_type))
-
         # Set the keyvalue's value
-        getattr(self.edict, 'SetKeyValue{0}'.format(kv_type))(item, value)
+        getattr(self.edict, 'set_keyvalue_{0}'.format(kv_type))(item, value)
 
     def _set_offset(self, item, value):
         '''Sets the value of the given offset'''
 
         # Get the offset's type
         offset_type = self.offsets[item].type
 
-        # Is the offset's type a known type?
-        if not hasattr(Binutils, 'SetLoc{0}'.format(offset_type)):
-
-            # If not a proper type, raise an error
-            raise TypeError('Invalid offset type "{0}"'.format(offset_type))
+        # Get the CPointer instance for the entity
+        pointer = CPointer(self.pointer)
 
         # Set the offset's value
-        getattr(Binutils, 'SetLoc{0}'.format(offset_type))(
-            self.pointer + self.offsets[item].offset, value)
+        getattr(pointer, 'set_{0}'.format(
+            offset_type))(self.offsets[item].offset, value)
 
     def get_color(self):
         '''Returns a 4 part tuple (RGBA) for the entity's color'''

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

@@ -4,130 +4,11 @@
 # >> IMPORTS
 # =============================================================================
 # Source.Python Imports
-from entity_c import BaseEntityHandle
-from entity_c import Edict
-from entity_c import index_of_pointer
-from public import public
+from conversions_c import *
 
 
 # =============================================================================
-# >> FUNCTIONS
+# >> ALL DECLARATION
 # =============================================================================
-@public
-def index_from_edict(edict):
-    '''Returns an index from the given edict'''
-    return edict.get_index()
-
-
-@public
-def index_from_basehandle(bhandle):
-    '''Returns an index from the given BaseHandle instance'''
-    return bhandle.get_entry_index()
-
-
-@public
-def index_from_inthandle(ihandle):
-    '''Returns an index from the given handle in int form'''
-    return index_from_basehandle(basehandle_from_inthandle(ihandle))
-
-
-@public
-def index_from_pointer(pointer):
-    '''Returns an index from the given BaseEntity pointer'''
-    return index_of_pointer(pointer)
-
-
-@public
-def edict_from_index(index):
-    '''Returns an edict from the given index'''
-    return Edict(index)
-
-
-@public
-def edict_from_basehandle(bhandle):
-    '''Returns an edict from the given BaseHandle instance'''
-    return edict_from_index(index_from_basehandle(bhandle))
-
-
-@public
-def edict_from_inthandle(ihandle):
-    '''Returns an edict from the given handle in int form'''
-    return edict_from_index(index_from_inthandle(ihandle))
-
-
-@public
-def edict_from_pointer(pointer):
-    '''Returns an edict from the given BaseEntity pointer'''
-    return edict_from_index(index_of_pointer(pointer))
-
-
-@public
-def basehandle_from_index(index):
-    '''Returns a BaseHandle instance from the given index'''
-    return basehandle_from_edict(edict_from_index(index))
-
-
-@public
-def basehandle_from_edict(edict):
-    '''Returns a BaseHandle instance from the given edict'''
-    return edict.get_networkable().get_entity_handle().get_ref_ehandle()
-
-
-@public
-def basehandle_from_inthandle(ihandle):
-    '''Returns a BaseHandle instance from the given handle in int form'''
-    return BaseEntityHandle(ihandle)
-
-
-@public
-def basehandle_from_pointer(pointer):
-    '''Returns a BaseHandle instance from the given BaseEntity pointer'''
-    return basehandle_from_index(index_of_pointer(pointer))
-
-
-@public
-def inthandle_from_index(index):
-    '''Returns a handle in int form from the given index'''
-    return inthandle_from_basehandle(basehandle_from_index(index))
-
-
-@public
-def inthandle_from_edict(edict):
-    '''Returns a handle in int form from the given edict'''
-    return inthandle_from_basehandle(basehandle_from_edict(edict))
-
-
-@public
-def inthandle_from_basehandle(bhandle):
-    '''Returns a handle in int form from the given BaseHandle instance'''
-    return bhandle.to_int()
-
-
-@public
-def inthandle_from_pointer(pointer):
-    '''Returns a handle in int form from the given BaseEntity pointer'''
-    return inthandle_from_index(index_of_pointer(pointer))
-
-
-@public
-def pointer_from_index(index):
-    '''Returns a BaseEntity pointer from the given index'''
-    return pointer_from_edict(edict_from_index(index))
-
-
-@public
-def pointer_from_edict(edict):
-    '''Returns a BaseEntity pointer from the given edict'''
-    return edict.get_unknown().get_base_entity()
-
-
-@public
-def pointer_from_basehandle(bhandle):
-    '''Returns a BaseEntity pointer from the given BaseHandle instance'''
-    return pointer_from_edict(edict_from_basehandle(bhandle))
-
-
-@public
-def pointer_from_inthandle(ihandle):
-    '''Returns a BaseEntity pointer from the given handle in int form'''
-    return pointer_from_edict(edict_from_inthandle(ihandle))
+__all__ = [x for x in globals() if not 'userid' in x and
+    not 'playerinfo' in x and not x.startswith('__')]

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

@@ -4,7 +4,7 @@
 # >> IMPORTS
 # =============================================================================
 # Source.Python Imports
-from player_c import PlayerInfo
+from conversions_c import playerinfo_from_index
 from core import GameEngine
 from public import public
 #   Entities
@@ -22,12 +22,15 @@
 class PlayerEntity(BaseEntity, _PlayerWeapons):
     '''Class used to interact directly with players'''
 
-    def __init__(self, index):
-        '''Override the __init__ method to set the
+    def __new__(cls, index):
+        '''Override the __new__ method to set the
             "entities" attribute and set the PlayerInfo'''
 
+        # Get the "self" object using the super class' __new__
+        self = super(PlayerEntity, cls).__new__(cls, index)
+
         # Set the player's info attribute
-        self._info = PlayerInfo(self.edict)
+        self._info = playerinfo_from_index(self.index)
 
         # Is the IPlayerInfo instance valid?
         if self.info is None:
@@ -38,6 +41,9 @@ def __init__(self, index):
         # Set the entities attribute
         self._entities = frozenset(['entity', 'player'])
 
+        # Return the instance
+        return self
+
     @property
     def info(self):
         '''Returns the player's IPlayerInfo instance'''