From 3f96b961e801cd2119fda1016e63f514a02f00d7 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 11 Mar 2016 23:45:55 +0100 Subject: [PATCH] Update creative mod form Minetest Game --- mods/creative/README.txt | 4 +- mods/creative/init.lua | 215 ++++++++++++------ mods/creative/locale/de.txt | 1 - mods/creative/locale/el.txt | 1 - mods/creative/locale/fr.txt | 1 - mods/creative/locale/id.txt | 1 - mods/creative/locale/nl.txt | 1 - mods/creative/locale/template.txt | 1 - .../creative/textures/creative_trash_icon.png | Bin 0 -> 179 bytes 9 files changed, 144 insertions(+), 81 deletions(-) delete mode 100644 mods/creative/locale/de.txt delete mode 100644 mods/creative/locale/el.txt delete mode 100644 mods/creative/locale/fr.txt delete mode 100644 mods/creative/locale/id.txt delete mode 100644 mods/creative/locale/nl.txt delete mode 100644 mods/creative/locale/template.txt create mode 100644 mods/creative/textures/creative_trash_icon.png diff --git a/mods/creative/README.txt b/mods/creative/README.txt index 7d49b98..a34dcaa 100644 --- a/mods/creative/README.txt +++ b/mods/creative/README.txt @@ -1,5 +1,5 @@ -Minetest 0.4 mod: creative -========================== +Minetest Game mod: creative +=========================== Implements creative mode. diff --git a/mods/creative/init.lua b/mods/creative/init.lua index 8de7228..0116370 100644 --- a/mods/creative/init.lua +++ b/mods/creative/init.lua @@ -1,23 +1,18 @@ -- minetest/creative/init.lua --- intllib support -local S, F -if (minetest.get_modpath("intllib")) then - S = intllib.Getter() - F = function( s ) - return minetest.formspec_escape(S(s)) - end -else - S = function ( s ) return s end - F = function ( s ) return minetest.formspec_escape(s) end -end - -creative_inventory = {} -creative_inventory.creative_inventory_size = 0 +creative = {} +local player_inventory = {} -- Create detached creative inventory after loading all mods -minetest.after(0, function() - local inv = minetest.create_detached_inventory("creative", { +creative.init_creative_inventory = function(player) + local player_name = player:get_player_name() + + player_inventory[player_name] = {} + player_inventory[player_name].size = 0 + player_inventory[player_name].filter = nil + player_inventory[player_name].start_i = 1 + + local inv = minetest.create_detached_inventory("creative_" .. player_name, { allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) if minetest.setting_getbool("creative_mode") then return count @@ -47,21 +42,42 @@ minetest.after(0, function() end end, }) + + creative.update_creative_inventory(player_name, nil, 2) + --print("creative inventory size: "..dump(player_inventory[player_name].size)) +end + +local function tab_category(tab_id) + local id_category = { + nil, -- Reserved for crafting tab. + minetest.registered_items, + minetest.registered_nodes, + minetest.registered_tools, + minetest.registered_craftitems + } + + -- If index out of range, show default ("All") page. + return id_category[tab_id] or id_category[2] +end + +function creative.update_creative_inventory(player_name, filter, tab_id) local creative_list = {} - for name,def in pairs(minetest.registered_items) do - if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) - and def.description and def.description ~= "" then - table.insert(creative_list, name) + local inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name}) + + for name, def in pairs(tab_category(tab_id)) do + if not (def.groups.not_in_creative_inventory == 1) and + def.description and def.description ~= "" and + (not filter or def.name:find(filter, 1, true) or + def.description:lower():find(filter, 1, true)) then + creative_list[#creative_list+1] = name end end + table.sort(creative_list) inv:set_size("main", #creative_list) - for _,itemstring in ipairs(creative_list) do - inv:add_item("main", ItemStack(itemstring)) - end - creative_inventory.creative_inventory_size = #creative_list - --print("creative inventory size: "..dump(creative_inventory.creative_inventory_size)) -end) + inv:set_list("main", creative_list) + player_inventory[player_name].size = #creative_list +end -- Create the trash field local trash = minetest.create_detached_inventory("creative_trash", { @@ -80,65 +96,119 @@ local trash = minetest.create_detached_inventory("creative_trash", { }) trash:set_size("main", 1) - -creative_inventory.set_creative_formspec = function(player, start_i, pagenum) +creative.set_creative_formspec = function(player, start_i, pagenum, tab_id) + local player_name = player:get_player_name() + local filter = player_inventory[player_name].filter or "" pagenum = math.floor(pagenum) - local pagemax = math.floor((creative_inventory.creative_inventory_size-1) / (6*4) + 1) - player:set_inventory_formspec( - "size[13,7.5]".. - --"image[6,0.6;1,2;player.png]".. - default.gui_bg.. - default.gui_bg_img.. - default.gui_slots.. - "list[current_player;main;5,3.5;8,1;]".. - "list[current_player;main;5,4.75;8,3;8]".. - "list[current_player;craft;8,0;3,3;]".. - "list[current_player;craftpreview;12,1;1,1;]".. - "list[detached:creative;main;0.3,0.5;4,6;"..tostring(start_i).."]".. - "label[2.0,6.55;"..tostring(pagenum).."/"..tostring(pagemax).."]".. - "button[0.3,6.5;1.6,1;creative_prev;<<]".. - "button[2.7,6.5;1.6,1;creative_next;>>]".. - "label[5,1.5;"..F("Trash:").."]".. - "list[detached:creative_trash;main;5,2;1,1;]".. - default.get_hotbar_bg(5,3.5) + local pagemax = math.floor((player_inventory[player_name].size - 1) / (3*8) + 1) + tab_id = tab_id or 2 + + player:set_inventory_formspec([[ + size[8,8.6] + image[4.06,3.4;0.8,0.8;creative_trash_icon.png] + list[current_player;main;0,4.7;8,1;] + list[current_player;main;0,5.85;8,3;8] + list[detached:creative_trash;main;4,3.3;1,1;] + tablecolumns[color;text;color;text] + tableoptions[background=#00000000;highlight=#00000000;border=false] + button[5.4,3.2;0.8,0.9;creative_prev;<] + button[7.25,3.2;0.8,0.9;creative_next;>] + button[2.1,3.4;0.8,0.5;creative_search;?] + button[2.75,3.4;0.8,0.5;creative_clear;X] + tooltip[creative_search;Search] + tooltip[creative_clear;Reset] + listring[current_player;main] + ]] .. + "field[0.3,3.5;2.2,1;creative_filter;;".. filter .."]".. + "listring[detached:creative_".. player_name ..";main]".. + "tabheader[0,0;creative_tabs;Crafting,All,Nodes,Tools,Items;".. tostring(tab_id) ..";true;false]".. + "list[detached:creative_".. player_name ..";main;0,0;8,3;".. tostring(start_i) .."]".. + "table[6.05,3.35;1.15,0.5;pagenum;#FFFF00,".. tostring(pagenum) ..",#FFFFFF,/ ".. tostring(pagemax) .."]".. + default.get_hotbar_bg(0,4.7).. + default.gui_bg .. default.gui_bg_img .. default.gui_slots ) end + +creative.set_crafting_formspec = function(player) + player:set_inventory_formspec([[ + size[8,8.6] + list[current_player;craft;2,0.75;3,3;] + list[current_player;craftpreview;6,1.75;1,1;] + list[current_player;main;0,4.7;8,1;] + list[current_player;main;0,5.85;8,3;8] + list[detached:creative_trash;main;0,2.75;1,1;] + image[0.06,2.85;0.8,0.8;creative_trash_icon.png] + image[5,1.75;1,1;gui_furnace_arrow_bg.png^[transformR270] + tabheader[0,0;creative_tabs;Crafting,All,Nodes,Tools,Items;1;true;false] + listring[current_player;main] + listring[current_player;craft] + ]] .. + default.get_hotbar_bg(0,4.7).. + default.gui_bg .. default.gui_bg_img .. default.gui_slots + ) +end + minetest.register_on_joinplayer(function(player) -- If in creative mode, modify player's inventory forms if not minetest.setting_getbool("creative_mode") then return end - creative_inventory.set_creative_formspec(player, 0, 1) + creative.init_creative_inventory(player) + creative.set_creative_formspec(player, 0, 1, 2) end) + minetest.register_on_player_receive_fields(function(player, formname, fields) - if not minetest.setting_getbool("creative_mode") then + if formname ~= "" or not minetest.setting_getbool("creative_mode") then return end - -- Figure out current page from formspec - local current_page = 0 + + local player_name = player:get_player_name() local formspec = player:get_inventory_formspec() - local start_i = string.match(formspec, "list%[detached:creative;main;[%d.]+,[%d.]+;[%d.]+,[%d.]+;(%d+)%]") + local filter = formspec:match("creative_filter;;([%w_:]+)") or "" + local start_i = formspec:match("list%[.-".. player_name ..";.-;(%d+)%]") + local tab_id = tonumber(formspec:match("tabheader%[.-;(%d+)%;")) + local inv_size = player_inventory[player_name].size start_i = tonumber(start_i) or 0 - if fields.creative_prev then - start_i = start_i - 4*6 - end - if fields.creative_next then - start_i = start_i + 4*6 - end + if fields.quit then + if tab_id == 1 then + creative.set_crafting_formspec(player) + end + elseif fields.creative_tabs then + local tab = tonumber(fields.creative_tabs) + if tab == 1 then + creative.set_crafting_formspec(player) + else + creative.update_creative_inventory(player_name, filter, tab) + creative.set_creative_formspec(player, 0, 1, tab) + end + elseif fields.creative_clear then + player_inventory[player_name].filter = "" + creative.update_creative_inventory(player_name, nil, tab_id) + creative.set_creative_formspec(player, 0, 1, tab_id) + elseif fields.creative_search then + local lowstr = fields.creative_filter:lower() + player_inventory[player_name].filter = lowstr + creative.update_creative_inventory(player_name, lowstr, tab_id) + creative.set_creative_formspec(player, 0, 1, tab_id) + else + if fields.creative_prev then + start_i = start_i - 3*8 + if start_i < 0 then + start_i = inv_size - (inv_size % (3*8)) + if inv_size == start_i then + start_i = math.max(0, inv_size - (3*8)) + end + end + elseif fields.creative_next then + start_i = start_i + 3*8 + if start_i >= inv_size then + start_i = 0 + end + end - if start_i < 0 then - start_i = start_i + 4*6 + creative.set_creative_formspec(player, start_i, start_i / (3*8) + 1, tab_id) end - if start_i >= creative_inventory.creative_inventory_size then - start_i = start_i - 4*6 - end - - if start_i < 0 or start_i >= creative_inventory.creative_inventory_size then - start_i = 0 - end - - creative_inventory.set_creative_formspec(player, start_i, start_i / (6*4) + 1) end) if minetest.setting_getbool("creative_mode") then @@ -146,7 +216,7 @@ if minetest.setting_getbool("creative_mode") then minetest.register_item(":", { type = "none", wield_image = "wieldhand.png", - wield_scale = {x=1,y=1,z=2.5}, + wield_scale = {x=1, y=1, z=2.5}, range = 10, tool_capabilities = { full_punch_interval = 0.5, @@ -161,18 +231,18 @@ if minetest.setting_getbool("creative_mode") then damage_groups = {fleshy = 10}, } }) - + minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack) return true end) - + function minetest.handle_node_drops(pos, drops, digger) if not digger or not digger:is_player() then return end local inv = digger:get_inventory() if inv then - for _,item in ipairs(drops) do + for _, item in ipairs(drops) do item = ItemStack(item):get_name() if not inv:contains_item("main", item) then inv:add_item("main", item) @@ -180,5 +250,4 @@ if minetest.setting_getbool("creative_mode") then end end end - end diff --git a/mods/creative/locale/de.txt b/mods/creative/locale/de.txt deleted file mode 100644 index 9565e85..0000000 --- a/mods/creative/locale/de.txt +++ /dev/null @@ -1 +0,0 @@ -Trash: = Müll: diff --git a/mods/creative/locale/el.txt b/mods/creative/locale/el.txt deleted file mode 100644 index 1d94c7d..0000000 --- a/mods/creative/locale/el.txt +++ /dev/null @@ -1 +0,0 @@ -Trash: = σκουπίδια: diff --git a/mods/creative/locale/fr.txt b/mods/creative/locale/fr.txt deleted file mode 100644 index 2eb15eb..0000000 --- a/mods/creative/locale/fr.txt +++ /dev/null @@ -1 +0,0 @@ -Trash: = Corbeille : diff --git a/mods/creative/locale/id.txt b/mods/creative/locale/id.txt deleted file mode 100644 index b719303..0000000 --- a/mods/creative/locale/id.txt +++ /dev/null @@ -1 +0,0 @@ -Trash: = Sampah: diff --git a/mods/creative/locale/nl.txt b/mods/creative/locale/nl.txt deleted file mode 100644 index f0aa45b..0000000 --- a/mods/creative/locale/nl.txt +++ /dev/null @@ -1 +0,0 @@ -Trash: = Afval: diff --git a/mods/creative/locale/template.txt b/mods/creative/locale/template.txt deleted file mode 100644 index ea03986..0000000 --- a/mods/creative/locale/template.txt +++ /dev/null @@ -1 +0,0 @@ -Trash: diff --git a/mods/creative/textures/creative_trash_icon.png b/mods/creative/textures/creative_trash_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e789ad634450a5fa5227e9efd8fe804703d3eece GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9E0AtzXqc3_Qw7LkED7=p zW^j0RBMrn!@^*J&=wOxg0CG4BJR*x37`TN&n2}-D90{Nxdx@v7EBgaRE>UjzKQU*6 zfkJAYE{-7_*OL=$4jfo=K;eJ8V`JyRfAY-?+|4IMbT~B5{cmn;WMp`p!KrFv-vct4 N!PC{xWt~$(69DO#EW-c* literal 0 HcmV?d00001