somewhat self-cleaning temp dir

[blank.git] / src / server / ServerState.hpp

diff --git a/src/server/ServerState.hpp b/src/server/ServerState.hpp
index b62cf0904224f767730bf6cd33f5156c1d7e50f8..4ad6bd72497bfd8ffae5da30edd4c5d90ad56ed8 100644 (file)
--- a/src/server/ServerState.hpp
+++ b/src/server/ServerState.hpp
@@ -5,9 +5,7 @@
 #include "../ai/Spawner.hpp"
 #include "../app/IntervalTimer.hpp"
 #include "../app/State.hpp"
-#include "../model/ModelRegistry.hpp"
-#include "../model/ShapeRegistry.hpp"
-#include "../world/BlockTypeRegistry.hpp"
+#include "../shared/WorldResources.hpp"
 #include "../world/ChunkLoader.hpp"
 #include "../world/Generator.hpp"
 #include "../world/World.hpp"
@@ -40,15 +38,13 @@ public:
 
 private:
        HeadlessEnvironment &env;
-       ShapeRegistry shapes;
-       BlockTypeRegistry block_types;
-       ModelRegistry models;
+       WorldResources res;
        World world;
        Generator generator;
        ChunkLoader chunk_loader;
        Spawner spawner;
        Server server;
-       IntervalTimer loop_timer;
+       CoarseTimer loop_timer;
 
 };