From fb4fef783b605dcdc73554019ef46d8354614ad4 Mon Sep 17 00:00:00 2001
From: Louis Royer <55180044+louisroyer@users.noreply.github.com>
Date: Sun, 26 Apr 2020 11:33:12 +0200
Subject: [PATCH] Shapeless locked chests crafts (chest + lockpad) (#530)
---
technic_chests/common.lua | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/technic_chests/common.lua b/technic_chests/common.lua
index 86c0c38..6369b7a 100644
--- a/technic_chests/common.lua
+++ b/technic_chests/common.lua
@@ -1,4 +1,3 @@
-
technic.chests.groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
tubedevice=1, tubedevice_receiver=1}
technic.chests.groups_noinv = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
@@ -13,6 +12,9 @@
can_insert = function(pos, node, stack, direction)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
+ if meta:get_int("splitstacks") == 1 then
+ stack = stack:peek_item(1)
+ end
return inv:room_for_item("main",stack)
end,
input_inventory = "main",
@@ -26,12 +28,9 @@
end
local function inv_change(pos, count, player)
- local meta = minetest.get_meta(pos)
- if not has_locked_chest_privilege(meta, player) then
- minetest.log("action", player:get_player_name()..
- " tried to access a locked chest belonging to "..
- meta:get_string("owner").." at "..
- minetest.pos_to_string(pos))
+ -- Skip check for pipeworks (fake player)
+ if minetest.is_player(player) and
+ not default.can_interact_with_node(player, pos) then
return 0
end
return count
@@ -41,31 +40,27 @@
return inv_change(pos, count, player)
end
function technic.chests.inv_put(pos, listname, index, stack, player)
- return inv_change(pos, count, player)
+ return inv_change(pos, stack:get_count(), player)
end
function technic.chests.inv_take(pos, listname, index, stack, player)
- return inv_change(pos, count, player)
+ return inv_change(pos, stack:get_count(), player)
end
function technic.chests.on_inv_move(pos, from_list, from_index, to_list, to_index, count, player)
minetest.log("action", player:get_player_name()..
- " moves stuff in locked chest at "
+ " moves stuff in chest at "
..minetest.pos_to_string(pos))
end
function technic.chests.on_inv_put(pos, listname, index, stack, player)
- minetest.log("action", player:get_player_name()..
- " puts stuff in to locked chest at "
- ..minetest.pos_to_string(pos))
+ minetest.log("action", player:get_player_name() ..
+ " moves " .. stack:get_name() ..
+ " to chest at " .. minetest.pos_to_string(pos))
end
function technic.chests.on_inv_take(pos, listname, index, stack, player)
- minetest.log("action", player:get_player_name()..
- " takes stuff from locked chest at "
- ..minetest.pos_to_string(pos))
-end
-
-function has_locked_chest_privilege(meta, player)
- return player:get_player_name() == meta:get_string("owner")
+ minetest.log("action", player:get_player_name() ..
+ " takes " .. stack:get_name() ..
+ " from chest at " .. minetest.pos_to_string(pos))
end
--
Gitblit v1.8.0