Fixed some import errors in the Python API with recent changes to class names. Currently, core imports newly named EngineServer as GameEngine to not break backwards compat.

Changed all other instances within the API of GameEngine to use EngineServer.

Undid rename of CMRecipientFilter to RecipientFilter due to class of the same name in filters.recipients.  The name will be changed in the future, but to avoid this name conflict, the old name was returned.

Added missing section headers in conversions_wrap.h

Author: satoon101

addons/source-python/packages/source-python/_core/command.py

@@ -8,8 +8,8 @@
 from configobj import ConfigObj
 
 # Source.Python Imports
+from engine_c import EngineServer
 from _core import _CoreLogger
-from core import GameEngine
 from paths import SP_DATA_PATH
 #   Plugins
 from plugins import _plugin_strings
@@ -121,7 +121,7 @@ def delay_execution(*args):
         # Add the delay
         TickDelays.delay(
             float(args[0]),
-            GameEngine.server_command, ' '.join(args[1:]) + '\n')
+            EngineServer.server_command, ' '.join(args[1:]) + '\n')
 
     @staticmethod
     def print_version():

addons/source-python/packages/source-python/config/manager.py

@@ -10,7 +10,7 @@
 from textwrap import TextWrapper
 
 # Source.Python Imports
-from core import GameEngine
+from engine_c import EngineServer
 from excepthooks import ExceptHooks
 from paths import CFG_PATH
 from public import public
@@ -386,7 +386,7 @@ def write(self):
 
     def execute(self):
         '''Executes the config file'''
-        GameEngine.server_command(
+        EngineServer.server_command(
             'exec source-python/{0}\n'.format(self.filepath))
 
     def _parse_old_file(self):

addons/source-python/packages/source-python/core.py

@@ -8,7 +8,7 @@
 from os import sep
 
 # Source.Python Imports
-from engine_c import GameEngine
+from engine_c import EngineServer as GameEngine
 from paths import GAME_PATH
 from public import public
 

addons/source-python/packages/source-python/downloads.py

@@ -5,8 +5,8 @@
 # =============================================================================
 # Source.Python Imports
 from Source import Misc
+from engine_c import EngineServer
 from core import AutoUnload
-from core import GameEngine
 from public import public
 #   Events
 from events.manager import EventRegistry
@@ -67,13 +67,13 @@ def _add_to_download_table(self, item):
         '''Add the given file to the downloadables table'''
 
         # Lock the network string tables
-        locked = GameEngine.lock_network_string_tables(False)
+        locked = EngineServer.lock_network_string_tables(False)
 
         # Add the given file
         self.download_table.AddString(True, item)
 
         # Reset the lock status
-        GameEngine.lock_network_string_tables(locked)
+        EngineServer.lock_network_string_tables(locked)
 
     def server_spawn(self, GameEvent):
         '''Adds all items stored as downloadables to the stringtable'''

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

@@ -8,8 +8,8 @@
 from configobj import ConfigObj
 
 # Source.Python Imports
+from engine_c import EngineServer
 from player_c import PlayerGenerator
-from core import GameEngine
 from core import GAME_NAME
 from paths import SP_DATA_PATH
 from public import public
@@ -213,7 +213,7 @@ def _return_weapon(PlayerInfo):
 
 def _return_language(PlayerInfo):
     '''Returns the player's language'''
-    return GameEngine.get_client_convar_value(
+    return EngineServer.get_client_convar_value(
         index_from_playerinfo(PlayerInfo), 'cl_language')
 
 

addons/source-python/packages/source-python/loggers.py

@@ -17,7 +17,7 @@
 
 # Source.Python Imports
 from cvar_c import ConVar
-from core import GameEngine
+from engine_c import EngineServer
 from core import echo_console
 from paths import LOG_PATH
 from public import public
@@ -143,7 +143,7 @@ def _log(self, level, msg, *args, **kwargs):
             message = self.formatter.format(record)
 
             # Print to the main log
-            GameEngine.log_print(message + '\n')
+            EngineServer.log_print(message + '\n')
 
         # Print to the console?
         if CONSOLE & areas:

addons/source-python/packages/source-python/messages/base.py

@@ -17,11 +17,11 @@
 from path import path
 
 # Source.Python Imports
+from engine_c import EngineServer
 from core import echo_console
-from core import GameEngine
 from excepthooks import ExceptHooks
 #   UserMessage
-from usermessage_c import CUserMessage
+from usermessage_c import UserMessage
 #   Filters
 from filters.recipients import RecipientFilter
 #   Translations
@@ -442,8 +442,8 @@ def _write_field_value(self, parameter_name, usermsg, field_type,
     def _send_message(self, recipient, **kwargs):
         '''Send the message to the given recipient filter'''
 
-        # Get a CUserMessage instance
-        usermsg = CUserMessage(recipient, self._message_name)
+        # Get a UserMessage instance
+        usermsg = UserMessage(recipient, self._message_name)
 
         # Loop through all required parameters
         for parameter_name in self._required_parameters:
@@ -550,7 +550,7 @@ def send(self, *args, **kwargs):
             for index in recipient:
 
                 # Add the current index
-                languages[GameEngine.get_client_convar_value(index,
+                languages[EngineServer.get_client_convar_value(index,
                     'cl_language')].add(index)
 
             # Loop through all languages

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

@@ -5,7 +5,7 @@
 # =============================================================================
 # Source.Python Imports
 from conversions_c import playerinfo_from_index
-from core import GameEngine
+from engine_c import EngineServer
 from public import public
 #   Entities
 from entities.entity import BaseEntity
@@ -78,7 +78,7 @@ def isdead(self):
     @property
     def language(self):
         '''Returns the player's language'''
-        return GameEngine.get_client_convar_value(self.index, 'cl_language')
+        return EngineServer.get_client_convar_value(self.index, 'cl_language')
 
     @property
     def uniqueid(self):

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

@@ -5,6 +5,7 @@
 # =============================================================================
 # Source.Python Imports
 from conversions_c import *
+from engine_c import EngineServer
 from public import public
 
 
@@ -102,7 +103,7 @@ def address_from_playerinfo(player):
     index = index_from_playerinfo(player)
 
     # Get the player's NetInfo instance
-    netinfo = GameEngine.get_player_net_info(index)
+    netinfo = EngineServer.get_player_net_info(index)
 
     # Return the player's IP Address
     return netinfo.get_address()

addons/source-python/packages/source-python/settings/types.py

@@ -8,7 +8,7 @@
 from collections import OrderedDict
 
 # Source.Python Imports
-from core import GameEngine
+from engine_c import EngineServer
 #   Players
 from players.helpers import playerinfo_from_index
 from players.helpers import uniqueid_from_playerinfo
@@ -73,7 +73,7 @@ def get_setting(self, index):
         convar = self.prefix + self.name.lower().replace(' ', '_')
 
         # Get the client's convar value
-        value = GameEngine.get_client_convar_value(index, convar)
+        value = EngineServer.get_client_convar_value(index, convar)
 
         # Use try/except to typecast the value
         try: