minetest-mods/unified_inventory
1
0
Fork 2
mirror of https://github.com/minetest-mods/unified_inventory.git synced 2024-12-29 20:20:23 +01:00
Code Issues Releases Wiki Activity

Merge pull request #91 from ForbiddenJ/master

Browse Source 
Make trash configurable but preserve default functionality
This commit is contained in:
Vanessa Ezekowitz 2017-03-01 18:20:15 -05:00 committed by GitHub
commit cff06ab167
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bags.lua
View File

@ -51,8 +51,11 @@ for i = 1, 4 do
elseif slots == 24 then elseif slots == 24 then
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]" formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]"
end end
local player_name = player:get_player_name() -- For if statement.
if unified_inventory.trash_enabled or unified_inventory.is_creative(player_name) or minetest.get_player_privs(player_name).give then
formspec = (formspec.."background[6.06,0;0.92,0.92;ui_bags_trash.png]" formspec = (formspec.."background[6.06,0;0.92,0.92;ui_bags_trash.png]"
.."list[detached:trash;main;6,0.1;1,1;]") .."list[detached:trash;main;6,0.1;1,1;]")
end
return {formspec=formspec} return {formspec=formspec}
end, end,
}) })

3
init.lua
View File

@ -46,6 +46,9 @@ unified_inventory = {
-- "Lite" mode -- "Lite" mode
lite_mode = minetest.setting_getbool("unified_inventory_lite"), lite_mode = minetest.setting_getbool("unified_inventory_lite"),
-- Trash enabled
trash_enabled = (minetest.setting_getbool("unified_inventory_trash") ~= false),
pagecols = 8, pagecols = 8,
pagerows = 10, pagerows = 10,
page_y = 0, page_y = 0,

3
register.lua
View File

@ -175,8 +175,11 @@ unified_inventory.register_page("craft", {
formspec = formspec.."listcolors[#00000000;#00000000]" formspec = formspec.."listcolors[#00000000;#00000000]"
formspec = formspec.."list[current_player;craftpreview;6,"..formspecy..";1,1;]" formspec = formspec.."list[current_player;craftpreview;6,"..formspecy..";1,1;]"
formspec = formspec.."list[current_player;craft;2,"..formspecy..";3,3;]" formspec = formspec.."list[current_player;craft;2,"..formspecy..";3,3;]"
if unified_inventory.trash_enabled or unified_inventory.is_creative(player_name) or minetest.get_player_privs(player_name).give then
formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. F("Trash:") .. "]" formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. F("Trash:") .. "]"
formspec = formspec.."background[7,"..(formspecy + 2)..";1,1;ui_single_slot.png]"
formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]" formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]"
end
formspec = formspec.."listring[current_name;craft]" formspec = formspec.."listring[current_name;craft]"
formspec = formspec.."listring[current_player;main]" formspec = formspec.."listring[current_player;main]"
if unified_inventory.is_creative(player_name) then if unified_inventory.is_creative(player_name) then

4
settingtypes.txt
View File

@ -5,3 +5,7 @@ unified_inventory_lite (Lite mode) bool false
#If enabled, bags will be made available which can be used to extend #If enabled, bags will be made available which can be used to extend
#inventory storage size. #inventory storage size.
unified_inventory_bags (Enable bags) bool true unified_inventory_bags (Enable bags) bool true
#If enabled, the trash slot can be used by those without both creative
#and the give privilege.
unified_inventory_trash (Enable trash) bool true

BIN
textures/ui_crafting_form.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB