X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2FInteractiveState.hpp;fp=src%2Fclient%2FInteractiveState.hpp;h=02385e2e5a5ff6904aa1031d3ebd12ed61759a0a;hb=9c5308ba4108bd842af6d9d2e893ea575a7e6ca8;hp=2bc459a330a875e9fb748a9e0a10fda43f61c020;hpb=4e3afb4c7631591b80cb7740a9b6f46da69b7ae4;p=blank.git

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index 2bc459a..02385e2 100644
--- 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;