Zasco
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Merge pull request 'Don't subtract items when placing in gm-creative' (#2648) from creative_infiniplace into master 

Reviewed-on: MineClone2/MineClone2#2648
This commit is contained in:
cora 2022-09-14 01:09:45 +00:00
parent b45336e852 8fbe770cee
commit 6dfaee297d
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mods/HUD/mcl_inventory/init.lua
View File

@ -75,7 +75,7 @@ local function set_inventory(player, armor_change_only)
local form = "size[9,8.75]" .. local form = "size[9,8.75]" ..
"background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png]" .. "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png]" ..
mcl_player.get_player_formspec_model(player, 1.0, 0.0, 2.25, 4.5, "") .. mcl_player.get_player_formspec_model(player, 1.0, 0.0, 2.25, 4.5, "") ..
-- Armor -- Armor
"list[current_player;armor;0,0;1,1;1]" .. "list[current_player;armor;0,0;1,1;1]" ..
"list[current_player;armor;0,1;1,1;2]" .. "list[current_player;armor;0,1;1,1;2]" ..
@ -88,7 +88,7 @@ local function set_inventory(player, armor_change_only)
"list[current_player;offhand;3,2;1,1]" .. "list[current_player;offhand;3,2;1,1]" ..
mcl_formspec.get_itemslot_bg(3,2,1,1) .. mcl_formspec.get_itemslot_bg(3,2,1,1) ..
armor_slot_imgs .. armor_slot_imgs ..
-- Craft and inventory -- Craft and inventory
"label[0,4;"..F(minetest.colorize("#313131", S("Inventory"))) .. "]" .. "label[0,4;"..F(minetest.colorize("#313131", S("Inventory"))) .. "]" ..
"list[current_player;main;0,4.5;9,3;9]" .. "list[current_player;main;0,4.5;9,3;9]" ..
@ -100,34 +100,34 @@ local function set_inventory(player, armor_change_only)
mcl_formspec.get_itemslot_bg(0, 7.74, 9, 1) .. mcl_formspec.get_itemslot_bg(0, 7.74, 9, 1) ..
mcl_formspec.get_itemslot_bg(4, 1,2, 2) .. mcl_formspec.get_itemslot_bg(4, 1,2, 2) ..
mcl_formspec.get_itemslot_bg(7, 1.5, 1, 1) .. mcl_formspec.get_itemslot_bg(7, 1.5, 1, 1) ..
-- Crafting guide button -- Crafting guide button
"image_button[4.5,3;1,1;craftguide_book.png;__mcl_craftguide;]" .. "image_button[4.5,3;1,1;craftguide_book.png;__mcl_craftguide;]" ..
"tooltip[__mcl_craftguide;"..F(S("Recipe book")) .. "]" .. "tooltip[__mcl_craftguide;"..F(S("Recipe book")) .. "]" ..
-- Help button -- Help button
"image_button[8,3;1,1;doc_button_icon_lores.png;__mcl_doc;]" .. "image_button[8,3;1,1;doc_button_icon_lores.png;__mcl_doc;]" ..
"tooltip[__mcl_doc;" .. F(S("Help")) .. "]" "tooltip[__mcl_doc;" .. F(S("Help")) .. "]"
-- Skins button -- Skins button
if minetest.global_exists("mcl_skins") then if minetest.global_exists("mcl_skins") then
form = form .. form = form ..
"image_button[3,3;1,1;mcl_skins_button.png;__mcl_skins;]" .. "image_button[3,3;1,1;mcl_skins_button.png;__mcl_skins;]" ..
"tooltip[__mcl_skins;" .. F(S("Select player skin")) .. "]" "tooltip[__mcl_skins;" .. F(S("Select player skin")) .. "]"
end end
form = form .. form = form ..
-- Achievements button -- Achievements button
"image_button[7,3;1,1;mcl_achievements_button.png;__mcl_achievements;]" .. "image_button[7,3;1,1;mcl_achievements_button.png;__mcl_achievements;]" ..
"tooltip[__mcl_achievements;" .. F(S("Achievements")) .. "]" .. "tooltip[__mcl_achievements;" .. F(S("Achievements")) .. "]" ..
-- For shortcuts -- For shortcuts
"listring[current_player;main]" .. "listring[current_player;main]" ..
"listring[current_player;armor]" .. "listring[current_player;armor]" ..
"listring[current_player;main]" .. "listring[current_player;main]" ..
"listring[current_player;craft]" .. "listring[current_player;craft]" ..
"listring[current_player;main]" "listring[current_player;main]"
player:set_inventory_formspec(form) player:set_inventory_formspec(form)
end end
@ -218,6 +218,11 @@ minetest.register_on_punchnode(function(pos, node, puncher, pointed_thing)
end end
end) end)
--Don't subtract from inv when placing in gamemode-creative
minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack, pointed_thing)
if minetest.is_creative_enabled(placer:get_player_name()) then return true end
end)
local function in_table(n,h) local function in_table(n,h)
for k,v in pairs(h) do for k,v in pairs(h) do
if v == n then return true end if v == n then return true end