Skip to content

sunset the old Modules implementation #5819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ab9rf merged 3 commits into from
May 24, 2026
Merged

sunset the old Modules implementation #5819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a527e8c
sunset the old Modules implementation
ab9rf May 24, 2026
2c16493
missed one
ab9rf May 24, 2026
5a8c9f3
Update Core.cpp
ab9rf May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions library/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,8 @@ set(MAIN_HEADERS
include/MemAccess.h
include/Memory.h
include/MiscUtils.h
include/Module.h
include/MemAccess.h
include/MemoryPatcher.h
include/ModuleFactory.h
include/PluginLua.h
include/PluginManager.h
include/PluginStatics.h
Expand Down
22 changes: 0 additions & 22 deletions library/Core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ distribution.
#include "MemoryPatcher.h"
#include "MiscUtils.h"
#include "MiscUtils.h"
#include "Module.h"
#include "ModuleFactory.h"
#include "PluginManager.h"
#include "RemoteServer.h"
#include "RemoteTools.h"
Expand Down Expand Up @@ -1047,7 +1045,6 @@ Core::Core() :
plug_mgr = nullptr;
errorstate = false;
vinfo = 0;
memset(&(s_mods), 0, sizeof(s_mods));

// set up hotkey capture
suppress_duplicate_keyboard_events = true;
Expand Down Expand Up @@ -1949,11 +1946,9 @@ int Core::Shutdown ( void )
plug_mgr = nullptr;
}
// invalidate all modules
allModules.clear();
Textures::cleanup();
DFSDL::cleanup();
DFSteam::cleanup(getConsole());
memset(&(s_mods), 0, sizeof(s_mods));
d.reset();
return -1;
}
Expand Down Expand Up @@ -2183,20 +2178,3 @@ std::string Core::GetAliasCommand(const std::string &name, bool ignore_params)
return aliases[name][0];
return join_strings(" ", aliases[name]);
}

/*******************************************************************************
M O D U L E S
*******************************************************************************/

#define MODULE_GETTER(TYPE) \
TYPE * Core::get##TYPE() \
{ \
if(errorstate) return nullptr;\
if(!s_mods.p##TYPE)\
{\
std::unique_ptr<Module> mod = create##TYPE();\
s_mods.p##TYPE = (TYPE *) mod.get();\
allModules.push_back(std::move(mod));\
}\
return s_mods.p##TYPE;\
}
5 changes: 0 additions & 5 deletions library/include/Core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,6 @@ namespace DFHack

// FIXME: shouldn't be kept around like this
std::unique_ptr<DFHack::VersionInfoFactory> vif;
// Module storage
struct
{
} s_mods;
std::vector<std::unique_ptr<Module>> allModules;
DFHack::PluginManager *plug_mgr;

// Hotkey Manager
Expand Down
59 changes: 0 additions & 59 deletions library/include/Module.h
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions library/include/ModuleFactory.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion library/include/modules/Materials.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ distribution.
* @ingroup grp_modules
*/
#include "Export.h"
#include "Module.h"
#include "DataDefs.h"

#include "df/craft_material_class.h"
Expand Down
1 change: 0 additions & 1 deletion library/modules/Buildings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ distribution.
#include "MemAccess.h"
#include "Types.h"
#include "Error.h"
#include "ModuleFactory.h"
#include "Core.h"
#include "TileTypes.h"
#include "MiscUtils.h"
Expand Down
1 change: 0 additions & 1 deletion library/modules/Gui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ distribution.
#include "VersionInfo.h"
#include "Types.h"
#include "Error.h"
#include "ModuleFactory.h"
#include "Core.h"
#include "Debug.h"
#include "PluginManager.h"
Expand Down
1 change: 0 additions & 1 deletion library/modules/Items.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ distribution.
#include "Internal.h"
#include "MemAccess.h"
#include "MiscUtils.h"
#include "ModuleFactory.h"
#include "Types.h"
#include "VersionInfo.h"

Expand Down
1 change: 0 additions & 1 deletion library/modules/Kitchen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ using namespace std;
#include "Types.h"
#include "Error.h"
#include "modules/Kitchen.h"
#include "ModuleFactory.h"
#include "Core.h"
using namespace DFHack;

Expand Down
1 change: 0 additions & 1 deletion library/modules/MapCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ distribution.
#include "Error.h"
#include "MemAccess.h"
#include "MiscUtils.h"
#include "ModuleFactory.h"
#include "VersionInfo.h"

#include "modules/Buildings.h"
Expand Down
1 change: 0 additions & 1 deletion library/modules/Maps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ distribution.
#include "Error.h"
#include "MemAccess.h"
#include "MiscUtils.h"
#include "ModuleFactory.h"
#include "VersionInfo.h"

#include "modules/Buildings.h"
Expand Down
1 change: 0 additions & 1 deletion library/modules/Materials.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ distribution.
#include "VersionInfo.h"
#include "MemAccess.h"
#include "Error.h"
#include "ModuleFactory.h"
#include "Core.h"
#include "MiscUtils.h"

Expand Down
1 change: 0 additions & 1 deletion library/modules/Random.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ using namespace std;
#include "VersionInfo.h"
#include "MemAccess.h"
#include "Types.h"
#include "ModuleFactory.h"
#include "Core.h"
#include "Error.h"
#include "VTableInterpose.h"
Expand Down
1 change: 0 additions & 1 deletion library/modules/Screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ distribution.
#include "VersionInfo.h"
#include "Types.h"
#include "Error.h"
#include "ModuleFactory.h"
#include "Core.h"
#include "PluginManager.h"
#include "LuaTools.h"
Expand Down
1 change: 0 additions & 1 deletion library/modules/Translation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ distribution.
#include "VersionInfo.h"
#include "MemAccess.h"
#include "Types.h"
#include "ModuleFactory.h"
#include "Core.h"
#include "Error.h"
#include "DataDefs.h"
Expand Down
1 change: 0 additions & 1 deletion library/modules/Units.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ distribution.
#include "Internal.h"
#include "MemAccess.h"
#include "MiscUtils.h"
#include "ModuleFactory.h"
#include "Types.h"
#include "VersionInfo.h"

Expand Down
Loading