X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FServerState.hpp;h=b62cf0904224f767730bf6cd33f5156c1d7e50f8;hb=4e3afb4c7631591b80cb7740a9b6f46da69b7ae4;hp=e22f9b1e3c3f58a3825fa48a973f21e6f764fc58;hpb=5178dd1e226d45db7ae61e3d7d6866dc4254d9ae;p=blank.git diff --git a/src/server/ServerState.hpp b/src/server/ServerState.hpp index e22f9b1..b62cf09 100644 --- a/src/server/ServerState.hpp +++ b/src/server/ServerState.hpp @@ -5,9 +5,9 @@ #include "../ai/Spawner.hpp" #include "../app/IntervalTimer.hpp" #include "../app/State.hpp" -#include "../model/Skeletons.hpp" +#include "../model/ModelRegistry.hpp" +#include "../model/ShapeRegistry.hpp" #include "../world/BlockTypeRegistry.hpp" -#include "../world/ChunkIndex.hpp" #include "../world/ChunkLoader.hpp" #include "../world/Generator.hpp" #include "../world/World.hpp" @@ -40,12 +40,12 @@ public: private: HeadlessEnvironment &env; + ShapeRegistry shapes; BlockTypeRegistry block_types; + ModelRegistry models; World world; - ChunkIndex &spawn_index; Generator generator; ChunkLoader chunk_loader; - Skeletons skeletons; Spawner spawner; Server server; IntervalTimer loop_timer;