diff --git a/mod_sources.txt b/mod_sources.txt index ffc104a..ace6a6e 100644 --- a/mod_sources.txt +++ b/mod_sources.txt @@ -77,7 +77,7 @@ origin https://notabug.org/tenplus1/farming (fetch) Mod: flora/farming origin https://github.com/minetest-mods/i3.git (fetch) -* main d479f13 [origin/main] Update demo video +* main 29925ef [origin/main] Minor style cleaning Mod: gui/i3 origin https://repo.or.cz/minetest_hbarmor.git (fetch) @@ -117,7 +117,7 @@ origin https://notabug.org/tenplus1/mobs_redo (fetch) Mod: lib_api/mobs_redo origin https://github.com/appgurueu/modlib (fetch) -* master ba4a6ab [origin/master] b3d test default false +* master ca6757f [origin/master] table: get rid of unneeded metatable duplication Mod: lib_api/modlib origin git@github.com:runsy/rcbows.git (fetch) diff --git a/mods/buildings/mg_villages/config.lua b/mods/buildings/mg_villages/config.lua index ed89fc5..ea102e5 100644 --- a/mods/buildings/mg_villages/config.lua +++ b/mods/buildings/mg_villages/config.lua @@ -30,12 +30,12 @@ mg_villages.REQUIRE_PRIV_FOR_TELEPORT = false; mg_villages.ENABLE_PROTECTION = false; -- the first village - the one the player spawns in - will be of this type -mg_villages.FIRST_VILLAGE_TYPE = 'medieval'; +--mg_villages.FIRST_VILLAGE_TYPE = 'medieval'; -- the mapgen will disregard mapchunks where min.y > mg_villages.MAX_HEIGHT_TREATED; -- you can set this value to 64 if you have a slow machine and a mapgen which does not create extreme mountains -- (or if you don't care if extreme mountains may create burried villages occasionally) -mg_villages.MAX_HEIGHT_TREATED = 400; +mg_villages.MAX_HEIGHT_TREATED = 200; -- choose the debug level you want mg_villages.DEBUG_LEVEL = mg_villages.DEBUG_LEVEL_NORMAL diff --git a/mods/buildings/mg_villages/init.lua b/mods/buildings/mg_villages/init.lua index b4017db..2463866 100644 --- a/mods/buildings/mg_villages/init.lua +++ b/mods/buildings/mg_villages/init.lua @@ -104,7 +104,7 @@ dofile(mg_villages.modpath.."/terrain_blend.lua") -- also takes care of spawning the player dofile(mg_villages.modpath.."/mapgen.lua") --- dofile(mg_villages.modpath.."/spawn_player.lua") +dofile(mg_villages.modpath.."/spawn_player.lua") -- reconstruct the connection of the roads inside a village dofile(mg_villages.modpath.."/roads.lua") diff --git a/mods/buildings/mg_villages/plotmarker_formspec.lua b/mods/buildings/mg_villages/plotmarker_formspec.lua index f54f4cf..002c7c7 100644 --- a/mods/buildings/mg_villages/plotmarker_formspec.lua +++ b/mods/buildings/mg_villages/plotmarker_formspec.lua @@ -366,9 +366,9 @@ end mg_villages.form_input_handler = function( player, formname, fields) -- mg_villages.print(mg_villages.DEBUG_LEVEL_NORMAL,minetest.serialize(fields)); --- if( not( mg_villages.ENABLE_PROTECTION )) then --- return false; --- end + -- if( not( mg_villages.ENABLE_PROTECTION )) then + -- return false; + -- end -- teleport to a plot or mob if( fields[ 'teleport_to' ] diff --git a/mods/gui/i3/init.lua b/mods/gui/i3/init.lua index 39d9264..1755a28 100644 --- a/mods/gui/i3/init.lua +++ b/mods/gui/i3/init.lua @@ -1917,14 +1917,15 @@ local function get_ctn_content(fs, data, player, xoffset, yoffset, ctn_len, awar elseif skins_equip then if __skinsdb then local _skins = skins.get_skinlist_for_player(name) - local t = {} + local sks = {} for _, skin in ipairs(_skins) do - t[#t + 1] = skin.name + sks[#sks + 1] = skin.name end - fs(fmt("dropdown[0,%f;3.55,0.6;skins;%s;%u;true]", - yextra + 0.7, concat(t, ","), data.skin_id or 1)) + sks = concat(sks, ","):gsub(";", "") + + fs(fmt("dropdown[0,%f;4,0.6;skins;%s;%u;true]", yextra + 0.7, sks, data.skin_id or 1)) else fs(fmt("hypertext", 0, yextra + 0.9, ctn_len, 0.6, "", "
not installed
")) @@ -2347,19 +2348,13 @@ local function get_inventory_fs(player, data, fs) end local function get_items_fs(_, data, fs) - local filtered = data.filter ~= "" + fs("box[0.2,0.2;4.55,0.6;#bababa25]", "set_focus[filter]", + fmt("field[0.3,0.2;3.45,0.6;filter;;%s]", ESC(data.filter)), + "field_close_on_enter[filter;false]") - fs("box[0.2,0.2;4.55,0.6;#bababa25]", "set_focus[filter]") - fs(fmt("field[0.3,0.2;%f,0.6;filter;;%s]", filtered and 3.45 or 3.9, ESC(data.filter))) - fs("field_close_on_enter[filter;false]") - - if filtered then - fs(fmt("image_button", 3.75, 0.35, 0.3, 0.3, "", "cancel", "")) - end - - fs(fmt("image_button", 4.25, 0.32, 0.35, 0.35, "", "search", "")) - - fs(fmt("image_button", data.xoffset - 2.73, 0.3, 0.35, 0.35, "", "prev_page", ""), + fs(fmt("image_button", 3.75, 0.35, 0.3, 0.3, "", "cancel", ""), + fmt("image_button", 4.25, 0.32, 0.35, 0.35, "", "search", ""), + fmt("image_button", data.xoffset - 2.73, 0.3, 0.35, 0.35, "", "prev_page", ""), fmt("image_button", data.xoffset - 0.55, 0.3, 0.35, 0.35, "", "next_page", "")) data.pagemax = max(1, ceil(#data.items / IPP)) diff --git a/mods/lib_api/modlib/minetest.lua b/mods/lib_api/modlib/minetest.lua index dee2099..7355040 100644 --- a/mods/lib_api/modlib/minetest.lua +++ b/mods/lib_api/modlib/minetest.lua @@ -687,7 +687,7 @@ function colorspec:to_number() return self.r * 0x1000000 + self.g * 0x10000 + self.b * 0x100 + self.a end -colorspec_to_colorstring = _G.minetest.colorspec_to_colorstring or function(spec) +colorspec_to_colorstring = minetest.colorspec_to_colorstring or function(spec) return colorspec.from_any(spec):to_string() end diff --git a/mods/lib_api/modlib/table.lua b/mods/lib_api/modlib/table.lua index 647c14f..fb07aef 100644 --- a/mods/lib_api/modlib/table.lua +++ b/mods/lib_api/modlib/table.lua @@ -1,14 +1,15 @@ -- Table helpers function map_index(table, func) - return setmetatable(table, { + local mapping_metatable = { __index = function(table, key) return rawget(table, func(key)) end, __newindex = function(table, key, value) rawset(table, func(key), value) end - }) + } + return setmetatable(table, mapping_metatable) end function set_case_insensitive_index(table)