Update creative mod form Minetest Game

mods/creative/README.txt

@@ -1,5 +1,5 @@
-Minetest 0.4 mod: creative
-==========================
+Minetest Game mod: creative
+===========================
 
 Implements creative mode.
 

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

mods/creative/locale/de.txt

@@ -1 +0,0 @@
-Trash: = Müll:

mods/creative/locale/el.txt

@@ -1 +0,0 @@
-Trash: = σκουπίδια:

mods/creative/locale/fr.txt

@@ -1 +0,0 @@
-Trash: = Corbeille :

mods/creative/locale/id.txt

@@ -1 +0,0 @@
-Trash: = Sampah:

mods/creative/locale/nl.txt

@@ -1 +0,0 @@
-Trash: = Afval:

mods/creative/locale/template.txt

@@ -1 +0,0 @@
-Trash: