From 2e6082ccdbd121cd5fc0f82a931ac01ac00dcb76 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Tue, 26 Sep 2017 11:24:44 -0400
Subject: rolled currency mod back to previous version

---
 currency/safe.lua | 61 ++++++++++++++++++-------------------------------------
 1 file changed, 20 insertions(+), 41 deletions(-)

(limited to 'currency')

diff --git a/currency/safe.lua b/currency/safe.lua
index ed26119..1c53184 100644
--- a/currency/safe.lua
+++ b/currency/safe.lua
@@ -2,40 +2,15 @@
 local MP = minetest.get_modpath(minetest.get_current_modname())
 local S, NS = dofile(MP.."/intllib.lua")
 
-function default.get_safe_formspec(pos, page)
+function default.get_safe_formspec(pos)
 	local spos = pos.x .. "," .. pos.y .. "," ..pos.z
-	local ipos = 50*page
 	local formspec =
-		"size[8,11]"..
-		default.gui_bg..
-		default.gui_bg_img..
-		default.gui_slots..
-		"button[1,-0.1;2,1;page1;Page 1]"..
-		"button[5,-0.1;2,1;page2;Page 2]"..
-		"list[nodemeta:".. spos .. ";main;0,0.9;8,6;"..ipos.."]"..
-		"list[current_player;main;0,7.2;8,4;]"..
-		"listring[nodemeta:".. spos .. ";main]"..
-		"listring[current_player;main]"
+		"size[8,9]"..
+		"list[nodemeta:".. spos .. ";main;1,1;6,2;]"..
+		"list[current_player;main;0,5;8,4;]"
 	return formspec
 end
 
-local function show_safe_form(clicker, pos, page)
-	minetest.show_formspec(
-		clicker:get_player_name(),
-		"currency:safe",
-		default.get_safe_formspec(pos, page)
-	)
-	minetest.register_on_receive_fields(function(player, form, pressed)
-		print("[SAFE] page button pressed: "..dump(pressed))
-		if form=="currency:safe" then
-			if pressed.page1 then show_safe_form(clicker, pos, 0) end
-			if pressed.page2 then show_safe_form(clicker, pos, 1) end
-		end
-	end)
-end
-
-
-
 local function has_safe_privilege(meta, player)
 	local name = ""
 	if player then
@@ -56,19 +31,13 @@ minetest.register_node("currency:safe", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	tiles = {"safe_side.png",
-			"safe_side.png",
+	        "safe_side.png",
 			"safe_side.png",
 			"safe_side.png",
 			"safe_side.png",
 			"safe_front.png",},
 	is_ground_content = false,
 	groups = {cracky=1},
-	on_rightclick = function(pos, node, clicker)
-		local meta = minetest.get_meta(pos)
-		if has_safe_privilege(meta, clicker) then
-			show_safe_form(clicker, pos, 0)
-		end
-	end,
 	after_place_node = function(pos, placer)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("owner", placer:get_player_name() or "")
@@ -79,7 +48,7 @@ minetest.register_node("currency:safe", {
 		meta:set_string("infotext", "Safe")
 		meta:set_string("owner", "")
 		local inv = meta:get_inventory()
-		inv:set_size("main", 12*8)
+		inv:set_size("main", 6*2)
 	end,
 	can_dig = function(pos,player)
 		local meta = minetest.get_meta(pos);
@@ -95,7 +64,7 @@ minetest.register_node("currency:safe", {
 		end
 		return count
 	end,
-	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+    allow_metadata_inventory_put = function(pos, listname, index, stack, player)
 		local meta = minetest.get_meta(pos)
 		if not has_safe_privilege(meta, player) then
 			minetest.log("action", S("@1 tried to access a safe belonging to @2 at @3",
@@ -104,7 +73,7 @@ minetest.register_node("currency:safe", {
 		end
 		return stack:get_count()
 	end,
-	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+    allow_metadata_inventory_take = function(pos, listname, index, stack, player)
 		local meta = minetest.get_meta(pos)
 		if not has_safe_privilege(meta, player) then
 			minetest.log("action", S("@1 tried to access a safe belonging to @2 at @3",
@@ -116,10 +85,20 @@ minetest.register_node("currency:safe", {
 	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 		minetest.log("action", S("@1 moves stuff in safe at @2", player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
-	on_metadata_inventory_put = function(pos, listname, index, stack, player)
+    on_metadata_inventory_put = function(pos, listname, index, stack, player)
 		minetest.log("action", S("@1 moves stuff to safe at @2", player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
-	on_metadata_inventory_take = function(pos, listname, index, stack, player)
+    on_metadata_inventory_take = function(pos, listname, index, stack, player)
 		minetest.log("action", S("@1 takes stuff from safe at @2", player:get_player_name(), minetest.pos_to_string(pos)))
 	end,
+	on_rightclick = function(pos, node, clicker)
+		local meta = minetest.get_meta(pos)
+		if has_safe_privilege(meta, clicker) then
+			minetest.show_formspec(
+				clicker:get_player_name(),
+				"currency:safe",
+				default.get_safe_formspec(pos)
+			)
+		end
+	end,
 })
-- 
cgit v1.2.3