1 files changed, 50 insertions, 9 deletions

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index e3cb9042e..04f4c335c 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "object_properties.h"
 #include "collision.h"
 #include "cpp_api/s_node.h"
+#include "lua_api/l_clientobject.h"
 #include "lua_api/l_object.h"
 #include "lua_api/l_item.h"
 #include "common/c_internal.h"
@@ -173,10 +174,12 @@ void push_item_definition_full(lua_State *L, const ItemDefinition &i)
 	}
 	push_groups(L, i.groups);
 	lua_setfield(L, -2, "groups");
+	lua_newtable(L);
 	push_soundspec(L, i.sound_place);
-	lua_setfield(L, -2, "sound_place");
+	lua_setfield(L, -2, "place");
 	push_soundspec(L, i.sound_place_failed);
-	lua_setfield(L, -2, "sound_place_failed");
+	lua_setfield(L, -2, "place_failed");
+	lua_setfield(L, -2, "sounds");
 	lua_pushstring(L, i.node_placement_prediction.c_str());
 	lua_setfield(L, -2, "node_placement_prediction");
 }
@@ -916,11 +919,11 @@ void push_content_features(lua_State *L, const ContentFeatures &c)
 	lua_setfield(L, -2, "collision_box");
 	lua_newtable(L);
 	push_soundspec(L, c.sound_footstep);
-	lua_setfield(L, -2, "sound_footstep");
+	lua_setfield(L, -2, "footstep");
 	push_soundspec(L, c.sound_dig);
-	lua_setfield(L, -2, "sound_dig");
+	lua_setfield(L, -2, "dig");
 	push_soundspec(L, c.sound_dug);
-	lua_setfield(L, -2, "sound_dug");
+	lua_setfield(L, -2, "dug");
 	lua_setfield(L, -2, "sounds");
 	lua_pushboolean(L, c.legacy_facedir_simple);
 	lua_setfield(L, -2, "legacy_facedir_simple");
@@ -1308,6 +1311,20 @@ void push_tool_capabilities(lua_State *L,
 }
 
 /******************************************************************************/
+void push_inventory(lua_State *L, Inventory *inventory)
+{
+	std::vector<const InventoryList*> lists = inventory->getLists();
+	std::vector<const InventoryList*>::iterator iter = lists.begin();
+	lua_createtable(L, 0, lists.size());
+	for (; iter != lists.end(); iter++) {
+		const char* name = (*iter)->getName().c_str();
+		lua_pushstring(L, name);
+		push_inventory_list(L, inventory, name);
+		lua_rawset(L, -3);
+	}
+}
+
+/******************************************************************************/
 void push_inventory_list(lua_State *L, Inventory *inv, const char *name)
 {
 	InventoryList *invlist = inv->getList(name);
@@ -1823,14 +1840,15 @@ void push_pointed_thing(lua_State *L, const PointedThing &pointed, bool csm,
 	} else if (pointed.type == POINTEDTHING_OBJECT) {
 		lua_pushstring(L, "object");
 		lua_setfield(L, -2, "type");
-
 		if (csm) {
-			lua_pushinteger(L, pointed.object_id);
-			lua_setfield(L, -2, "id");
+#ifndef SERVER
+			ClientObjectRef::create(L, pointed.object_id);
+#endif
 		} else {
 			push_objectRef(L, pointed.object_id);
-			lua_setfield(L, -2, "ref");
 		}
+		
+		lua_setfield(L, -2, "ref");
 	} else {
 		lua_pushstring(L, "nothing");
 		lua_setfield(L, -2, "type");
@@ -2084,3 +2102,26 @@ void push_collision_move_result(lua_State *L, const collisionMoveResult &res)
 	lua_setfield(L, -2, "collisions");
 	/**/
 }
+
+void push_physics_override(lua_State *L, float speed, float jump, float gravity, bool sneak, bool sneak_glitch, bool new_move)
+{
+	lua_createtable(L, 0, 6);
+	
+	lua_pushnumber(L, speed);
+	lua_setfield(L, -2, "speed");
+
+	lua_pushnumber(L, jump);
+	lua_setfield(L, -2, "jump");
+
+	lua_pushnumber(L, gravity);
+	lua_setfield(L, -2, "gravity");
+
+	lua_pushboolean(L, sneak);
+	lua_setfield(L, -2, "sneak");
+
+	lua_pushboolean(L, sneak_glitch);
+	lua_setfield(L, -2, "sneak_glitch");
+
+	lua_pushboolean(L, new_move);
+	lua_setfield(L, -2, "new_move");
+}