Unrestricted HTTP API for Client, Server and Main Menu

[dragonfireclient.git] / src / script / scripting_client.cpp

diff --git a/src/script/scripting_client.cpp b/src/script/scripting_client.cpp
index 239c98e57ee412e76b43661acea43dec0f9eedad..83ec3e77761d7eac0ac040665545503c59508edd 100644 (file)
--- a/src/script/scripting_client.cpp
+++ b/src/script/scripting_client.cpp
@@ -20,10 +20,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "scripting_client.h"
 #include "client/client.h"
+#include "client/game.h"
 #include "cpp_api/s_internal.h"
 #include "lua_api/l_client.h"
 #include "lua_api/l_env.h"
 #include "lua_api/l_item.h"
+#include "lua_api/l_itemstackmeta.h"
 #include "lua_api/l_minimap.h"
 #include "lua_api/l_modchannels.h"
 #include "lua_api/l_particles_local.h"
@@ -34,11 +36,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_nodemeta.h"
 #include "lua_api/l_localplayer.h"
 #include "lua_api/l_camera.h"
+#include "lua_api/l_settings.h"
+#include "lua_api/l_http.h"
 
 ClientScripting::ClientScripting(Client *client):
        ScriptApiBase(ScriptingType::Client)
 {
        setGameDef(client);
+       setGame(g_game);
 
        SCRIPTAPI_PRECHECKHEADER
 
@@ -54,9 +59,6 @@ ClientScripting::ClientScripting(Client *client):
        InitializeModApi(L, top);
        lua_pop(L, 1);
 
-       if (client->getMinimap())
-               LuaMinimap::create(L, client->getMinimap());
-
        // Push builtin initialization type
        lua_pushstring(L, "client");
        lua_setglobal(L, "INIT");
@@ -67,14 +69,19 @@ ClientScripting::ClientScripting(Client *client):
 void ClientScripting::InitializeModApi(lua_State *L, int top)
 {
        LuaItemStack::Register(L);
+       ItemStackMetaRef::Register(L);
+       LuaRaycast::Register(L);
        StorageRef::Register(L);
        LuaMinimap::Register(L);
        NodeMetaRef::RegisterClient(L);
        LuaLocalPlayer::Register(L);
        LuaCamera::Register(L);
        ModChannelRef::Register(L);
+       LuaSettings::Register(L);
 
+       ModApiItemMod::Initialize(L, top);
        ModApiUtil::InitializeClient(L, top);
+       ModApiHttp::Initialize(L, top);
        ModApiClient::Initialize(L, top);
        ModApiStorage::Initialize(L, top);
        ModApiEnvMod::InitializeClient(L, top);
@@ -91,3 +98,8 @@ void ClientScripting::on_camera_ready(Camera *camera)
 {
        LuaCamera::create(getStack(), camera);
 }
+
+void ClientScripting::on_minimap_ready(Minimap *minimap)
+{
+       LuaMinimap::create(getStack(), minimap);
+}