From 11f20da7440f18d1bac888dc4110d414f9faa6ec Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Tue, 11 Apr 2017 10:41:26 +0200
Subject: [PATCH] allow per-chest stack splitting (default off)
---
technic_chests/register.lua | 37 ++++++++++++++++++++++++++++++++-----
technic_chests/common.lua | 7 ++++---
2 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/technic_chests/common.lua b/technic_chests/common.lua
index 1241c5e..9a5bc7a 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,8 +12,10 @@
can_insert = function(pos, node, stack, direction)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
- local onestack = stack:peek_item(1)
- return inv:room_for_item("main", onestack)
+ if meta:get_int("splitstacks") == 1 then
+ stack = stack:peek_item(1)
+ end
+ return inv:room_for_item("main",stack)
end,
input_inventory = "main",
connect_sides = {left=1, right=1, front=1, back=1, top=1, bottom=1},
diff --git a/technic_chests/register.lua b/technic_chests/register.lua
index 6a5b8db..8315482 100644
--- a/technic_chests/register.lua
+++ b/technic_chests/register.lua
@@ -1,9 +1,15 @@
local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
local pipeworks = rawget(_G, "pipeworks")
+local fs_helpers = rawget(_G, "fs_helpers")
+
+local allow_label = ""
+local shift_edit_field = 0
+
if not minetest.get_modpath("pipeworks") then
-- Pipeworks is not installed. Simulate using a dummy table...
pipeworks = {}
+ fs_helpers = {}
local pipeworks_meta = {}
setmetatable(pipeworks, pipeworks_meta)
local dummy = function()
@@ -15,6 +21,11 @@
end
pipeworks.after_place = dummy
pipeworks.after_dig = dummy
+ fs_helpers.cycling_button = function() return "" end
+else
+ fs_helpers = pipeworks.fs_helpers
+ allow_label = "label[0.9,0.36;Allow splitting incoming stacks from tubes]"
+ shift_edit_field = 3
end
local chest_mark_colors = {
@@ -72,6 +83,16 @@
local meta = minetest.get_meta(pos)
local node = minetest.get_node(pos)
local formspec = data.base_formspec
+ formspec = formspec..fs_helpers.cycling_button(
+ meta,
+ "image_button[0,0.35;1,0.6",
+ "splitstacks",
+ {
+ {text="", texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"},
+ {text="", texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"}
+ }
+ )..allow_label
+
if data.autosort then
local status = meta:get_int("autosort")
formspec = formspec.."button["..(data.hileft+2)..","..(data.height+1.1)..";3,0.8;autosort_to_"..(1-status)..";"..S("Auto-sort is %s"):format(status == 1 and S("On") or S("Off")).."]"
@@ -79,13 +100,13 @@
if data.infotext then
local formspec_infotext = minetest.formspec_escape(meta:get_string("infotext"))
if page == "main" then
- formspec = formspec.."image_button["..(data.hileft+2.1)..",0.1;0.8,0.8;"
+ formspec = formspec.."image_button["..(shift_edit_field+data.hileft+2.1)..",0.1;0.8,0.8;"
.."technic_pencil_icon.png;edit_infotext;]"
- .."label["..(data.hileft+3)..",0;"..formspec_infotext.."]"
+ .."label["..(shift_edit_field+data.hileft+3)..",0;"..formspec_infotext.."]"
elseif page == "edit_infotext" then
- formspec = formspec.."image_button["..(data.hileft+2.1)..",0.1;0.8,0.8;"
+ formspec = formspec.."image_button["..(shift_edit_field+data.hileft+2.1)..",0.1;0.8,0.8;"
.."technic_checkmark_icon.png;save_infotext;]"
- .."field["..(data.hileft+3.3)..",0.2;4.8,1;"
+ .."field["..(shift_edit_field+data.hileft+3.3)..",0.2;4.8,1;"
.."infotext_box;"..S("Edit chest description:")..";"
..formspec_infotext.."]"
end
@@ -169,11 +190,16 @@
local nn = "technic:"..lname..(data.locked and "_locked" or "").."_chest"
check_color_buttons(pos, meta, nn, fields)
end
+ if fields["fs_helpers_cycling:0:splitstacks"]
+ or fields["fs_helpers_cycling:1:splitstacks"] then
+ if not pipeworks.may_configure(pos, sender) then return end
+ fs_helpers.on_receive_fields(pos, fields)
+ end
+
meta:get_inventory():set_size("main", data.width * data.height)
set_formspec(pos, data, page)
end
end
-
function technic.chests:definition(name, data)
local lname = name:lower()
@@ -211,6 +237,7 @@
"background["..data.hileft..",1;"..data.width..","..data.height..";technic_"..lname.."_chest_inventory.png]"..
"background["..data.loleft..","..data.lotop..";8,4;technic_main_inventory.png]"..
"listring[]"
+
if data.sort then
data.base_formspec = data.base_formspec.."button["..data.hileft..","..(data.height+1.1)..";1,0.8;sort;"..S("Sort").."]"
end
--
Gitblit v1.8.0