lil cleanup of common and unused stuff

[blank.git] / src / client / InteractiveState.hpp

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index 2bc459a330a875e9fb748a9e0a10fda43f61c020..02385e2e5a5ff6904aa1031d3ebd12ed61759a0a 100644 (file)
--- a/src/client/InteractiveState.hpp
+++ b/src/client/InteractiveState.hpp
@@ -9,13 +9,11 @@
 #include "../app/IntervalTimer.hpp"
 #include "../graphics/SkyBox.hpp"
 #include "../io/WorldSave.hpp"
-#include "../model/ModelRegistry.hpp"
-#include "../model/ShapeRegistry.hpp"
 #include "../net/Packet.hpp"
+#include "../shared/WorldResources.hpp"
 #include "../ui/HUD.hpp"
 #include "../ui/InteractiveManipulator.hpp"
 #include "../ui/Interface.hpp"
-#include "../world/BlockTypeRegistry.hpp"
 #include "../world/ChunkRenderer.hpp"
 #include "../world/EntityState.hpp"
 #include "../world/Player.hpp"
@@ -40,7 +38,6 @@ public:
        World &GetWorld() noexcept { return world; }
        Player &GetPlayer() noexcept { return player; }
        ChunkReceiver &GetChunkReceiver() noexcept { return chunk_receiver; }
-       ModelRegistry &GetModels() noexcept { return models; }
 
        void OnEnter() override;
 
@@ -69,9 +66,7 @@ private:
 
 private:
        MasterState &master;
-       ShapeRegistry shapes;
-       BlockTypeRegistry block_types;
-       ModelRegistry models;
+       WorldResources res;
        WorldSave save;
        World world;
        Player &player;