SOS-Games
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

fix all chest formspecs

This commit is contained in:
AFCMS 2021-09-18 09:53:45 +02:00
parent cf01c0630c
commit 558df5e4bd
Signed by untrusted user: AFCMS
GPG Key ID: 8720389A25B652E3
4 changed files with 85 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/HUD/mcl_formspec/FORMSPEC_GUIDE.md
View File

@ -14,7 +14,7 @@ Just use this code to apply it to your formspec:
The typical width of an inventory formspec is `0.375 + 9 + ((9-1) * 0.25) + 0.375 = 11.75` The typical width of an inventory formspec is `0.375 + 9 + ((9-1) * 0.25) + 0.375 = 11.75`
Margins is 0.375 Margins is 0.375
Space between 1st inventory line and the rest of inventory is 0.4 Space between 1st inventory line and the rest of inventory is 0.45
Labels should have 0.375 space above if there is no other stuff above and 0.45 between content Labels should have 0.375 space above if there is no other stuff above and 0.45 between content
+ 0.375 under + 0.375 under

4
mods/HUD/mcl_formspec/init.lua
View File

@ -7,6 +7,10 @@ mcl_formspec = {}
mcl_formspec.label_color = "#313131" mcl_formspec.label_color = "#313131"
mcl_formspec.label_size = tonumber(minetest.settings:get("mcl_label_font_size")) or 24
mcl_formspec.apply_label_size = sf("style_type[label;font_size=%s]", mcl_formspec.label_size)
function mcl_formspec.get_itemslot_bg(x, y, w, h) function mcl_formspec.get_itemslot_bg(x, y, w, h)
local out = "" local out = ""
for i = 0, w - 1, 1 do for i = 0, w - 1, 1 do

127
mods/ITEMS/mcl_chests/init.lua
View File

