mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-15 07:31:05 +01:00
Merge pull request 'Mobile fixes & improvements (cherry-pick from Mineclonia)' (#4685) from grorp/MineClone2:vl-mobile-fixes-and-improvements into master
Reviewed-on: https://git.minetest.land/VoxeLibre/VoxeLibre/pulls/4685 Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
This commit is contained in:
commit
32b334322b
4 changed files with 64 additions and 17 deletions
|
@ -418,6 +418,18 @@ minetest.register_on_joinplayer(function(player)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
---@param player mt.PlayerObjectRef
|
||||||
|
local function is_touch_enabled(playername)
|
||||||
|
-- Minetest < 5.7.0 support
|
||||||
|
if not minetest.get_player_window_information then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
local window = minetest.get_player_window_information(playername)
|
||||||
|
-- Always return a boolean (not nil) to avoid false-negatives when
|
||||||
|
-- comparing to a boolean later.
|
||||||
|
return window and window.touch_controls or false
|
||||||
|
end
|
||||||
|
|
||||||
---@param player mt.PlayerObjectRef
|
---@param player mt.PlayerObjectRef
|
||||||
function mcl_inventory.set_creative_formspec(player)
|
function mcl_inventory.set_creative_formspec(player)
|
||||||
local playername = player:get_player_name()
|
local playername = player:get_player_name()
|
||||||
|
@ -566,8 +578,10 @@ function mcl_inventory.set_creative_formspec(player)
|
||||||
bg_img = "crafting_creative_inactive" .. button_bg_postfix[this_tab] .. ".png"
|
bg_img = "crafting_creative_inactive" .. button_bg_postfix[this_tab] .. ".png"
|
||||||
end
|
end
|
||||||
return table.concat({
|
return table.concat({
|
||||||
"style[" .. this_tab .. ";border=false;bgimg=;bgimg_pressed=;noclip=true]",
|
"style[" .. this_tab .. ";border=false;bgimg=;bgimg_pressed=]",
|
||||||
"image[" .. offset[this_tab] .. ";1.5,1.44;" .. bg_img .. "]",
|
"style[" .. this_tab .. "_outer;border=false;bgimg=" .. bg_img ..
|
||||||
|
";bgimg_pressed=" .. bg_img .. "]",
|
||||||
|
"button[" .. offset[this_tab] .. ";1.5,1.44;" .. this_tab .. "_outer;]",
|
||||||
"item_image_button[" .. boffset[this_tab] .. ";1,1;" .. tab_icon[this_tab] .. ";" .. this_tab .. ";]",
|
"item_image_button[" .. boffset[this_tab] .. ";1,1;" .. tab_icon[this_tab] .. ";" .. this_tab .. ";]",
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
@ -577,11 +591,21 @@ function mcl_inventory.set_creative_formspec(player)
|
||||||
caption = "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, filtername[name])) .. "]"
|
caption = "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, filtername[name])) .. "]"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local touch_enabled = is_touch_enabled(playername)
|
||||||
|
players[playername].last_touch_enabled = touch_enabled
|
||||||
|
|
||||||
local formspec = table.concat({
|
local formspec = table.concat({
|
||||||
"formspec_version[6]",
|
"formspec_version[6]",
|
||||||
"size[13,8.75]",
|
-- Original formspec height was 8.75, increased to include tab buttons.
|
||||||
|
-- This avoids tab buttons going off-screen with high scaling values.
|
||||||
|
"size[13,11.43]",
|
||||||
|
-- Use as much space as possible on mobile - the tab buttons are a lot
|
||||||
|
-- of padding already.
|
||||||
|
touch_enabled and "padding[-0.015,-0.015]" or "",
|
||||||
|
|
||||||
"style_type[image;noclip=true]",
|
"no_prepend[]", mcl_vars.gui_nonbg, mcl_vars.gui_bg_color,
|
||||||
|
"background9[0,1.34;13,8.75;mcl_base_textures_background9.png;;7]",
|
||||||
|
"container[0,1.34]",
|
||||||
|
|
||||||
-- Hotbar
|
-- Hotbar
|
||||||
mcl_formspec.get_itemslot_bg_v4(0.375, 7.375, 9, 1),
|
mcl_formspec.get_itemslot_bg_v4(0.375, 7.375, 9, 1),
|
||||||
|
@ -638,6 +662,7 @@ function mcl_inventory.set_creative_formspec(player)
|
||||||
"set_focus[search;true]",
|
"set_focus[search;true]",
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
formspec = formspec .. "container_end[]"
|
||||||
if pagenum then formspec = formspec .. "p" .. tostring(pagenum) end
|
if pagenum then formspec = formspec .. "p" .. tostring(pagenum) end
|
||||||
player:set_inventory_formspec(formspec)
|
player:set_inventory_formspec(formspec)
|
||||||
end
|
end
|
||||||
|
@ -655,54 +680,54 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
|
|
||||||
local name = player:get_player_name()
|
local name = player:get_player_name()
|
||||||
|
|
||||||
if fields.blocks then
|
if fields.blocks or fields.blocks_outer then
|
||||||
if players[name].page == "blocks" then return end
|
if players[name].page == "blocks" then return end
|
||||||
set_inv_page("blocks", player)
|
set_inv_page("blocks", player)
|
||||||
page = "blocks"
|
page = "blocks"
|
||||||
elseif fields.deco then
|
elseif fields.deco or fields.deco_outer then
|
||||||
if players[name].page == "deco" then return end
|
if players[name].page == "deco" then return end
|
||||||
set_inv_page("deco", player)
|
set_inv_page("deco", player)
|
||||||
page = "deco"
|
page = "deco"
|
||||||
elseif fields.redstone then
|
elseif fields.redstone or fields.redstone_outer then
|
||||||
if players[name].page == "redstone" then return end
|
if players[name].page == "redstone" then return end
|
||||||
set_inv_page("redstone", player)
|
set_inv_page("redstone", player)
|
||||||
page = "redstone"
|
page = "redstone"
|
||||||
elseif fields.rail then
|
elseif fields.rail or fields.rail_outer then
|
||||||
if players[name].page == "rail" then return end
|
if players[name].page == "rail" then return end
|
||||||
set_inv_page("rail", player)
|
set_inv_page("rail", player)
|
||||||
page = "rail"
|
page = "rail"
|
||||||
elseif fields.misc then
|
elseif fields.misc or fields.misc_outer then
|
||||||
if players[name].page == "misc" then return end
|
if players[name].page == "misc" then return end
|
||||||
set_inv_page("misc", player)
|
set_inv_page("misc", player)
|
||||||
page = "misc"
|
page = "misc"
|
||||||
elseif fields.nix then
|
elseif fields.nix or fields.nix_outer then
|
||||||
set_inv_page("all", player)
|
set_inv_page("all", player)
|
||||||
page = "nix"
|
page = "nix"
|
||||||
elseif fields.food then
|
elseif fields.food or fields.food_outer then
|
||||||
if players[name].page == "food" then return end
|
if players[name].page == "food" then return end
|
||||||
set_inv_page("food", player)
|
set_inv_page("food", player)
|
||||||
page = "food"
|
page = "food"
|
||||||
elseif fields.tools then
|
elseif fields.tools or fields.tools_outer then
|
||||||
if players[name].page == "tools" then return end
|
if players[name].page == "tools" then return end
|
||||||
set_inv_page("tools", player)
|
set_inv_page("tools", player)
|
||||||
page = "tools"
|
page = "tools"
|
||||||
elseif fields.combat then
|
elseif fields.combat or fields.combat_outer then
|
||||||
if players[name].page == "combat" then return end
|
if players[name].page == "combat" then return end
|
||||||
set_inv_page("combat", player)
|
set_inv_page("combat", player)
|
||||||
page = "combat"
|
page = "combat"
|
||||||
elseif fields.mobs then
|
elseif fields.mobs or fields.mobs_outer then
|
||||||
if players[name].page == "mobs" then return end
|
if players[name].page == "mobs" then return end
|
||||||
set_inv_page("mobs", player)
|
set_inv_page("mobs", player)
|
||||||
page = "mobs"
|
page = "mobs"
|
||||||
elseif fields.brew then
|
elseif fields.brew or fields.brew_outer then
|
||||||
if players[name].page == "brew" then return end
|
if players[name].page == "brew" then return end
|
||||||
set_inv_page("brew", player)
|
set_inv_page("brew", player)
|
||||||
page = "brew"
|
page = "brew"
|
||||||
elseif fields.matr then
|
elseif fields.matr or fields.matr_outer then
|
||||||
if players[name].page == "matr" then return end
|
if players[name].page == "matr" then return end
|
||||||
set_inv_page("matr", player)
|
set_inv_page("matr", player)
|
||||||
page = "matr"
|
page = "matr"
|
||||||
elseif fields.inv then
|
elseif fields.inv or fields.inv_outer then
|
||||||
if players[name].page == "inv" then return end
|
if players[name].page == "inv" then return end
|
||||||
page = "inv"
|
page = "inv"
|
||||||
elseif fields.search == "" and not fields.creative_next and not fields.creative_prev then
|
elseif fields.search == "" and not fields.creative_next and not fields.creative_prev then
|
||||||
|
@ -818,3 +843,19 @@ minetest.register_on_player_inventory_action(function(player, action, inventory,
|
||||||
player:get_inventory():set_stack("main", inventory_info.index, stack)
|
player:get_inventory():set_stack("main", inventory_info.index, stack)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
-- This is necessary because get_player_window_information may return nil in
|
||||||
|
-- on_joinplayer.
|
||||||
|
-- (Also, Minetest plans to add support for toggling touchscreen mode in-game.)
|
||||||
|
minetest.register_globalstep(function(dtime)
|
||||||
|
for _, player in pairs(minetest.get_connected_players()) do
|
||||||
|
local name = player:get_player_name()
|
||||||
|
|
||||||
|
if minetest.is_creative_enabled(name) then
|
||||||
|
local touch_enabled = is_touch_enabled(name)
|
||||||
|
if touch_enabled ~= players[name].last_touch_enabled then
|
||||||
|
mcl_inventory.set_creative_formspec(player)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
|
@ -169,6 +169,7 @@ S("The speed and damage of the arrow increases the longer you charge. The regula
|
||||||
return itemstack
|
return itemstack
|
||||||
end,
|
end,
|
||||||
groups = {weapon=1,weapon_ranged=1,bow=1,cannot_block=1,enchantability=1},
|
groups = {weapon=1,weapon_ranged=1,bow=1,cannot_block=1,enchantability=1},
|
||||||
|
touch_interaction = "short_dig_long_place",
|
||||||
_mcl_uses = 385,
|
_mcl_uses = 385,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -235,6 +236,7 @@ for level=0, 2 do
|
||||||
on_place = function(itemstack)
|
on_place = function(itemstack)
|
||||||
return itemstack
|
return itemstack
|
||||||
end,
|
end,
|
||||||
|
touch_interaction = "short_dig_long_place",
|
||||||
_mcl_uses = 385,
|
_mcl_uses = 385,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
|
@ -159,6 +159,7 @@ S("The speed and damage of the arrow increases the longer you charge. The regula
|
||||||
return itemstack
|
return itemstack
|
||||||
end,
|
end,
|
||||||
groups = {weapon=1,weapon_ranged=1,crossbow=1,cannot_block=1,enchantability=1},
|
groups = {weapon=1,weapon_ranged=1,crossbow=1,cannot_block=1,enchantability=1},
|
||||||
|
touch_interaction = "short_dig_long_place",
|
||||||
_mcl_uses = 326,
|
_mcl_uses = 326,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -194,6 +195,7 @@ S("The speed and damage of the arrow increases the longer you charge. The regula
|
||||||
return itemstack
|
return itemstack
|
||||||
end,
|
end,
|
||||||
groups = {weapon=1,weapon_ranged=1,crossbow=1,cannot_block=1,enchantability=1,not_in_creative_inventory=1},
|
groups = {weapon=1,weapon_ranged=1,crossbow=1,cannot_block=1,enchantability=1,not_in_creative_inventory=1},
|
||||||
|
touch_interaction = "short_dig_long_place",
|
||||||
_mcl_uses = 326,
|
_mcl_uses = 326,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -257,6 +259,7 @@ for level=0, 2 do
|
||||||
on_place = function(itemstack)
|
on_place = function(itemstack)
|
||||||
return itemstack
|
return itemstack
|
||||||
end,
|
end,
|
||||||
|
touch_interaction = "short_dig_long_place",
|
||||||
_mcl_uses = 385,
|
_mcl_uses = 385,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,6 +6,7 @@ minetest.register_tool("mcl_spyglass:spyglass",{
|
||||||
inventory_image = "mcl_spyglass.png",
|
inventory_image = "mcl_spyglass.png",
|
||||||
stack_max = 1,
|
stack_max = 1,
|
||||||
_mcl_toollike_wield = true,
|
_mcl_toollike_wield = true,
|
||||||
|
touch_interaction = "short_dig_long_place",
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
|
|
Loading…
Reference in a new issue