-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Server: delegate mod management & config to ServerModConfiguration (#…
…7131) * Server: delegate mod management & config to ServerModConfiguration (rename it to ServerModManager) * Use c++11 range based loops * Add unittests + experimental/default mod as a test case to permit testing mod loading in future tests
- Loading branch information
Showing
13 changed files
with
359 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
set(server_SRCS | ||
${CMAKE_CURRENT_SOURCE_DIR}/mods.cpp | ||
PARENT_SCOPE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
/* | ||
Minetest | ||
Copyright (C) 2018 nerzhul, Loic Blot <loic.blot@unix-experience.fr> | ||
This program is free software; you can redistribute it and/or modify | ||
it under the terms of the GNU Lesser General Public License as published by | ||
the Free Software Foundation; either version 2.1 of the License, or | ||
(at your option) any later version. | ||
This program is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU Lesser General Public License for more details. | ||
You should have received a copy of the GNU Lesser General Public License along | ||
with this program; if not, write to the Free Software Foundation, Inc., | ||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
*/ | ||
|
||
#include "mods.h" | ||
#include "filesys.h" | ||
#include "log.h" | ||
#include "scripting_server.h" | ||
#include "subgame.h" | ||
|
||
/** | ||
* Manage server mods | ||
* | ||
* All new calls to this class must be tested in test_servermodmanager.cpp | ||
*/ | ||
|
||
/** | ||
* Creates a ServerModManager which targets worldpath | ||
* @param worldpath | ||
*/ | ||
ServerModManager::ServerModManager(const std::string &worldpath) : | ||
ModConfiguration(worldpath) | ||
{ | ||
SubgameSpec gamespec = findWorldSubgame(worldpath); | ||
|
||
// Add all game mods and all world mods | ||
addModsInPath(gamespec.gamemods_path); | ||
addModsInPath(worldpath + DIR_DELIM + "worldmods"); | ||
|
||
// Load normal mods | ||
std::string worldmt = worldpath + DIR_DELIM + "world.mt"; | ||
addModsFromConfig(worldmt, gamespec.addon_mods_paths); | ||
} | ||
|
||
// This function cannot be currenctly easily tested but it should be ASAP | ||
void ServerModManager::loadMods(ServerScripting *script) | ||
{ | ||
// Print mods | ||
infostream << "Server: Loading mods: "; | ||
for (const ModSpec &mod : m_sorted_mods) { | ||
infostream << mod.name << " "; | ||
} | ||
infostream << std::endl; | ||
// Load and run "mod" scripts | ||
for (const ModSpec &mod : m_sorted_mods) { | ||
if (!string_allowed(mod.name, MODNAME_ALLOWED_CHARS)) { | ||
throw ModError("Error loading mod \"" + mod.name + | ||
"\": Mod name does not follow naming " | ||
"conventions: " | ||
"Only characters [a-z0-9_] are allowed."); | ||
} | ||
std::string script_path = mod.path + DIR_DELIM + "init.lua"; | ||
infostream << " [" << padStringRight(mod.name, 12) << "] [\"" | ||
<< script_path << "\"]" << std::endl; | ||
script->loadMod(script_path, mod.name); | ||
} | ||
} | ||
|
||
const ModSpec *ServerModManager::getModSpec(const std::string &modname) const | ||
{ | ||
std::vector<ModSpec>::const_iterator it; | ||
for (it = m_sorted_mods.begin(); it != m_sorted_mods.end(); ++it) { | ||
const ModSpec &mod = *it; | ||
if (mod.name == modname) | ||
return &mod; | ||
} | ||
return NULL; | ||
} | ||
|
||
void ServerModManager::getModNames(std::vector<std::string> &modlist) const | ||
{ | ||
for (const ModSpec &spec : m_sorted_mods) | ||
modlist.push_back(spec.name); | ||
} | ||
|
||
void ServerModManager::getModsMediaPaths(std::vector<std::string> &paths) const | ||
{ | ||
for (const ModSpec &spec : m_sorted_mods) { | ||
paths.push_back(spec.path + DIR_DELIM + "textures"); | ||
paths.push_back(spec.path + DIR_DELIM + "sounds"); | ||
paths.push_back(spec.path + DIR_DELIM + "media"); | ||
paths.push_back(spec.path + DIR_DELIM + "models"); | ||
paths.push_back(spec.path + DIR_DELIM + "locale"); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
Minetest | ||
Copyright (C) 2018 nerzhul, Loic Blot <loic.blot@unix-experience.fr> | ||
This program is free software; you can redistribute it and/or modify | ||
it under the terms of the GNU Lesser General Public License as published by | ||
the Free Software Foundation; either version 2.1 of the License, or | ||
(at your option) any later version. | ||
This program is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU Lesser General Public License for more details. | ||
You should have received a copy of the GNU Lesser General Public License along | ||
with this program; if not, write to the Free Software Foundation, Inc., | ||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#include "../mods.h" | ||
|
||
class ServerScripting; | ||
|
||
/** | ||
* Manage server mods | ||
* | ||
* All new calls to this class must be tested in test_servermodmanager.cpp | ||
*/ | ||
class ServerModManager : public ModConfiguration | ||
{ | ||
public: | ||
/** | ||
* Creates a ServerModManager which targets worldpath | ||
* @param worldpath | ||
*/ | ||
ServerModManager(const std::string &worldpath); | ||
void loadMods(ServerScripting *script); | ||
const ModSpec *getModSpec(const std::string &modname) const; | ||
void getModNames(std::vector<std::string> &modlist) const; | ||
void getModsMediaPaths(std::vector<std::string> &paths) const; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,7 @@ set (UNITTEST_SRCS | |
${CMAKE_CURRENT_SOURCE_DIR}/test_serialization.cpp | ||
${CMAKE_CURRENT_SOURCE_DIR}/test_settings.cpp | ||
${CMAKE_CURRENT_SOURCE_DIR}/test_socket.cpp | ||
${CMAKE_CURRENT_SOURCE_DIR}/test_servermodmanager.cpp | ||
${CMAKE_CURRENT_SOURCE_DIR}/test_threading.cpp | ||
${CMAKE_CURRENT_SOURCE_DIR}/test_utilities.cpp | ||
${CMAKE_CURRENT_SOURCE_DIR}/test_voxelarea.cpp | ||
|
@@ -33,3 +34,11 @@ set (UNITTEST_CLIENT_SRCS | |
${CMAKE_CURRENT_SOURCE_DIR}/test_gameui.cpp | ||
${CMAKE_CURRENT_SOURCE_DIR}/test_keycode.cpp | ||
PARENT_SCOPE) | ||
|
||
set (TEST_WORLDDIR ${CMAKE_CURRENT_SOURCE_DIR}/test_world) | ||
set (TEST_SUBGAME_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../games/minimal) | ||
|
||
configure_file( | ||
"${CMAKE_CURRENT_SOURCE_DIR}/test_config.h.in" | ||
"${PROJECT_BINARY_DIR}/test_config.h" | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
nerzhul
Author
Contributor
|
||
) |
Oops, something went wrong.
Should the resulting 'src/test_config.h' file not be added to .gitignore ?