mirror of
https://github.com/minetest-mods/unified_inventory.git
synced 2024-12-27 19:20:27 +01:00
Bags: Code cleanup and per-bag trash slot.
* Turn page creation into a loop. * Add per-bag trash slot. * Changed i18n to allow replacements.
This commit is contained in:
Diego Martínez
parent
5b9a53bf29
commit
75a0e6a318
85
bags.lua
85
bags.lua
@ -31,80 +31,18 @@ unified_inventory.register_button("bags", {
|
||||
hide_lite=true
|
||||
})
|
||||
|
||||
|
||||
unified_inventory.register_page("bag1", {
|
||||
for i = 1, 4 do
|
||||
local bi = i
|
||||
unified_inventory.register_page("bag"..bi, {
|
||||
get_formspec = function(player)
|
||||
local stack = player:get_inventory():get_stack("bag1", 1)
|
||||
local stack = player:get_inventory():get_stack("bag"..bi, 1)
|
||||
local image = stack:get_definition().inventory_image
|
||||
local formspec = "image[7,0;1,1;"..image.."]"
|
||||
formspec = formspec.."label[0,0;"..F("Bag 1").."]"
|
||||
formspec = formspec.."listcolors[#00000000;#00000000]"
|
||||
formspec = formspec.."list[current_player;bag1contents;0,1;8,3;]"
|
||||
formspec = formspec.."listring[current_name;bag1contents]"
|
||||
formspec = formspec.."listring[current_player;main]"
|
||||
local slots = stack:get_definition().groups.bagslots
|
||||
if slots == 8 then
|
||||
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_sm_form.png]"
|
||||
elseif slots == 16 then
|
||||
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_med_form.png]"
|
||||
elseif slots == 24 then
|
||||
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]"
|
||||
end
|
||||
return {formspec=formspec}
|
||||
end,
|
||||
})
|
||||
unified_inventory.register_page("bag2", {
|
||||
get_formspec = function(player)
|
||||
local stack = player:get_inventory():get_stack("bag2", 1)
|
||||
local image = stack:get_definition().inventory_image
|
||||
local formspec = "image[7,0;1,1;"..image.."]"
|
||||
formspec = formspec.."label[0,0;"..F("Bag 2").."]"
|
||||
formspec = formspec.."listcolors[#00000000;#00000000]"
|
||||
formspec = formspec.."list[current_player;bag2contents;0,1;8,3;]"
|
||||
formspec = formspec.."listring[current_name;bag2contents]"
|
||||
formspec = formspec.."listring[current_player;main]"
|
||||
local slots = stack:get_definition().groups.bagslots
|
||||
if slots == 8 then
|
||||
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_sm_form.png]"
|
||||
elseif slots == 16 then
|
||||
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_med_form.png]"
|
||||
elseif slots == 24 then
|
||||
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]"
|
||||
end
|
||||
return {formspec=formspec}
|
||||
end,
|
||||
})
|
||||
unified_inventory.register_page("bag3", {
|
||||
get_formspec = function(player)
|
||||
local stack = player:get_inventory():get_stack("bag3", 1)
|
||||
local image = stack:get_definition().inventory_image
|
||||
local formspec = "image[7,0;1,1;"..image.."]"
|
||||
formspec = formspec.."label[0,0;"..F("Bag 3").."]"
|
||||
formspec = formspec.."listcolors[#00000000;#00000000]"
|
||||
formspec = formspec.."list[current_player;bag3contents;0,1;8,3;]"
|
||||
formspec = formspec.."listring[current_name;bag3contents]"
|
||||
formspec = formspec.."listring[current_player;main]"
|
||||
local slots = stack:get_definition().groups.bagslots
|
||||
if slots == 8 then
|
||||
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_sm_form.png]"
|
||||
elseif slots == 16 then
|
||||
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_med_form.png]"
|
||||
elseif slots == 24 then
|
||||
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]"
|
||||
end
|
||||
return {formspec=formspec}
|
||||
end,
|
||||
})
|
||||
unified_inventory.register_page("bag4", {
|
||||
get_formspec = function(player)
|
||||
local stack = player:get_inventory():get_stack("bag4", 1)
|
||||
local image = stack:get_definition().inventory_image
|
||||
local formspec = "image[7,0;1,1;"..image.."]"
|
||||
formspec = formspec.."label[0,0;"..F("Bag 4").."]"
|
||||
formspec = formspec.."listcolors[#00000000;#00000000]"
|
||||
formspec = formspec.."list[current_player;bag4contents;0,1;8,3;]"
|
||||
formspec = formspec.."listring[current_name;bag4contents]"
|
||||
formspec = formspec.."listring[current_player;main]"
|
||||
local formspec = ("image[7,0;1,1;"..image.."]"
|
||||
.."label[0,0;"..F("Bag @1", bi).."]"
|
||||
.."listcolors[#00000000;#00000000]"
|
||||
.."list[current_player;bag"..bi.."contents;0,1;8,3;]"
|
||||
.."listring[current_name;bag"..bi.."contents]"
|
||||
.."listring[current_player;main]")
|
||||
local slots = stack:get_definition().groups.bagslots
|
||||
if slots == 8 then
|
||||
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_sm_form.png]"
|
||||
@ -113,9 +51,12 @@ unified_inventory.register_button("bags", {
|
||||
elseif slots == 24 then
|
||||
formspec = formspec.."background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]"
|
||||
end
|
||||
formspec = (formspec.."background[6.06,0;0.92,0.92;ui_bags_trash.png]"
|
||||
.."list[detached:trash;main;6,0.1;1,1;]")
|
||||
return {formspec=formspec}
|
||||
end,
|
||||
})
|
||||
end
|
||||
|
||||
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||
if formname ~= "" then
|
||||
|
||||
12
init.lua
12
init.lua
@ -2,7 +2,15 @@
|
||||
|
||||
local modpath = minetest.get_modpath(minetest.get_current_modname())
|
||||
local worldpath = minetest.get_worldpath()
|
||||
local mygettext = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
|
||||
local mygettext
|
||||
if rawget(_G, "intllib") then
|
||||
mygettext = intllib.Getter()
|
||||
else
|
||||
function mygettext(s, ...)
|
||||
local t = { ... }
|
||||
return (s:gsub("@(%d+)", function(n) return t[tonumber(n)] end))
|
||||
end
|
||||
end
|
||||
|
||||
-- Data tables definitions
|
||||
unified_inventory = {
|
||||
@ -33,7 +41,7 @@ unified_inventory = {
|
||||
|
||||
-- intllib
|
||||
gettext = mygettext,
|
||||
fgettext = function(s) return minetest.formspec_escape(mygettext(s)) end,
|
||||
fgettext = function(...) return minetest.formspec_escape(mygettext(...)) end,
|
||||
|
||||
-- "Lite" mode
|
||||
lite_mode = minetest.setting_getbool("unified_inventory_lite"),
|
||||
|
||||
@ -5,10 +5,7 @@ Digging (by chance) = Graben (durch Zufall)
|
||||
|
||||
### bags.lua ###
|
||||
Bags = Taschen
|
||||
Bag 1 = Tasche 1
|
||||
Bag 2 = Tasche 2
|
||||
Bag 3 = Tasche 3
|
||||
Bag 4 = Tasche 4
|
||||
Bag @1 = Tasche @1
|
||||
Small Bag = Kleine Tasche
|
||||
Medium Bag = Mittelgroße Tasche
|
||||
Large Bag = Große Tasche
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
# Translation by Diego Martínez <kaeza>
|
||||
|
||||
### api.lua ###
|
||||
Digging (by chance) = Excavado (por azar)
|
||||
|
||||
# Template
|
||||
### bags.lua ###
|
||||
Bags = Bolsas
|
||||
Bag 1 = Bolsa 1
|
||||
Bag 2 = Bolsa 2
|
||||
Bag 3 = Bolsa 3
|
||||
Bag 4 = Bolsa 4
|
||||
Bag @1 = Bolsa @1
|
||||
Small Bag = Bolsa Pequeña
|
||||
Medium Bag = Bolsa Mediana
|
||||
Large Bag = Bolsa Grande
|
||||
|
||||
@ -3,10 +3,7 @@
|
||||
# Template
|
||||
### bags.lua ###
|
||||
Bags = Sacs
|
||||
Bag 1 = Sac 1
|
||||
Bag 2 = Sac 2
|
||||
Bag 3 = Sac 3
|
||||
Bag 4 = Sac 4
|
||||
Bag @1 = Sac @1
|
||||
Small Bag = Petit sac
|
||||
Medium Bag = Sac moyen
|
||||
Large Bag = Grand sac
|
||||
|
||||
@ -2,10 +2,7 @@
|
||||
|
||||
### bags.lua ###
|
||||
Bags = Plecaki
|
||||
Bag 1 = Plecak 1
|
||||
Bag 2 = Plecak 2
|
||||
Bag 3 = Plecak 3
|
||||
Bag 4 = Plecak 4
|
||||
Bag @1 = Plecak @1
|
||||
Small Bag = Maly plecak
|
||||
Medium Bag = Sredni plecak
|
||||
Large Bag = Duzy plecak
|
||||
|
||||
@ -3,10 +3,7 @@
|
||||
# Template
|
||||
### bags.lua ###
|
||||
Bags = Сумки
|
||||
Bag 1 = Сумка 1
|
||||
Bag 2 = Сумка 2
|
||||
Bag 3 = Сумка 3
|
||||
Bag 4 = Сумка 4
|
||||
Bag @1 = Сумка @1
|
||||
Small Bag = Малая сумка
|
||||
Medium Bag = Средняя сумка
|
||||
Large Bag = Большая сумка
|
||||
|
||||
@ -6,10 +6,7 @@ Digging (by chance) =
|
||||
# Template
|
||||
### bags.lua ###
|
||||
Bags =
|
||||
Bag 1 =
|
||||
Bag 2 =
|
||||
Bag 3 =
|
||||
Bag 4 =
|
||||
Bag @1 =
|
||||
Small Bag =
|
||||
Medium Bag =
|
||||
Large Bag =
|
||||
|
||||
@ -3,10 +3,7 @@
|
||||
# Template
|
||||
### bags.lua ###
|
||||
Bags = Çantalarım
|
||||
Bag 1 = 1. Çanta
|
||||
Bag 2 = 2. Çanta
|
||||
Bag 3 = 3. Çanta
|
||||
Bag 4 = 4. Çanta
|
||||
Bag @1 = @1. Çanta
|
||||
Small Bag = Küçük Çanta
|
||||
Medium Bag = Çanta
|
||||
Large Bag = Büyük Çanta
|
||||
|
||||
BIN
textures/ui_bags_trash.png
Normal file
BIN
textures/ui_bags_trash.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Loading…
Reference in New Issue
Block a user