flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

cPluginManager: slight cleanup

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@247 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-02-08 17:38:02 +00:00
parent 6651343261
commit 356981a51d
1 changed files with 312 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
source/cPluginManager.cpp
View File

@ -26,6 +26,10 @@
typedef std::list< cPlugin_Lua* > LuaPluginList;
typedef std::map< cPluginManager::PluginHook, cPluginManager::PluginList > HookMap;
struct cPluginManager::sPluginManagerState
{
LuaPluginList LuaPlugins;
@ -33,12 +37,20 @@ struct cPluginManager::sPluginManagerState
HookMap Hooks;
};
cPluginManager* cPluginManager::GetPluginManager()
{
LOGWARN("WARNING: Using deprecated function cPluginManager::GetPluginManager() use cRoot::Get()->GetPluginManager() instead!");
return cRoot::Get()->GetPluginManager();
}
cPluginManager::cPluginManager()
: m_pState( new sPluginManagerState )
, m_LuaCommandBinder( new cLuaCommandBinder() )
@ -46,6 +58,10 @@ cPluginManager::cPluginManager()
{
}
cPluginManager::~cPluginManager()
{
UnloadPluginsNow();
@ -54,48 +70,58 @@ cPluginManager::~cPluginManager()
delete m_pState;
}
void cPluginManager::ReloadPlugins()
{
m_bReloadPlugins = true;
}
void cPluginManager::ReloadPluginsNow()
{
LOG("--Loading plugins--");
LOG("Loading plugins");
m_bReloadPlugins = false;
UnloadPluginsNow();
#if USE_SQUIRREL
if( !SquirrelBindings::IsBound ) // Can only do this once apparently, or we're making ambiguous calls in the script
{
SquirrelVM::Init();
SquirrelBindings::Bind( SquirrelVM::GetVMPtr() );
}
#endif
#endif // USE_SQUIRREL
cIniFile IniFile("settings.ini");
if( IniFile.ReadFile() )
if (!IniFile.ReadFile() )
{
LOGWARNING("cPluginManager: Can't find settings.ini, so can't load any plugins.");
}
unsigned int KeyNum = IniFile.FindKey("Plugins");
unsigned int NumPlugins = IniFile.GetNumValues( KeyNum );
if( NumPlugins > 0 )
{
for(unsigned int i = 0; i < NumPlugins; i++)
{
std::string ValueName = IniFile.GetValueName(KeyNum, i );
AString ValueName = IniFile.GetValueName(KeyNum, i );
if( ValueName.compare("Plugin") == 0 ) // It's a Lua plugin
{
std::string PluginFile = IniFile.GetValue(KeyNum, i );
AString PluginFile = IniFile.GetValue(KeyNum, i );
if( !PluginFile.empty() )
{
// allow for comma separated plugin list
// degrades and works fine for the plugin
// per line
AStringVector split = StringSplit( PluginFile, "," );
for (unsigned int j = 0; j < split.size(); j++) {
cPlugin_Lua* Plugin = new cPlugin_Lua( (split[j] + std::string(".lua") ).c_str() );
for (unsigned int j = 0; j < split.size(); j++)
{
cPlugin_Lua* Plugin = new cPlugin_Lua( (split[j] + AString(".lua") ).c_str() );
if( !AddLuaPlugin( Plugin ) )
{
delete Plugin;
@ -105,7 +131,7 @@ void cPluginManager::ReloadPluginsNow()
}
else if( ValueName.compare("NewPlugin") == 0 ) // New plugin style
{
std::string PluginFile = IniFile.GetValue(KeyNum, i );
AString PluginFile = IniFile.GetValue(KeyNum, i );
if( !PluginFile.empty() )
{
cPlugin_NewLua* Plugin = new cPlugin_NewLua( PluginFile.c_str() );
@ -115,32 +141,34 @@ void cPluginManager::ReloadPluginsNow()
}
}
}
#if USE_SQUIRREL
else if( ValueName.compare("Squirrel") == 0 ) // Squirrel plugin
{
std::string PluginFile = IniFile.GetValue(KeyNum, i );
AString PluginFile = IniFile.GetValue(KeyNum, i );
if( !PluginFile.empty() )
{
LOGINFO("Loading Squirrel plugin: %s", PluginFile.c_str() );
try
{
SquirrelObject SquirrelScript = SquirrelVM::CompileScript( (std::string("Plugins/") + PluginFile + ".nut").c_str() );
SquirrelObject SquirrelScript = SquirrelVM::CompileScript( (AString("Plugins/") + PluginFile + ".nut").c_str() );
try
{
SquirrelVM::RunScript( SquirrelScript );
}
catch (SquirrelError & e)
{
LOGERROR("Error: %s, %s\n", e.desc, "SquirrelVM::RunScript");
LOGERROR("SquirrelScript error: %s, %s\n", e.desc, "SquirrelVM::RunScript");
}
}
catch (SquirrelError & e)
{
LOGERROR("Error: %s, %s\n", e.desc, "SquirrelVM::CompileScript");
LOGERROR("SquirrelScript error: %s, %s\n", e.desc, "SquirrelVM::CompileScript");
}
}
}
#endif
#endif // USE_SQUIRREL
}
}
@ -153,14 +181,10 @@ void cPluginManager::ReloadPluginsNow()
LOG("Loaded %i plugin(s)", GetNumPlugins() );
}
}
else
{
LOG("WARNING: Can't find settings.ini, so can't load any plugins.");
}
LOG("--Done loading plugins--");
}
void cPluginManager::Tick(float a_Dt)
{
@ -169,7 +193,6 @@ void cPluginManager::Tick(float a_Dt)
ReloadPluginsNow();
}
HookMap::iterator Plugins = m_pState->Hooks.find( E_PLUGIN_TICK );
if( Plugins != m_pState->Hooks.end() )
{
@ -180,6 +203,10 @@ void cPluginManager::Tick(float a_Dt)
}
}
bool cPluginManager::CallHook( PluginHook a_Hook, unsigned int a_NumArgs, ... )
{
HookMap::iterator Plugins = m_pState->Hooks.find( a_Hook );
@ -209,8 +236,11 @@ bool cPluginManager::CallHook( PluginHook a_Hook, unsigned int a_NumArgs, ... )
return false;
}
if( Plugins != m_pState->Hooks.end() )
if( Plugins == m_pState->Hooks.end() )
{
return false;
}
switch( a_Hook )
{
case E_PLUGIN_COLLECT_ITEM:
@ -226,8 +256,9 @@ bool cPluginManager::CallHook( PluginHook a_Hook, unsigned int a_NumArgs, ... )
if( (*itr)->OnCollectItem( Pickup, Player ) )
return true;
}
}
break;
}
case E_PLUGIN_BLOCK_DIG:
{
if( a_NumArgs != 2 ) break;
@ -242,8 +273,9 @@ bool cPluginManager::CallHook( PluginHook a_Hook, unsigned int a_NumArgs, ... )
if( (*itr)->OnBlockDig( Packet, Player, Item ) )
return true;
}
}
break;
}
case E_PLUGIN_BLOCK_PLACE:
{
if( a_NumArgs != 2 ) break;
@ -257,8 +289,9 @@ bool cPluginManager::CallHook( PluginHook a_Hook, unsigned int a_NumArgs, ... )
if( (*itr)->OnBlockPlace( Packet, Player ) )
return true;
}
}
break;
}
case E_PLUGIN_DISCONNECT:
{
if( a_NumArgs != 2 ) break;
@ -272,8 +305,9 @@ bool cPluginManager::CallHook( PluginHook a_Hook, unsigned int a_NumArgs, ... )
if( (*itr)->OnDisconnect( Reason, Player ) )
return true;
}
}
break;
}
case E_PLUGIN_LOGIN:
{
if( a_NumArgs != 1 ) break;
@ -286,8 +320,9 @@ bool cPluginManager::CallHook( PluginHook a_Hook, unsigned int a_NumArgs, ... )
if( (*itr)->OnLogin( Packet ) )
return true;
}
}
break;
}
case E_PLUGIN_PLAYER_JOIN:
{
if( a_NumArgs != 1 ) break;
@ -300,8 +335,9 @@ bool cPluginManager::CallHook( PluginHook a_Hook, unsigned int a_NumArgs, ... )
if( (*itr)->OnPlayerJoin( Player ) )
return true;
}
}
break;
}
case E_PLUGIN_PLAYER_MOVE:
{
if( a_NumArgs != 1 ) break;
@ -313,8 +349,9 @@ bool cPluginManager::CallHook( PluginHook a_Hook, unsigned int a_NumArgs, ... )
{
(*itr)->OnPlayerMove( Player );
}
}
break;
}
case E_PLUGIN_TAKE_DAMAGE:
{
if( a_NumArgs != 2 ) break;
@ -327,8 +364,9 @@ bool cPluginManager::CallHook( PluginHook a_Hook, unsigned int a_NumArgs, ... )
{
(*itr)->OnTakeDamage( Pawn, TDI );
}
}
break;
}
case E_PLUGIN_KILLED:
{
if( a_NumArgs != 2 ) break;
@ -342,21 +380,27 @@ bool cPluginManager::CallHook( PluginHook a_Hook, unsigned int a_NumArgs, ... )
if( (*itr)->OnKilled( Killed, Killer ) )
return true;
}
}
break;
}
default:
LOG("WARNING: Calling Unknown hook: %i", a_Hook );
{
LOGWARNING("cPluginManager: Calling Unknown hook: %i", a_Hook );
break;
}
}
} // switch (a_Hook)
return false;
}
cPlugin* cPluginManager::GetPlugin( const char* a_Plugin )
{
for( PluginList::iterator itr = m_pState->Plugins.begin(); itr != m_pState->Plugins.end(); ++itr )
{
if( std::string( (*itr)->GetName() ).compare( a_Plugin ) == 0 )
if (strcmp((*itr)->GetName(), a_Plugin) == 0 )
{
return *itr;
}
@ -364,11 +408,19 @@ cPlugin* cPluginManager::GetPlugin( const char* a_Plugin )
return 0;
}
const cPluginManager::PluginList & cPluginManager::GetAllPlugins()
{
return m_pState->Plugins;
}
void cPluginManager::UnloadPluginsNow()
{
m_pState->Hooks.clear();
@ -393,6 +445,10 @@ void cPluginManager::UnloadPluginsNow()
//SquirrelVM::Shutdown(); // This breaks shit
}
void cPluginManager::RemoveHooks( cPlugin* a_Plugin )
{
m_pState->Hooks[ E_PLUGIN_TICK].remove ( a_Plugin );
@ -410,6 +466,10 @@ void cPluginManager::RemoveHooks( cPlugin* a_Plugin )
m_pState->Hooks[ E_PLUGIN_KILLED].remove ( a_Plugin );
}
void cPluginManager::RemovePlugin( cPlugin* a_Plugin, bool a_bDelete /* = false */ )
{
if( a_bDelete )
@ -419,8 +479,10 @@ void cPluginManager::RemovePlugin( cPlugin* a_Plugin, bool a_bDelete /* = false
RemoveHooks( a_Plugin );
a_Plugin->OnDisable();
if( a_Plugin->GetLanguage() != cPlugin::E_SQUIRREL ) // Squirrel needs to clean it up himself!
{
delete a_Plugin;
}
}
else
{
for( LuaPluginList::iterator itr = m_pState->LuaPlugins.begin(); itr != m_pState->LuaPlugins.end(); ++itr )
@ -430,6 +492,10 @@ void cPluginManager::RemovePlugin( cPlugin* a_Plugin, bool a_bDelete /* = false
}
}
bool cPluginManager::AddPlugin( cPlugin* a_Plugin )
{
if( a_Plugin->Initialize() )
@ -443,6 +509,10 @@ bool cPluginManager::AddPlugin( cPlugin* a_Plugin )
return false;
}
bool cPluginManager::AddPlugin( lua_State* a_LuaState, cPlugin* a_Plugin )
{
a_Plugin->SetLanguage( cPlugin::E_LUA );
@ -457,6 +527,10 @@ bool cPluginManager::AddPlugin( lua_State* a_LuaState, cPlugin* a_Plugin )
return false;
}
bool cPluginManager::AddLuaPlugin( cPlugin_Lua* a_Plugin )
{
m_pState->LuaPlugins.push_back( a_Plugin ); // It HAS to be in here before calling Initialize, so it can be found by AddPlugin()
@ -469,6 +543,10 @@ bool cPluginManager::AddLuaPlugin( cPlugin_Lua* a_Plugin )
return false;
}
void cPluginManager::RemoveLuaPlugin( std::string a_FileName )
{
for( LuaPluginList::iterator itr = m_pState->LuaPlugins.begin(); itr != m_pState->LuaPlugins.end(); ++itr )
@ -483,6 +561,10 @@ void cPluginManager::RemoveLuaPlugin( std::string a_FileName )
}
}
cPlugin_Lua* cPluginManager::GetLuaPlugin( lua_State* a_State )
{
for( LuaPluginList::iterator itr = m_pState->LuaPlugins.begin(); itr != m_pState->LuaPlugins.end(); ++itr )
@ -495,6 +577,10 @@ cPlugin_Lua* cPluginManager::GetLuaPlugin( lua_State* a_State )
return 0;
}
void cPluginManager::AddHook( cPlugin* a_Plugin, PluginHook a_Hook )
{
if( !a_Plugin )
@ -507,7 +593,15 @@ void cPluginManager::AddHook( cPlugin* a_Plugin, PluginHook a_Hook )
Plugins.push_back( a_Plugin );
}
unsigned int cPluginManager::GetNumPlugins()
{
return m_pState->Plugins.size();
}