@ -502,8 +502,8 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile
sf("mcl_chests:%s_%s_%s_%s", canonical_basename, pos.x, pos.y, pos.z), sf("mcl_chests:%s_%s_%s_%s", canonical_basename, pos.x, pos.y, pos.z),
table.concat({ table.concat({
"formspec_version[4]", "formspec_version[4]",
"size[11.75,10.375]", "size[11.75,10.425]",
"style_type[label;font_size=25]", mcl_formspec.apply_label_size,
"label[0.375,0.375;"..F(C(mcl_formspec.label_color, name)).."]", "label[0.375,0.375;"..F(C(mcl_formspec.label_color, name)).."]",
@ -515,8 +515,8 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile
mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3),
"list[current_player;main;0.375,5.1;9,3;9]", "list[current_player;main;0.375,5.1;9,3;9]",
mcl_formspec.get_itemslot_bg_v4(0.375, 9, 9, 1), mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1),
"list[current_player;main;0.375,9;9,1;]", "list[current_player;main;0.375,9.05;9,1;]",
sf("listring[nodemeta:%s,%s,%s;main]", pos.x, pos.y, pos.z), sf("listring[nodemeta:%s,%s,%s;main]", pos.x, pos.y, pos.z),
"listring[current_player;main]", "listring[current_player;main]",
@ -661,26 +661,38 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile
end end
minetest.show_formspec(clicker:get_player_name(), minetest.show_formspec(clicker:get_player_name(),
"mcl_chests:"..canonical_basename.."_"..pos.x.."_"..pos.y.."_"..pos.z, sf("mcl_chests:%s_%s_%s_%s", canonical_basename, pos.x, pos.y, pos.z),
"size[9,11.5]".. table.concat({
"label[0,0;"..F(minetest.colorize("#313131", name)).."]".. "formspec_version[4]",
"list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]".. "size[11.75,14.15]",
mcl_formspec.get_itemslot_bg(0,0.5,9,3).. mcl_formspec.apply_label_size,
"list[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main;0,3.5;9,3;]"..
mcl_formspec.get_itemslot_bg(0,3.5,9,3).. "label[0.375,0.375;"..F(C(mcl_formspec.label_color, name)).."]",
"label[0,7;"..F(minetest.colorize("#313131", S("Inventory"))).."]"..
"list[current_player;main;0,7.5;9,3;9]".. mcl_formspec.get_itemslot_bg_v4(0.375, 0.75, 9, 3),
mcl_formspec.get_itemslot_bg(0,7.5,9,3).. sf("list[nodemeta:%s,%s,%s;main;0.375,0.75;9,3;]", pos.x, pos.y, pos.z),
"list[current_player;main;0,10.75;9,1;]"..
mcl_formspec.get_itemslot_bg(0,10.75,9,1).. mcl_formspec.get_itemslot_bg_v4(0.375, 4.5, 9, 3),
-- BEGIN OF LISTRING WORKAROUND sf("list[nodemeta:%s,%s,%s;main;0.375,4.5;9,3;]", pos_other.x, pos_other.y, pos_other.z),
"listring[current_player;main]"..
"listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";input]".. "label[0.375,8.45;"..F(C(mcl_formspec.label_color, S("Inventory"))).."]",
-- END OF LISTRING WORKAROUND
"listring[current_player;main]".. mcl_formspec.get_itemslot_bg_v4(0.375, 8.825, 9, 3),
"listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main]".. "list[current_player;main;0.375,8.825;9,3;9]",
"listring[current_player;main]"..
"listring[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main]") mcl_formspec.get_itemslot_bg_v4(0.375, 12.775, 9, 1),
"list[current_player;main;0.375,12.775;9,1;]",
--BEGIN OF LISTRING WORKAROUND
"listring[current_player;main]",
sf("listring[nodemeta:%s,%s,%s;input]", pos.x, pos.y, pos.z),
--END OF LISTRING WORKAROUND
"listring[current_player;main]"..
sf("listring[nodemeta:%s,%s,%s;main]", pos.x, pos.y, pos.z),
"listring[current_player;main]",
sf("listring[nodemeta:%s,%s,%s;main]", pos_other.x, pos_other.y, pos_other.z),
})
)
if on_rightclick_addendum_left then if on_rightclick_addendum_left then
on_rightclick_addendum_left(pos, node, clicker) on_rightclick_addendum_left(pos, node, clicker)
@ -808,27 +820,38 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile
end end
minetest.show_formspec(clicker:get_player_name(), minetest.show_formspec(clicker:get_player_name(),
"mcl_chests:"..canonical_basename.."_"..pos.x.."_"..pos.y.."_"..pos.z, sf("mcl_chests:%s_%s_%s_%s", canonical_basename, pos.x, pos.y, pos.z),
table.concat({
"formspec_version[4]",
"size[11.75,14.15]",
mcl_formspec.apply_label_size,
"size[9,11.5]".. "label[0.375,0.375;"..F(C(mcl_formspec.label_color, name)).."]",
"label[0,0;"..F(minetest.colorize("#313131", name)).."]"..
"list[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main;0,0.5;9,3;]".. mcl_formspec.get_itemslot_bg_v4(0.375, 0.75, 9, 3),
mcl_formspec.get_itemslot_bg(0,0.5,9,3).. sf("list[nodemeta:%s,%s,%s;main;0.375,0.75;9,3;]", pos_other.x, pos_other.y, pos_other.z),
"list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,3.5;9,3;]"..
mcl_formspec.get_itemslot_bg(0,3.5,9,3).. mcl_formspec.get_itemslot_bg_v4(0.375, 4.5, 9, 3),
"label[0,7;"..F(minetest.colorize("#313131", S("Inventory"))).."]".. sf("list[nodemeta:%s,%s,%s;main;0.375,4.5;9,3;]", pos.x, pos.y, pos.z),
"list[current_player;main;0,7.5;9,3;9]"..
mcl_formspec.get_itemslot_bg(0,7.5,9,3).. "label[0.375,8.45;"..F(C(mcl_formspec.label_color, S("Inventory"))).."]",
"list[current_player;main;0,10.75;9,1;]"..
mcl_formspec.get_itemslot_bg(0,10.75,9,1).. mcl_formspec.get_itemslot_bg_v4(0.375, 8.825, 9, 3),
-- BEGIN OF LISTRING WORKAROUND "list[current_player;main;0.375,8.825;9,3;9]",
"listring[current_player;main]"..
"listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";input]".. mcl_formspec.get_itemslot_bg_v4(0.375, 12.775, 9, 1),
-- END OF LISTRING WORKAROUND "list[current_player;main;0.375,12.775;9,1;]",
"listring[current_player;main]"..
"listring[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main]".. --BEGIN OF LISTRING WORKAROUND
"listring[current_player;main]".. "listring[current_player;main]",
"listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main]") sf("listring[nodemeta:%s,%s,%s;input]", pos.x, pos.y, pos.z),
--END OF LISTRING WORKAROUND
"listring[current_player;main]"..
sf("listring[nodemeta:%s,%s,%s;main]", pos_other.x, pos_other.y, pos_other.z),
"listring[current_player;main]",
sf("listring[nodemeta:%s,%s,%s;main]", pos.x, pos.y, pos.z),
})
)
if on_rightclick_addendum_right then if on_rightclick_addendum_right then
on_rightclick_addendum_right(pos, node, clicker) on_rightclick_addendum_right(pos, node, clicker)
@ -1011,8 +1034,8 @@ minetest.register_node("mcl_chests:ender_chest", {
local formspec_ender_chest = table.concat({ local formspec_ender_chest = table.concat({
"formspec_version[4]", "formspec_version[4]",
"size[11.75,10.375]", "size[11.75,10.425]",
"style_type[label;font_size=25]", mcl_formspec.apply_label_size,
"label[0.375,0.375;"..F(C(mcl_formspec.label_color, S("Ender Chest"))).."]", "label[0.375,0.375;"..F(C(mcl_formspec.label_color, S("Ender Chest"))).."]",
@ -1024,8 +1047,8 @@ local formspec_ender_chest = table.concat({
mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3),
"list[current_player;main;0.375,5.1;9,3;9]", "list[current_player;main;0.375,5.1;9,3;9]",
mcl_formspec.get_itemslot_bg_v4(0.375, 9, 9, 1), mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1),
"list[current_player;main;0.375,9;9,1;]", "list[current_player;main;0.375,9.05;9,1;]",
"listring[current_player;enderchest]", "listring[current_player;enderchest]",
"listring[current_player;main]", "listring[current_player;main]",
@ -1155,8 +1178,8 @@ local function formspec_shulker_box(name)
return table.concat({ return table.concat({
"formspec_version[4]", "formspec_version[4]",
"size[11.75,10.375]", "size[11.75,10.425]",
"style_type[label;font_size=25]", mcl_formspec.apply_label_size,
"label[0.375,0.375;"..F(C(mcl_formspec.label_color, name)).."]", "label[0.375,0.375;"..F(C(mcl_formspec.label_color, name)).."]",
@ -1168,8 +1191,8 @@ local function formspec_shulker_box(name)
mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3),
"list[current_player;main;0.375,5.1;9,3;9]", "list[current_player;main;0.375,5.1;9,3;9]",
mcl_formspec.get_itemslot_bg_v4(0.375, 9, 9, 1), mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1),
"list[current_player;main;0.375,9;9,1;]", "list[current_player;main;0.375,9.05;9,1;]",
"listring[context;main]", "listring[context;main]",
"listring[current_player;main]", "listring[current_player;main]",

5
settingtypes.txt
View File

@ -192,6 +192,11 @@ animated_chests (Animated chests) bool true
# The maximum number of boss bars to simultaniously display on the screen # The maximum number of boss bars to simultaniously display on the screen
max_bossbars (Maximum Boss bars) int 5 max_bossbars (Maximum Boss bars) int 5
# Define how wide font will be displayed in mineclone2 formspecs
# This allow MineClone2 to have a label size similar to minecraft, but allowing at least singleplayer to use his own font with custom size
# (some fonts may be bigger than the default one and break formspecs)
mcl_label_font_size (Label Font Size) int 24
# Default intensity of shadows (default: 0.33) # Default intensity of shadows (default: 0.33)
mcl_default_shadow_intensity (Default shadow intensity) float 0.33 0.0 1.0 mcl_default_shadow_intensity (Default shadow intensity) float 0.33 0.0 1.0