diff --git a/mods/rp_book/book.lua b/mods/rp_book/book.lua index 37d25952..e0c25d1f 100644 --- a/mods/rp_book/book.lua +++ b/mods/rp_book/book.lua @@ -35,11 +35,13 @@ local on_use = function(itemstack, player, pointed_thing) end local form = rp_formspec.get_page("rp_formspec:default") + form = form .. "container["..rp_formspec.default.start_point.x..","..rp_formspec.default.start_point.y.."]" form = form .. "style_type[field;font_size=*2]" - form = form .. "field[0.5,0.7;9.25,0.5;title;"..FS("Title:")..";"..F(title).."]" - form = form .. "textarea[0.5,1.7;9.25,7;text;"..FS("Contents:")..";"..F(text).."]" + form = form .. "field[0,0.4;9.75,0.5;title;"..FS("Title:")..";"..F(title).."]" + form = form .. "textarea[0,1.4;9.75,7;text;"..FS("Contents:")..";"..F(text).."]" form = form .. "style[write;sound=]" - form = form .. rp_formspec.button_exit(3.5, 9, 3, 1, "write", S("Write")) + form = form .. rp_formspec.button_exit(3.5, 8.6, 3, 1, "write", S("Write")) + form = form .. "container_end[]" minetest.sound_play({name="rp_book_open_book", gain=0.5}, {pos=player:get_pos(), max_hear_distance=16}, true) minetest.show_formspec(name, "rp_book:book", form) diff --git a/mods/rp_book/bookshelf.lua b/mods/rp_book/bookshelf.lua index 782ad7ce..5398fdaf 100644 --- a/mods/rp_book/bookshelf.lua +++ b/mods/rp_book/bookshelf.lua @@ -32,12 +32,15 @@ end) local form_bookshelf = rp_formspec.get_page("rp_formspec:2part") form_bookshelf = form_bookshelf .. rp_formspec.default.player_inventory -form_bookshelf = form_bookshelf .. rp_formspec.get_itemslot_bg(0.25, 2, 8, 1) +local xstart = rp_formspec.default.start_point.x +local ystart = rp_formspec.default.start_point.y + 1.75 + +form_bookshelf = form_bookshelf .. rp_formspec.get_itemslot_bg(xstart, ystart, 8, 1) local function get_bookshelf_formspec(pos) local x, y, z = pos.x, pos.y, pos.z local context = "nodemeta:"..x..","..y..","..z local form = form_bookshelf - form = form .. "list["..context..";main;0.25,2;8,1;]" + form = form .. "list["..context..";main;"..xstart..","..ystart..";8,1;]" form = form .. "listring["..context..";main]" form = form .. "listring[current_player;main]" local meta = minetest.get_meta(pos) @@ -45,7 +48,7 @@ local function get_bookshelf_formspec(pos) for i=1,8 do if inv:get_stack("main", i):get_name() == "rp_default:book" then local xoff = (i-1) * 1.25 - form = form .. rp_formspec.image_button(0.25+xoff, 3.15, 1, 1, "open_"..i, "ui_icon_view.png", S("Read book")) + form = form .. rp_formspec.image_button(xstart+xoff, ystart + 1.15, 1, 1, "open_"..i, "ui_icon_view.png", S("Read book")) end end return form diff --git a/mods/rp_book/init.lua b/mods/rp_book/init.lua index 665baf3c..57b180f2 100644 --- a/mods/rp_book/init.lua +++ b/mods/rp_book/init.lua @@ -1,7 +1,7 @@ rp_book = {} local bookform = rp_formspec.default.version .. - "size[10.25,10.25]" .. + "size["..rp_formspec.default.size.x..","..rp_formspec.default.size.y.."]" .. rp_formspec.default.boilerplate .. "background[0,0;10.25,10.25;ui_formspec_bg_book.png]" rp_formspec.register_page("rp_book:book_page", bookform) diff --git a/mods/rp_jewels/init.lua b/mods/rp_jewels/init.lua index 7098cb4d..5133a2c3 100644 --- a/mods/rp_jewels/init.lua +++ b/mods/rp_jewels/init.lua @@ -20,12 +20,14 @@ jewels.registered_jewel_parents = {} local form_bench = rp_formspec.get_page("rp_formspec:2part") -form_bench = form_bench .. rp_formspec.get_itemslot_bg(2.25, 2, 1, 1) -form_bench = form_bench .. "list[current_name;main;2.25,2;1,1;]" +form_bench = form_bench .. "container["..rp_formspec.default.start_point.x..","..rp_formspec.default.start_point.y.."]" +form_bench = form_bench .. rp_formspec.get_itemslot_bg(2.5, 1.75, 1, 1) +form_bench = form_bench .. "list[current_name;main;2.5,1.75;1,1;]" form_bench = form_bench .. "listring[current_name;main]" -form_bench = form_bench .. "label[3.5,2.2;"..FS("1. Place tool here").."]" -form_bench = form_bench .. "label[3.5,2.7;"..FS("2. Hold a jewel and punch the bench").."]" +form_bench = form_bench .. "label[3.75,2;"..FS("1. Place tool here").."]" +form_bench = form_bench .. "label[3.75,2.5;"..FS("2. Hold a jewel and punch the bench").."]" +form_bench = form_bench .. "container_end[]" form_bench = form_bench .. rp_formspec.default.player_inventory form_bench = form_bench .. "listring[current_player;main]"