Add trigger definitions rather than register function

api.lua

@@ -14,9 +14,11 @@
 -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 --
 
-local S = awards.gettext
+local S, NS = awards.gettext, awards.ngettext
 
-dofile(minetest.get_modpath("awards").."/api_helpers.lua")
+awards.def = {}
+awards.on = {}
+awards.on_unlock = {}
 
 -- Table Save Load Functions
 function awards.save()
@@ -27,63 +29,59 @@ function awards.save()
 	end
 end
 
-function awards.init()
-	awards.players = awards.load()
-	awards.def = {}
-	awards.trigger_types = {}
-	awards.on = {}
-	awards.on_unlock = {}
-end
-
 function awards.load()
 	local file = io.open(minetest.get_worldpath().."/awards.txt", "r")
 	if file then
 		local table = minetest.deserialize(file:read("*all"))
 		if type(table) == "table" then
-			return table
+			awards.players = table
 		end
 	end
-	return {}
+	awards.players = {}
 end
+--
+-- local function make_on_reg_wrapper()
+-- 	return function(def)
+-- 		local tmp = {
+-- 			award  = def.name,
+-- 			key    = def.trigger.node,
+-- 			target = def.trigger.target,
+-- 		}
+-- 		table.insert(awards.on.dig, tmp)
+--
+-- 		function def:getProgress(data)
+-- 			local itemcount
+-- 			if tmp.key then
+-- 				itemcount = data["dig"][tmp.key] or 0
+-- 			else
+-- 				itemcount = awards.get_total_keyed_count(data, "dig")
+-- 			end
+-- 			return {
+-- 				perc = itemcount / tmp.target,
+-- 				label = S("@1/@2 dug", itemcount, tmp.target),
+-- 			}
+-- 		end
+--
+-- 		function def:getDefaultDescription()
+-- 			local n = self.trigger.target
+-- 			if self.trigger.node then
+-- 				local nname = minetest.registered_nodes[self.trigger.node].description
+-- 				if nname == nil then
+-- 					nname = self.trigger.node
+-- 				end
+-- 				-- Translators: @1 is count, @2 is description.
+-- 				return NS("Mine: @2", "Mine: @1×@2", n, n, nname)
+-- 			else
+-- 				return NS("Mine @1 block.", "Mine @1 blocks.", n, n)
+-- 			end
+-- 		end
+-- 	end
+-- end
 
-function awards.register_trigger(name, tfunc)
+local function run_trigger_callbacks(self, player, data, table_func)
-	awards.trigger_types[name] = tfunc
+	for i = 1, #self.on do
-	awards.on[name] = {}
-	awards['register_on_'..name] = function(func)
-		table.insert(awards.on[name], func)
-	end
-end
-
--- Registers a trigger which replies on counting
-function awards.register_trigger_counted(tname, tfunc)
-	awards.register_trigger(tname, tfunc)
-
-	local key = tname .. "s"
-
-	awards["notify_" .. tname] = function(player)
-		assert(player and player.is_player and player:is_player())
-		local name = player:get_player_name()
-
-		awards.assertPlayer(name)
-		local data = awards.players[name]
-
-		-- Increment counter
-		data[key] = data[key] + 1
-		local currentVal = data[key]
-
-		awards.run_trigger_callbacks(player, data, tname, function(entry)
-			if entry.target and entry.award and currentVal and
-					currentVal >= entry.target then
-				return entry.award
-			end
-		end)
-	end
-end
-
-function awards.run_trigger_callbacks(player, data, trigger, table_func)
-	for i = 1, #awards.on[trigger] do
 		local res = nil
-		local entry = awards.on[trigger][i]
+		local entry = self.on[i]
 		if type(entry) == "function" then
 			res = entry(player, data)
 		elseif type(entry) == "table" and entry.award then
@@ -96,42 +94,89 @@ function awards.run_trigger_callbacks(player, data, trigger, table_func)
 	end
 end
 
+function awards.register_trigger(tname, tdef)
+	if type(tdef) == "function" then
+		tdef = {
+			on_register = tdef
+		}
+	end
+	tdef.name = tname
+	tdef.run_callbacks = run_trigger_callbacks
+
+	if tdef.type == "counted" then
+		local datakey = tname .. "s"
+		local old_reg = tdef.on_register
+
+		function tdef:on_register(def)
+			local tmp = {
+				award  = def.name,
+				target = def.trigger.target,
+			}
+			tdef.register(tmp)
+
+			function def.getProgress(_, data)
+				local done = data[datakey] or 0
+				return {
+					perc = done / tmp.target,
+					label = S(tdef.progress, done, tmp.target),
+				}
+			end
+
+			function def.getDefaultDescription(_)
+				local n = self.trigger.target
+				return NS(tdef.auto_description[1], tdef.auto_description[2], n, n)
+			end
+
+			if old_reg then
+				return old_reg(tdef, def)
+			end
+		end
+
+		function tdef.notify(player)
+			assert(player and player.is_player and player:is_player())
+			local name = player:get_player_name()
+			local data = awards.player(name)
+			print(dump(data))
+
+			-- Increment counter
+			local currentVal = data[datakey] + 1
+			data[datakey] = currentVal
+
+			tdef:run_callbacks(player, data, function(entry)
+				if entry.target and entry.award and currentVal and
+						currentVal >= entry.target then
+					return entry.award
+				end
+			end)
+		end
+
+		awards["notify_" .. tname] = tdef.notify
+	end
+
+	awards.registered_triggers[tname] = tdef
+
+	tdef.on = {}
+	tdef.register = function(func)
+		table.insert(tdef.on, func)
+	end
+
+	-- Backwards compat
+	awards.on[tname] = tdef.on
+	awards['register_on_' .. tname] = tdef.register
+end
+
 function awards.increment_item_counter(data, field, itemname, count)
-	local name_split = string.split(itemname, ":")
+	itemname = minetest.registered_aliases[itemname] or itemname
-	if #name_split ~= 2 then
+	data[field][itemname] = (data[field][itemname] or 0) + 1
-		return false
-	end
-	local mod = name_split[1]
-	local item = name_split[2]
-
-	if data and field and mod and item then
-		awards.assertPlayer(data)
-		awards.tbv(data, field)
-		awards.tbv(data[field], mod)
-		awards.tbv(data[field][mod], item, 0)
-
-		data[field][mod][item] = data[field][mod][item] + (count or 1)
-		return true
-	else
-		return false
-	end
 end
 
 function awards.get_item_count(data, field, itemname)
-	local name_split = string.split(itemname, ":")
+	itemname = minetest.registered_aliases[itemname] or itemname
-	if #name_split ~= 2 then
+	return data[field][itemname] or 0
-		return false
+end
-	end
-	local mod = name_split[1]
-	local item = name_split[2]
 
-	if data and field and mod and item then
+function awards.get_total_keyed_count(data, field)
-		awards.assertPlayer(data)
+	return data[field].__total or 0
-		awards.tbv(data, field)
-		awards.tbv(data[field], mod)
-		awards.tbv(data[field][mod], item, 0)
-		return data[field][mod][item]
-	end
 end
 
 function awards.get_total_item_count(data, field)
@@ -154,23 +199,14 @@ function awards.register_on_unlock(func)
 	table.insert(awards.on_unlock, func)
 end
 
--- API Functions
-function awards._additional_triggers(name, def)
-	-- Depreciated!
-end
-
 function awards.register_achievement(name, def)
 	def.name = name
 
 	-- Add Triggers
 	if def.trigger and def.trigger.type then
-		local func = awards.trigger_types[def.trigger.type]
+		local tdef = awards.registered_triggers[def.trigger.type]
-
+		assert(tdef, "Trigger not found: " .. def.trigger.type)
-		if func then
+		tdef:on_register(def)
-			func(def)
-		else
-			awards._additional_triggers(name, def)
-		end
 	end
 
 	-- Add Award
@@ -515,7 +551,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	return true
 end)
 
-awards.init()
+awards.load()
 
 minetest.register_on_newplayer(function(player)
 	local playern = player:get_player_name()

api_helpers.lua

@@ -34,6 +34,7 @@ function awards.assertPlayer(playern)
 end
 
 function awards.player(name)
+	awards.assertPlayer(name)
 	return awards.players[name]
 end
 

awards.lua

@@ -0,0 +1,907 @@
+local S = awards.gettext
+
+-- Saint-Maclou
+if minetest.get_modpath("moreblocks") then
+	awards.register_achievement("award_saint_maclou",{
+		title = S("Saint-Maclou"),
+		description = S("Place 20 coal checkers."),
+		icon = "awards_novicebuilder.png",
+		trigger = {
+			type = "place",
+			node = "moreblocks:coal_checker",
+			target = 20
+		}
+	})
+
+	-- Castorama
+	awards.register_achievement("award_castorama",{
+		title = S("Castorama"),
+		description = S("Place 20 iron checkers."),
+		icon = "awards_novicebuilder.png",
+		trigger = {
+			type = "place",
+			node = "moreblocks:iron_checker",
+			target = 20
+		}
+	})
+
+	-- Sam the Trapper
+	awards.register_achievement("award_sam_the_trapper",{
+		title = S("Sam the Trapper"),
+		description = S("Place 2 trap stones."),
+		icon = "awards_novicebuilder.png",
+		trigger = {
+			type = "place",
+			node = "moreblocks:trap_stone",
+			target = 2
+		}
+	})
+end
+
+-- This award can't be part of Unified Inventory, it would make a circular dependency
+if minetest.get_modpath("unified_inventory") then
+	if minetest.get_all_craft_recipes("unified_inventory:bag_large") ~= nil then
+		awards.register_achievement("awards_ui_bags", {
+			title = S("Backpacker"),
+			description = S("Craft 4 large bags."),
+			icon = "awards_ui_bags.png",
+			trigger = {
+				type = "craft",
+				item = "unified_inventory:bag_large",
+				target = 4
+			}
+		})
+	end
+end
+
+if minetest.get_modpath("fire") then
+	awards.register_achievement("awards_pyro", {
+		title = S("Pyromaniac"),
+		description = S("Craft 8 times flint and steel."),
+		icon = "fire_flint_steel.png",
+		trigger = {
+			type = "craft",
+			item = "fire:flint_and_steel",
+			target = 8
+		}
+	})
+	if minetest.settings:get_bool("disable_fire") ~= true then
+		awards.register_achievement("awards_firefighter", {
+			title = S("Firefighter"),
+			description = S("Put out 1000 fires."),
+			icon = "awards_firefighter.png",
+			trigger = {
+				type = "dig",
+				node = "fire:basic_flame",
+				target = 1000
+			}
+		})
+	end
+end
+
+if minetest.get_modpath("default") then
+	-- Light it up
+	awards.register_achievement("award_lightitup",{
+		title = S("Light It Up"),
+		description = S("Place 100 torches."),
+		icon = "awards_novicebuilder.png^awards_level1.png",
+		trigger = {
+			type = "place",
+			node = "default:torch",
+			target = 100
+		}
+	})
+
+	-- Light ALL the things!
+	awards.register_achievement("award_well_lit",{
+		title = S("Well Lit"),
+		description = S("Place 1,000 torches."),
+		icon = "awards_novicebuilder.png^awards_level2.png",
+		trigger = {
+			type = "place",
+			node = "default:torch",
+			target = 1000
+		}
+	})
+
+	awards.register_achievement("award_meselamp",{
+		title = S("Really Well Lit"),
+		description = S("Craft 10 mese lamps."),
+		icon = "default_meselamp.png",
+		trigger = {
+			type = "craft",
+			item = "default:meselamp",
+			target = 10
+		}
+	})
+
+	awards.register_achievement("awards_stonebrick", {
+		title = S("Outpost"),
+		description = S("Craft 200 stone bricks."),
+		icon = "default_stone_brick.png^awards_level1.png",
+		trigger = {
+			type = "craft",
+			item = "default:stonebrick",
+			target = 200
+		}
+	})
+
+	awards.register_achievement("awards_stonebrick2", {
+		title = S("Watchtower"),
+		description = S("Craft 800 stone bricks."),
+		icon = "default_stone_brick.png^awards_level2.png",
+		trigger = {
+			type = "craft",
+			item = "default:stonebrick",
+			target = 800
+		}
+	})
+
+	awards.register_achievement("awards_stonebrick3", {
+		title = S("Fortress"),
+		description = S("Craft 3,200 stone bricks."),
+		icon = "default_stone_brick.png^awards_level3.png",
+		trigger = {
+			type = "craft",
+			item = "default:stonebrick",
+			target = 3200
+		}
+	})
+
+	awards.register_achievement("awards_desert_stonebrick", {
+		title = S("Desert Dweller"),
+		description = S("Craft 400 desert stone bricks."),
+		icon = "default_desert_stone_brick.png",
+		trigger = {
+			type = "craft",
+			item = "default:desert_stonebrick",
+			target = 400
+		}
+	})
+
+	awards.register_achievement("awards_desertstonebrick", {
+		title = S("Pharaoh"),
+		description = S("Craft 100 sandstone bricks."),
+		icon = "default_sandstone_brick.png",
+		trigger = {
+			type = "craft",
+			item = "default:sandstonebrick",
+			target = 100
+		}
+	})
+
+	awards.register_achievement("awards_bookshelf", {
+		title = S("Little Library"),
+		description = S("Craft 7 bookshelves."),
+		icon = "default_bookshelf.png",
+		trigger = {
+			type = "craft",
+			item = "default:bookshelf",
+			target = 7
+		}
+	})
+
+	awards.register_achievement("awards_obsidian", {
+		title = S("Lava and Water"),
+		description = S("Mine your first obsidian."),
+		icon = "default_obsidian.png^awards_level1.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:obsidian",
+			target = 1
+		}
+	})
+
+	-- Obsessed with Obsidian
+	awards.register_achievement("award_obsessed_with_obsidian",{
+		title = S("Obsessed with Obsidian"),
+		description = S("Mine 50 obsidian."),
+		icon = "default_obsidian.png^awards_level2.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:obsidian",
+			target = 50
+		}
+	})
+
+	-- Proof that player has found lava
+	awards.register_achievement("award_lavaminer",{
+		title = S("Lava Miner"),
+		description = S("Mine any block while being very close to lava."),
+		background = "awards_bg_mining.png",
+		icon = "default_lava.png",
+	})
+	awards.register_on_dig(function(player,data)
+		local pos = player:getpos()
+		if pos and (minetest.find_node_near(pos, 1, "default:lava_source") ~= nil or
+		minetest.find_node_near(pos, 1, "default:lava_flowing") ~= nil) then
+			return "award_lavaminer"
+		end
+		return nil
+	end)
+
+	-- On the way
+	awards.register_achievement("award_on_the_way", {
+		title = S("On The Way"),
+		description = S("Place 100 rails."),
+		icon = "carts_rail_straight.png",
+		trigger = {
+			type = "place",
+			node = "default:rail",
+			target = 100
+		}
+	})
+
+	awards.register_achievement("award_lumberjack_firstday", {
+		title = S("First Day in the Woods"),
+		description = S("Dig 6 tree blocks."),
+		icon = "default_tree.png^awards_level1.png",
+		trigger = {
+			type = "dig",
+			node = "default:tree",
+			target = 6
+		}
+	})
+
+	-- Lumberjack
+	awards.register_achievement("award_lumberjack", {
+		title = S("Lumberjack"),
+		description = S("Dig 36 tree blocks."),
+		icon = "default_tree.png^awards_level2.png",
+		trigger = {
+			type = "dig",
+			node = "default:tree",
+			target = 36
+		}
+	})
+
+	-- Semi-pro Lumberjack
+	awards.register_achievement("award_lumberjack_semipro", {
+		title = S("Semi-pro Lumberjack"),
+		description = S("Dig 216 tree blocks."),
+		icon = "default_tree.png^awards_level3.png",
+		trigger = {
+			type = "dig",
+			node = "default:tree",
+			target = 216
+		}
+	})
+
+	-- Professional Lumberjack
+	awards.register_achievement("award_lumberjack_professional", {
+		title = S("Professional Lumberjack"),
+		description = S("Dig 1,296 tree blocks."),
+		icon = "default_tree.png^awards_level4.png",
+		trigger = {
+			type = "dig",
+			node = "default:tree",
+			target = 1296
+		}
+	})
+
+	-- Junglebaby
+	awards.register_achievement("award_junglebaby", {
+		title = S("Junglebaby"),
+		description = S("Dig 100 jungle tree blocks."),
+		icon = "default_jungletree.png^awards_level1.png",
+		trigger = {
+			type = "dig",
+			node = "default:jungletree",
+			target = 100
+		}
+	})
+
+	-- Jungleman
+	awards.register_achievement("award_jungleman", {
+		title = S("Jungleman"),
+		description = S("Dig 1,000 jungle tree blocks."),
+		icon = "default_jungletree.png^awards_level2.png",
+		trigger = {
+			type = "dig",
+			node = "default:jungletree",
+			target = 1000
+		}
+	})
+
+	-- Found some Mese!
+	awards.register_achievement("award_mesefind", {
+		title = S("First Mese Find"),
+		description = S("Mine your first mese ore."),
+		icon = "default_stone.png^default_mineral_mese.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_mese",
+			target = 1
+		}
+	})
+
+	-- Mese Block
+	awards.register_achievement("award_meseblock", {
+		secret = true,
+		title = S("Mese Mastery"),
+		description = S("Mine a mese block."),
+		icon = "default_mese_block.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:mese",
+			target = 1
+		}
+	})
+
+	-- You're a copper
+	awards.register_achievement("award_youre_a_copper", {
+		title = S("You’re a copper"),
+		description = S("Dig 1,000 copper ores."),
+		icon = "default_stone.png^default_mineral_copper.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_copper",
+			target = 1000
+		}
+	})
+
+	-- Found a Nyan cat!
+	awards.register_achievement("award_nyanfind", {
+		secret = true,
+		title = S("A Cat in a Pop-Tart?!"),
+		description = S("Mine a nyan cat."),
+		icon = "nyancat_front.png",
+		trigger = {
+			type = "dig",
+			node = "default:nyancat",
+			target = 1
+		}
+	})
+
+	-- Mini Miner
+	awards.register_achievement("award_mine2", {
+		title = S("Mini Miner"),
+		description = S("Dig 100 stone blocks."),
+		icon = "awards_miniminer.png^awards_level1.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone",
+			target = 100
+		}
+	})
+
+	-- Hardened Miner
+	awards.register_achievement("award_mine3", {
+		title = S("Hardened Miner"),
+		description = S("Dig 1,000 stone blocks."),
+		icon = "awards_miniminer.png^awards_level2.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone",
+			target = 1000
+		}
+	})
+
+	-- Master Miner
+	awards.register_achievement("award_mine4", {
+		title = S("Master Miner"),
+		description = S("Dig 10,000 stone blocks."),
+		icon = "awards_miniminer.png^awards_level3.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone",
+			target = 10000
+		}
+	})
+
+	-- Marchand de sable
+	awards.register_achievement("award_marchand_de_sable", {
+		title = S("Marchand De Sable"),
+		description = S("Dig 1,000 sand."),
+		icon = "default_sand.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:sand",
+			target = 1000
+		}
+	})
+
+	awards.register_achievement("awards_crafter_of_sticks", {
+		title = S("Crafter of Sticks"),
+		description = S("Craft 100 sticks."),
+		icon = "default_stick.png",
+		trigger = {
+			type = "craft",
+			item = "default:stick",
+			target = 100
+		}
+	})
+
+	awards.register_achievement("awards_junglegrass", {
+		title = S("Jungle Discoverer"),
+		description = S("Mine your first jungle grass."),
+		icon = "default_junglegrass.png",
+		trigger = {
+			type = "dig",
+			node = "default:junglegrass",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("awards_grass", {
+		title = S("Grasslands Discoverer"),
+		description = S("Mine some grass."),
+		icon = "default_grass_3.png",
+		trigger = {
+			type = "dig",
+			node = "default:grass_1",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("awards_dry_grass", {
+		title = S("Savannah Discoverer"),
+		description = S("Mine some dry grass."),
+		icon = "default_dry_grass_3.png",
+		trigger = {
+			type = "dig",
+			node = "default:dry_grass_3",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("awards_cactus", {
+		title = S("Desert Discoverer"),
+		description = S("Mine your first cactus."),
+		icon = "default_cactus_side.png",
+		trigger = {
+			type = "dig",
+			node = "default:cactus",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("awards_dry_shrub", {
+		title = S("Far Lands"),
+		description = S("Mine your first dry shrub."),
+		icon = "default_dry_shrub.png",
+		trigger = {
+			type = "dig",
+			node = "default:dry_shrub",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("awards_ice", {
+		title = S("Glacier Discoverer"),
+		description = S("Mine your first ice."),
+		icon = "default_ice.png",
+		trigger = {
+			type = "dig",
+			node = "default:ice",
+			target = 1
+		}
+	})
+
+	-- Proof that player visited snowy lands
+	awards.register_achievement("awards_snowblock", {
+		title = S("Very Simple Snow Man"),
+		description = S("Place two snow blocks."),
+		icon = "default_snow.png",
+		trigger = {
+			type = "place",
+			node = "default:snowblock",
+			target = 2
+		}
+	})
+
+	awards.register_achievement("awards_gold_ore", {
+		title = S("First Gold Find"),
+		description = S("Mine your first gold ore."),
+		icon = "default_stone.png^default_mineral_gold.png^awards_level1.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_gold",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("awards_gold_rush", {
+		title = S("Gold Rush"),
+		description = S("Mine 45 gold ores."),
+		icon = "default_stone.png^default_mineral_gold.png^awards_level2.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_gold",
+			target = 45
+		}
+	})
+
+	awards.register_achievement("awards_diamond_ore", {
+		title = S("Wow, I am Diamonds!"),
+		description = S("Mine your first diamond ore."),
+		icon = "default_stone.png^default_mineral_diamond.png^awards_level1.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_diamond",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("awards_diamond_rush", {
+		title = S("Girl's Best Friend"),
+		description = S("Mine 18 diamond ores."),
+		icon = "default_stone.png^default_mineral_diamond.png^awards_level2.png",
+		background = "awards_bg_mining.png",
+		trigger = {
+			type = "dig",
+			node = "default:stone_with_diamond",
+			target = 18
+		}
+	})
+
+	awards.register_achievement("awards_diamondblock", {
+		title = S("Hardest Block on Earth"),
+		description = S("Craft a diamond block."),
+		icon = "default_diamond_block.png",
+		trigger = {
+			type = "craft",
+			item = "default:diamondblock",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("awards_mossycobble", {
+		title = S("In the Dungeon"),
+		description = S("Mine a mossy cobblestone."),
+		icon = "default_mossycobble.png",
+		trigger = {
+			type = "dig",
+			node = "default:mossycobble",
+			target = 1
+		}
+	})
+
+	awards.register_achievement("award_furnace", {
+		title = S("Smelter"),
+		description = S("Craft 10 furnaces."),
+		icon = "default_furnace_front.png",
+		trigger = {
+			type = "craft",
+			item= "default:furnace",
+			target = 10
+		}
+	})
+
+	awards.register_achievement("award_chest", {
+		title = S("Treasurer"),
+		description = S("Craft 15 chests."),
+		icon = "default_chest_front.png",
+		trigger = {
+			type = "craft",
+			item= "default:chest",
+			target = 15
+		}
+	})
+
+	awards.register_achievement("award_chest2", {
+		title = S("Bankier"),
+		description = S("Craft 30 locked chests."),
+		icon = "default_chest_lock.png",
+		trigger = {
+			type = "craft",
+			item= "default:chest_locked",
+			target = 30
+		}
+	})
+
+	awards.register_achievement("award_brick", {
+		title = S("Bricker"),
+		description = S("Craft 200 brick blocks."),
+		icon = "default_brick.png",
+		trigger = {
+			type = "craft",
+			item= "default:brick",
+			target = 200
+		}
+	})
+
+	awards.register_achievement("award_obsidianbrick", {
+		title = S("House of Obsidian"),
+		description = S("Craft 100 obsidian bricks."),
+		icon = "default_obsidian_brick.png",
+		trigger = {
+			type = "craft",
+			item= "default:obsidianbrick",
+			target = 100
+		}
+	})
+
+	awards.register_achievement("award_placestone", {
+		title = S("Build a Cave"),
+		description = S("Place 100 stone."),
+		icon = "default_stone.png",
+		trigger = {
+			type = "place",
+			node = "default:stone",
+			target = 100
+		}
+	})
+
+	awards.register_achievement("award_woodladder", {
+		title = S("Long Ladder"),
+		description = S("Place 400 wooden ladders."),
+		icon = "default_ladder_wood.png",
+		trigger = {
+			type = "place",
+			node = "default:ladder_wood",
+			target = 400
+		}
+	})
+
+	awards.register_achievement("award_steelladder", {
+		title = S("Industrial Age"),
+		description = S("Place 40 steel ladders."),
+		icon = "default_ladder_steel.png",
+		trigger = {
+			type = "place",
+			node = "default:ladder_steel",
+			target = 40
+		}
+	})
+
+	awards.register_achievement("award_apples", {
+		title = S("Yummy!"),
+		description = S("Eat 80 apples."),
+		icon = "default_apple.png",
+		trigger = {
+			type = "eat",
+			item = "default:apple",
+			target = 80
+		}
+	})
+end
+
+if minetest.get_modpath("vessels") then
+	awards.register_achievement("award_vessels_shelf", {
+		title = S("Glasser"),
+		icon = "vessels_shelf.png",
+		description = S("Craft 14 vessels shelves."),
+		trigger = {
+			type = "craft",
+			item= "vessels:shelf",
+			target = 14
+		}
+	})
+end
+
+if minetest.get_modpath("farming") then
+	awards.register_achievement("awards_farmer", {
+		title = S("Farming Skills Acquired"),
+		description = S("Harvest a fully grown wheat plant."),
+		icon = "farming_wheat_8.png^awards_level1.png",
+		trigger = {
+			type = "dig",
+			node = "farming:wheat_8",
+			target = 1
+		}
+	})
+	awards.register_achievement("awards_farmer2", {
+		title = S("Field Worker"),
+		description = S("Harvest 25 fully grown wheat plants."),
+		icon = "farming_wheat_8.png^awards_level2.png",
+		trigger = {
+			type = "dig",
+			node = "farming:wheat_8",
+			target = 25
+		}
+	})
+
+	awards.register_achievement("awards_farmer3", {
+		title = S("Aspiring Farmer"),
+		description = S("Harvest 125 fully grown wheat plants."),
+		icon = "farming_wheat_8.png^awards_level3.png",
+		trigger = {
+			type = "dig",
+			node = "farming:wheat_8",
+			target = 125
+		}
+	})
+
+	awards.register_achievement("awards_farmer4", {
+		title = S("Wheat Magnate"),
+		description = S("Harvest 625 fully grown wheat plants."),
+		icon = "farming_wheat_8.png^awards_level4.png",
+		trigger = {
+			type = "dig",
+			node = "farming:wheat_8",
+			target = 625
+		}
+	})
+
+	awards.register_achievement("award_bread", {
+		title = S("Baker"),
+		description = S("Eat 10 loaves of bread."),
+		icon = "farming_bread.png",
+		trigger = {
+			type = "eat",
+			item = "farming:bread",
+			target = 10
+		}
+	})
+
+end
+
+if minetest.get_modpath("wool") and minetest.get_modpath("farming") then
+	awards.register_achievement("awards_wool", {
+		title = S("Wool Over Your Eyes"),
+		description = S("Craft 250 white wool."),
+		icon = "wool_white.png",
+		trigger = {
+			type = "craft",
+			item = "wool:white",
+			target = 250
+		}
+	})
+end
+
+if minetest.get_modpath("beds") then
+	awards.register_achievement("award_bed", {
+		title = S("Hotelier"),
+		description = S("Craft 15 fancy beds."),
+		icon = "beds_bed_fancy.png",
+		trigger = {
+			type = "craft",
+			item= "beds:fancy_bed_bottom",
+			target = 15
+		}
+	})
+end
+
+if minetest.get_modpath("stairs") then
+	awards.register_achievement("award_stairs_goldblock", {
+		title = S("Filthy Rich"),
+		description = S("Craft 24 gold block stairs."),
+		icon = "default_gold_block.png",
+		trigger = {
+			type = "craft",
+			item= "stairs:stair_goldblock",
+			target = 24
+		}
+	})
+end
+
+if minetest.get_modpath("dye") then
+	awards.register_achievement("awards_dye_red", {
+		title = S("Roses Are Red"),
+		description = S("Craft 400 red dyes."),
+		icon = "dye_red.png",
+		trigger = {
+			type = "craft",
+			item = "dye:red",
+			target = 400
+		}
+	})
+
+	awards.register_achievement("awards_dye_yellow", {
+		title = S("Dandelions are Yellow"),
+		description = S("Craft 400 yellow dyes."),
+		icon = "dye_yellow.png",
+		trigger = {
+			type = "craft",
+			item = "dye:yellow",
+			target = 400
+		}
+	})
+
+	awards.register_achievement("awards_dye_blue", {
+		title = S("Geraniums are Blue"),
+		description = S("Craft 400 blue dyes."),
+		icon = "dye_blue.png",
+		trigger = {
+			type = "craft",
+			item= "dye:blue",
+			target = 400
+		}
+	})
+
+	awards.register_achievement("awards_dye_white", {
+		title = S("White Color Stock"),
+		description = S("Craft 100 white dyes."),
+		icon = "dye_white.png",
+		trigger = {
+			type = "craft",
+			item= "dye:white",
+			target = 100
+		}
+	})
+end
+
+if minetest.get_modpath("flowers") then
+	awards.register_achievement("awards_brown_mushroom1", {
+		title = S("Tasty Mushrooms"),
+		description = S("Eat 3 brown mushrooms."),
+		icon = "flowers_mushroom_brown.png^awards_level1.png",
+		trigger = {
+			type = "eat",
+			item= "flowers:mushroom_brown",
+			target = 3,
+		}
+	})
+	awards.register_achievement("awards_brown_mushroom2", {
+		title = S("Mushroom Lover"),
+		description = S("Eat 33 brown mushrooms."),
+		icon = "flowers_mushroom_brown.png^awards_level2.png",
+		trigger = {
+			type = "eat",
+			item= "flowers:mushroom_brown",
+			target = 33,
+		}
+	})
+	awards.register_achievement("awards_brown_mushroom3", {
+		title = S("Underground Mushroom Farmer"),
+		description = S("Eat 333 brown mushrooms."),
+		icon = "flowers_mushroom_brown.png^awards_level3.png",
+		trigger = {
+			type = "eat",
+			item= "flowers:mushroom_brown",
+			target = 333,
+		}
+	})
+end
+
+-- This ensures the following code is executed after all items have been registered
+minetest.after(0, function()
+	-- Check whether there is at least one node which can be built by the player
+	local building_is_possible = false
+	for _, def in pairs(minetest.registered_nodes) do
+		if (def.description and def.pointable ~= false and not def.groups.not_in_creative_inventory) then
+			building_is_possible = true
+			break
+		end
+	end
+
+	-- The following awards require at least one node which can be built
+	if not building_is_possible then
+		return
+	end
+
+	awards.register_achievement("awards_builder1", {
+		title = S("Builder"),
+		icon = "awards_house.png^awards_level1.png",
+		trigger = {
+			type = "place",
+			target = 1000,
+		},
+	})
+	awards.register_achievement("awards_builder2", {
+		title = S("Constructor"),
+		icon = "awards_house.png^awards_level2.png",
+		trigger = {
+			type = "place",
+			target = 5000,
+		},
+	})
+	awards.register_achievement("awards_builder3", {
+		title = S("Architect"),
+		icon = "awards_house.png^awards_level3.png",
+		trigger = {
+			type = "place",
+			target = 10000,
+		},
+	})
+	awards.register_achievement("awards_builder4", {
+		title = S("Master Architect"),
+		icon = "awards_house.png^awards_level4.png",
+		trigger = {
+			type = "place",
+			target = 25000,
+		},
+	})
+end)

init.lua

@@ -16,922 +16,26 @@
 
 -- The global award namespace
 awards = {
-	show_mode = "hud"
+	show_mode = "hud",
+	registered_triggers = {},
 }
 
 -- Internationalization support.
-local S, NS = dofile(minetest.get_modpath("awards").."/intllib.lua")
+awards.gettext, awards.ngettext = dofile(minetest.get_modpath("awards").."/intllib.lua")
-
+dofile(minetest.get_modpath("awards").."/api_helpers.lua")
-awards.gettext, awards.ngettext = S, NS
-
 dofile(minetest.get_modpath("awards").."/api.lua")
 dofile(minetest.get_modpath("awards").."/chat_commands.lua")
 dofile(minetest.get_modpath("awards").."/sfinv.lua")
 dofile(minetest.get_modpath("awards").."/unified_inventory.lua")
 dofile(minetest.get_modpath("awards").."/triggers.lua")
-
+-- dofile(minetest.get_modpath("awards").."/awards.lua")
--- Saint-Maclou
+
-if minetest.get_modpath("moreblocks") then
+awards.register_achievement("award_saint_maclou",{
-	awards.register_achievement("award_saint_maclou",{
+	title = "Saint-Maclou",
-		title = S("Saint-Maclou"),
+	description = "Place 20 coal checkers.",
-		description = S("Place 20 coal checkers."),
+	icon = "awards_novicebuilder.png",
-		icon = "awards_novicebuilder.png",
+	trigger = {
-		trigger = {
+		type = "chat",
-			type = "place",
+		target = 3,
-			node = "moreblocks:coal_checker",
+	},
-			target = 20
+})
-		}
-	})
-
-	-- Castorama
-	awards.register_achievement("award_castorama",{
-		title = S("Castorama"),
-		description = S("Place 20 iron checkers."),
-		icon = "awards_novicebuilder.png",
-		trigger = {
-			type = "place",
-			node = "moreblocks:iron_checker",
-			target = 20
-		}
-	})
-
-	-- Sam the Trapper
-	awards.register_achievement("award_sam_the_trapper",{
-		title = S("Sam the Trapper"),
-		description = S("Place 2 trap stones."),
-		icon = "awards_novicebuilder.png",
-		trigger = {
-			type = "place",
-			node = "moreblocks:trap_stone",
-			target = 2
-		}
-	})
-end
-
--- This award can't be part of Unified Inventory, it would make a circular dependency
-if minetest.get_modpath("unified_inventory") then
-	if minetest.get_all_craft_recipes("unified_inventory:bag_large") ~= nil then
-		awards.register_achievement("awards_ui_bags", {
-			title = S("Backpacker"),
-			description = S("Craft 4 large bags."),
-			icon = "awards_ui_bags.png",
-			trigger = {
-				type = "craft",
-				item = "unified_inventory:bag_large",
-				target = 4
-			}
-		})
-	end
-end
-
-if minetest.get_modpath("fire") then
-	awards.register_achievement("awards_pyro", {
-		title = S("Pyromaniac"),
-		description = S("Craft 8 times flint and steel."),
-		icon = "fire_flint_steel.png",
-		trigger = {
-			type = "craft",
-			item = "fire:flint_and_steel",
-			target = 8
-		}
-	})
-	if minetest.settings:get_bool("disable_fire") ~= true then
-		awards.register_achievement("awards_firefighter", {
-			title = S("Firefighter"),
-			description = S("Put out 1000 fires."),
-			icon = "awards_firefighter.png",
-			trigger = {
-				type = "dig",
-				node = "fire:basic_flame",
-				target = 1000
-			}
-		})
-	end
-end
-
-if minetest.get_modpath("default") then
-	-- Light it up
-	awards.register_achievement("award_lightitup",{
-		title = S("Light It Up"),
-		description = S("Place 100 torches."),
-		icon = "awards_novicebuilder.png^awards_level1.png",
-		trigger = {
-			type = "place",
-			node = "default:torch",
-			target = 100
-		}
-	})
-
-	-- Light ALL the things!
-	awards.register_achievement("award_well_lit",{
-		title = S("Well Lit"),
-		description = S("Place 1,000 torches."),
-		icon = "awards_novicebuilder.png^awards_level2.png",
-		trigger = {
-			type = "place",
-			node = "default:torch",
-			target = 1000
-		}
-	})
-
-	awards.register_achievement("award_meselamp",{
-		title = S("Really Well Lit"),
-		description = S("Craft 10 mese lamps."),
-		icon = "default_meselamp.png",
-		trigger = {
-			type = "craft",
-			item = "default:meselamp",
-			target = 10
-		}
-	})
-
-	awards.register_achievement("awards_stonebrick", {
-		title = S("Outpost"),
-		description = S("Craft 200 stone bricks."),
-		icon = "default_stone_brick.png^awards_level1.png",
-		trigger = {
-			type = "craft",
-			item = "default:stonebrick",
-			target = 200
-		}
-	})
-
-	awards.register_achievement("awards_stonebrick2", {
-		title = S("Watchtower"),
-		description = S("Craft 800 stone bricks."),
-		icon = "default_stone_brick.png^awards_level2.png",
-		trigger = {
-			type = "craft",
-			item = "default:stonebrick",
-			target = 800
-		}
-	})
-
-	awards.register_achievement("awards_stonebrick3", {
-		title = S("Fortress"),
-		description = S("Craft 3,200 stone bricks."),
-		icon = "default_stone_brick.png^awards_level3.png",
-		trigger = {
-			type = "craft",
-			item = "default:stonebrick",
-			target = 3200
-		}
-	})
-
-	awards.register_achievement("awards_desert_stonebrick", {
-		title = S("Desert Dweller"),
-		description = S("Craft 400 desert stone bricks."),
-		icon = "default_desert_stone_brick.png",
-		trigger = {
-			type = "craft",
-			item = "default:desert_stonebrick",
-			target = 400
-		}
-	})
-
-	awards.register_achievement("awards_desertstonebrick", {
-		title = S("Pharaoh"),
-		description = S("Craft 100 sandstone bricks."),
-		icon = "default_sandstone_brick.png",
-		trigger = {
-			type = "craft",
-			item = "default:sandstonebrick",
-			target = 100
-		}
-	})
-
-	awards.register_achievement("awards_bookshelf", {
-		title = S("Little Library"),
-		description = S("Craft 7 bookshelves."),
-		icon = "default_bookshelf.png",
-		trigger = {
-			type = "craft",
-			item = "default:bookshelf",
-			target = 7
-		}
-	})
-
-	awards.register_achievement("awards_obsidian", {
-		title = S("Lava and Water"),
-		description = S("Mine your first obsidian."),
-		icon = "default_obsidian.png^awards_level1.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:obsidian",
-			target = 1
-		}
-	})
-
-	-- Obsessed with Obsidian
-	awards.register_achievement("award_obsessed_with_obsidian",{
-		title = S("Obsessed with Obsidian"),
-		description = S("Mine 50 obsidian."),
-		icon = "default_obsidian.png^awards_level2.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:obsidian",
-			target = 50
-		}
-	})
-
-	-- Proof that player has found lava
-	awards.register_achievement("award_lavaminer",{
-		title = S("Lava Miner"),
-		description = S("Mine any block while being very close to lava."),
-		background = "awards_bg_mining.png",
-		icon = "default_lava.png",
-	})
-	awards.register_on_dig(function(player,data)
-		local pos = player:getpos()
-		if pos and (minetest.find_node_near(pos, 1, "default:lava_source") ~= nil or
-		minetest.find_node_near(pos, 1, "default:lava_flowing") ~= nil) then
-			return "award_lavaminer"
-		end
-		return nil
-	end)
-
-	-- On the way
-	awards.register_achievement("award_on_the_way", {
-		title = S("On The Way"),
-		description = S("Place 100 rails."),
-		icon = "carts_rail_straight.png",
-		trigger = {
-			type = "place",
-			node = "default:rail",
-			target = 100
-		}
-	})
-
-	awards.register_achievement("award_lumberjack_firstday", {
-		title = S("First Day in the Woods"),
-		description = S("Dig 6 tree blocks."),
-		icon = "default_tree.png^awards_level1.png",
-		trigger = {
-			type = "dig",
-			node = "default:tree",
-			target = 6
-		}
-	})
-
-	-- Lumberjack
-	awards.register_achievement("award_lumberjack", {
-		title = S("Lumberjack"),
-		description = S("Dig 36 tree blocks."),
-		icon = "default_tree.png^awards_level2.png",
-		trigger = {
-			type = "dig",
-			node = "default:tree",
-			target = 36
-		}
-	})
-
-	-- Semi-pro Lumberjack
-	awards.register_achievement("award_lumberjack_semipro", {
-		title = S("Semi-pro Lumberjack"),
-		description = S("Dig 216 tree blocks."),
-		icon = "default_tree.png^awards_level3.png",
-		trigger = {
-			type = "dig",
-			node = "default:tree",
-			target = 216
-		}
-	})
-
-	-- Professional Lumberjack
-	awards.register_achievement("award_lumberjack_professional", {
-		title = S("Professional Lumberjack"),
-		description = S("Dig 1,296 tree blocks."),
-		icon = "default_tree.png^awards_level4.png",
-		trigger = {
-			type = "dig",
-			node = "default:tree",
-			target = 1296
-		}
-	})
-
-	-- Junglebaby
-	awards.register_achievement("award_junglebaby", {
-		title = S("Junglebaby"),
-		description = S("Dig 100 jungle tree blocks."),
-		icon = "default_jungletree.png^awards_level1.png",
-		trigger = {
-			type = "dig",
-			node = "default:jungletree",
-			target = 100
-		}
-	})
-
-	-- Jungleman
-	awards.register_achievement("award_jungleman", {
-		title = S("Jungleman"),
-		description = S("Dig 1,000 jungle tree blocks."),
-		icon = "default_jungletree.png^awards_level2.png",
-		trigger = {
-			type = "dig",
-			node = "default:jungletree",
-			target = 1000
-		}
-	})
-
-	-- Found some Mese!
-	awards.register_achievement("award_mesefind", {
-		title = S("First Mese Find"),
-		description = S("Mine your first mese ore."),
-		icon = "default_stone.png^default_mineral_mese.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:stone_with_mese",
-			target = 1
-		}
-	})
-
-	-- Mese Block
-	awards.register_achievement("award_meseblock", {
-		secret = true,
-		title = S("Mese Mastery"),
-		description = S("Mine a mese block."),
-		icon = "default_mese_block.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:mese",
-			target = 1
-		}
-	})
-
-	-- You're a copper
-	awards.register_achievement("award_youre_a_copper", {
-		title = S("You’re a copper"),
-		description = S("Dig 1,000 copper ores."),
-		icon = "default_stone.png^default_mineral_copper.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:stone_with_copper",
-			target = 1000
-		}
-	})
-
-	-- Found a Nyan cat!
-	awards.register_achievement("award_nyanfind", {
-		secret = true,
-		title = S("A Cat in a Pop-Tart?!"),
-		description = S("Mine a nyan cat."),
-		icon = "nyancat_front.png",
-		trigger = {
-			type = "dig",
-			node = "default:nyancat",
-			target = 1
-		}
-	})
-
-	-- Mini Miner
-	awards.register_achievement("award_mine2", {
-		title = S("Mini Miner"),
-		description = S("Dig 100 stone blocks."),
-		icon = "awards_miniminer.png^awards_level1.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:stone",
-			target = 100
-		}
-	})
-
-	-- Hardened Miner
-	awards.register_achievement("award_mine3", {
-		title = S("Hardened Miner"),
-		description = S("Dig 1,000 stone blocks."),
-		icon = "awards_miniminer.png^awards_level2.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:stone",
-			target = 1000
-		}
-	})
-
-	-- Master Miner
-	awards.register_achievement("award_mine4", {
-		title = S("Master Miner"),
-		description = S("Dig 10,000 stone blocks."),
-		icon = "awards_miniminer.png^awards_level3.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:stone",
-			target = 10000
-		}
-	})
-
-	-- Marchand de sable
-	awards.register_achievement("award_marchand_de_sable", {
-		title = S("Marchand De Sable"),
-		description = S("Dig 1,000 sand."),
-		icon = "default_sand.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:sand",
-			target = 1000
-		}
-	})
-
-	awards.register_achievement("awards_crafter_of_sticks", {
-		title = S("Crafter of Sticks"),
-		description = S("Craft 100 sticks."),
-		icon = "default_stick.png",
-		trigger = {
-			type = "craft",
-			item = "default:stick",
-			target = 100
-		}
-	})
-
-	awards.register_achievement("awards_junglegrass", {
-		title = S("Jungle Discoverer"),
-		description = S("Mine your first jungle grass."),
-		icon = "default_junglegrass.png",
-		trigger = {
-			type = "dig",
-			node = "default:junglegrass",
-			target = 1
-		}
-	})
-
-	awards.register_achievement("awards_grass", {
-		title = S("Grasslands Discoverer"),
-		description = S("Mine some grass."),
-		icon = "default_grass_3.png",
-		trigger = {
-			type = "dig",
-			node = "default:grass_1",
-			target = 1
-		}
-	})
-
-	awards.register_achievement("awards_dry_grass", {
-		title = S("Savannah Discoverer"),
-		description = S("Mine some dry grass."),
-		icon = "default_dry_grass_3.png",
-		trigger = {
-			type = "dig",
-			node = "default:dry_grass_3",
-			target = 1
-		}
-	})
-
-	awards.register_achievement("awards_cactus", {
-		title = S("Desert Discoverer"),
-		description = S("Mine your first cactus."),
-		icon = "default_cactus_side.png",
-		trigger = {
-			type = "dig",
-			node = "default:cactus",
-			target = 1
-		}
-	})
-
-	awards.register_achievement("awards_dry_shrub", {
-		title = S("Far Lands"),
-		description = S("Mine your first dry shrub."),
-		icon = "default_dry_shrub.png",
-		trigger = {
-			type = "dig",
-			node = "default:dry_shrub",
-			target = 1
-		}
-	})
-
-	awards.register_achievement("awards_ice", {
-		title = S("Glacier Discoverer"),
-		description = S("Mine your first ice."),
-		icon = "default_ice.png",
-		trigger = {
-			type = "dig",
-			node = "default:ice",
-			target = 1
-		}
-	})
-
-	-- Proof that player visited snowy lands
-	awards.register_achievement("awards_snowblock", {
-		title = S("Very Simple Snow Man"),
-		description = S("Place two snow blocks."),
-		icon = "default_snow.png",
-		trigger = {
-			type = "place",
-			node = "default:snowblock",
-			target = 2
-		}
-	})
-
-	awards.register_achievement("awards_gold_ore", {
-		title = S("First Gold Find"),
-		description = S("Mine your first gold ore."),
-		icon = "default_stone.png^default_mineral_gold.png^awards_level1.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:stone_with_gold",
-			target = 1
-		}
-	})
-
-	awards.register_achievement("awards_gold_rush", {
-		title = S("Gold Rush"),
-		description = S("Mine 45 gold ores."),
-		icon = "default_stone.png^default_mineral_gold.png^awards_level2.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:stone_with_gold",
-			target = 45
-		}
-	})
-
-	awards.register_achievement("awards_diamond_ore", {
-		title = S("Wow, I am Diamonds!"),
-		description = S("Mine your first diamond ore."),
-		icon = "default_stone.png^default_mineral_diamond.png^awards_level1.png",
-		trigger = {
-			type = "dig",
-			node = "default:stone_with_diamond",
-			target = 1
-		}
-	})
-
-	awards.register_achievement("awards_diamond_rush", {
-		title = S("Girl's Best Friend"),
-		description = S("Mine 18 diamond ores."),
-		icon = "default_stone.png^default_mineral_diamond.png^awards_level2.png",
-		background = "awards_bg_mining.png",
-		trigger = {
-			type = "dig",
-			node = "default:stone_with_diamond",
-			target = 18
-		}
-	})
-
-	awards.register_achievement("awards_diamondblock", {
-		title = S("Hardest Block on Earth"),
-		description = S("Craft a diamond block."),
-		icon = "default_diamond_block.png",
-		trigger = {
-			type = "craft",
-			item = "default:diamondblock",
-			target = 1
-		}
-	})
-
-	awards.register_achievement("awards_mossycobble", {
-		title = S("In the Dungeon"),
-		description = S("Mine a mossy cobblestone."),
-		icon = "default_mossycobble.png",
-		trigger = {
-			type = "dig",
-			node = "default:mossycobble",
-			target = 1
-		}
-	})
-
-	awards.register_achievement("award_furnace", {
-		title = S("Smelter"),
-		description = S("Craft 10 furnaces."),
-		icon = "default_furnace_front.png",
-		trigger = {
-			type = "craft",
-			item= "default:furnace",
-			target = 10
-		}
-	})
-
-	awards.register_achievement("award_chest", {
-		title = S("Treasurer"),
-		description = S("Craft 15 chests."),
-		icon = "default_chest_front.png",
-		trigger = {
-			type = "craft",
-			item= "default:chest",
-			target = 15
-		}
-	})
-
-	awards.register_achievement("award_chest2", {
-		title = S("Bankier"),
-		description = S("Craft 30 locked chests."),
-		icon = "default_chest_lock.png",
-		trigger = {
-			type = "craft",
-			item= "default:chest_locked",
-			target = 30
-		}
-	})
-
-	awards.register_achievement("award_brick", {
-		title = S("Bricker"),
-		description = S("Craft 200 brick blocks."),
-		icon = "default_brick.png",
-		trigger = {
-			type = "craft",
-			item= "default:brick",
-			target = 200
-		}
-	})
-
-	awards.register_achievement("award_obsidianbrick", {
-		title = S("House of Obsidian"),
-		description = S("Craft 100 obsidian bricks."),
-		icon = "default_obsidian_brick.png",
-		trigger = {
-			type = "craft",
-			item= "default:obsidianbrick",
-			target = 100
-		}
-	})
-
-	awards.register_achievement("award_placestone", {
-		title = S("Build a Cave"),
-		description = S("Place 100 stone."),
-		icon = "default_stone.png",
-		trigger = {
-			type = "place",
-			node = "default:stone",
-			target = 100
-		}
-	})
-
-	awards.register_achievement("award_woodladder", {
-		title = S("Long Ladder"),
-		description = S("Place 400 wooden ladders."),
-		icon = "default_ladder_wood.png",
-		trigger = {
-			type = "place",
-			node = "default:ladder_wood",
-			target = 400
-		}
-	})
-
-	awards.register_achievement("award_steelladder", {
-		title = S("Industrial Age"),
-		description = S("Place 40 steel ladders."),
-		icon = "default_ladder_steel.png",
-		trigger = {
-			type = "place",
-			node = "default:ladder_steel",
-			target = 40
-		}
-	})
-
-	awards.register_achievement("award_apples", {
-		title = S("Yummy!"),
-		description = S("Eat 80 apples."),
-		icon = "default_apple.png",
-		trigger = {
-			type = "eat",
-			item = "default:apple",
-			target = 80
-		}
-	})
-end
-
-if minetest.get_modpath("vessels") then
-	awards.register_achievement("award_vessels_shelf", {
-		title = S("Glasser"),
-		icon = "vessels_shelf.png",
-		description = S("Craft 14 vessels shelves."),
-		trigger = {
-			type = "craft",
-			item= "vessels:shelf",
-			target = 14
-		}
-	})
-end
-
-if minetest.get_modpath("farming") then
-	awards.register_achievement("awards_farmer", {
-		title = S("Farming Skills Acquired"),
-		description = S("Harvest a fully grown wheat plant."),
-		icon = "farming_wheat_8.png^awards_level1.png",
-		trigger = {
-			type = "dig",
-			node = "farming:wheat_8",
-			target = 1
-		}
-	})
-	awards.register_achievement("awards_farmer2", {
-		title = S("Field Worker"),
-		description = S("Harvest 25 fully grown wheat plants."),
-		icon = "farming_wheat_8.png^awards_level2.png",
-		trigger = {
-			type = "dig",
-			node = "farming:wheat_8",
-			target = 25
-		}
-	})
-
-	awards.register_achievement("awards_farmer3", {
-		title = S("Aspiring Farmer"),
-		description = S("Harvest 125 fully grown wheat plants."),
-		icon = "farming_wheat_8.png^awards_level3.png",
-		trigger = {
-			type = "dig",
-			node = "farming:wheat_8",
-			target = 125
-		}
-	})
-
-	awards.register_achievement("awards_farmer4", {
-		title = S("Wheat Magnate"),
-		description = S("Harvest 625 fully grown wheat plants."),
-		icon = "farming_wheat_8.png^awards_level4.png",
-		trigger = {
-			type = "dig",
-			node = "farming:wheat_8",
-			target = 625
-		}
-	})
-
-	awards.register_achievement("award_bread", {
-		title = S("Baker"),
-		description = S("Eat 10 loaves of bread."),
-		icon = "farming_bread.png",
-		trigger = {
-			type = "eat",
-			item = "farming:bread",
-			target = 10
-		}
-	})
-
-end
-
-if minetest.get_modpath("wool") and minetest.get_modpath("farming") then
-	awards.register_achievement("awards_wool", {
-		title = S("Wool Over Your Eyes"),
-		description = S("Craft 250 white wool."),
-		icon = "wool_white.png",
-		trigger = {
-			type = "craft",
-			item = "wool:white",
-			target = 250
-		}
-	})
-end
-
-if minetest.get_modpath("beds") then
-	awards.register_achievement("award_bed", {
-		title = S("Hotelier"),
-		description = S("Craft 15 fancy beds."),
-		icon = "beds_bed_fancy.png",
-		trigger = {
-			type = "craft",
-			item= "beds:fancy_bed_bottom",
-			target = 15
-		}
-	})
-end
-
-if minetest.get_modpath("stairs") then
-	awards.register_achievement("award_stairs_goldblock", {
-		title = S("Filthy Rich"),
-		description = S("Craft 24 gold block stairs."),
-		icon = "default_gold_block.png",
-		trigger = {
-			type = "craft",
-			item= "stairs:stair_goldblock",
-			target = 24
-		}
-	})
-end
-
-if minetest.get_modpath("dye") then
-	awards.register_achievement("awards_dye_red", {
-		title = S("Roses Are Red"),
-		description = S("Craft 400 red dyes."),
-		icon = "dye_red.png",
-		trigger = {
-			type = "craft",
-			item = "dye:red",
-			target = 400
-		}
-	})
-
-	awards.register_achievement("awards_dye_yellow", {
-		title = S("Dandelions are Yellow"),
-		description = S("Craft 400 yellow dyes."),
-		icon = "dye_yellow.png",
-		trigger = {
-			type = "craft",
-			item = "dye:yellow",
-			target = 400
-		}
-	})
-
-	awards.register_achievement("awards_dye_blue", {
-		title = S("Geraniums are Blue"),
-		description = S("Craft 400 blue dyes."),
-		icon = "dye_blue.png",
-		trigger = {
-			type = "craft",
-			item= "dye:blue",
-			target = 400
-		}
-	})
-
-	awards.register_achievement("awards_dye_white", {
-		title = S("White Color Stock"),
-		description = S("Craft 100 white dyes."),
-		icon = "dye_white.png",
-		trigger = {
-			type = "craft",
-			item= "dye:white",
-			target = 100
-		}
-	})
-end
-
-if minetest.get_modpath("flowers") then
-	awards.register_achievement("awards_brown_mushroom1", {
-		title = S("Tasty Mushrooms"),
-		description = S("Eat 3 brown mushrooms."),
-		icon = "flowers_mushroom_brown.png^awards_level1.png",
-		trigger = {
-			type = "eat",
-			item= "flowers:mushroom_brown",
-			target = 3,
-		}
-	})
-	awards.register_achievement("awards_brown_mushroom2", {
-		title = S("Mushroom Lover"),
-		description = S("Eat 33 brown mushrooms."),
-		icon = "flowers_mushroom_brown.png^awards_level2.png",
-		trigger = {
-			type = "eat",
-			item= "flowers:mushroom_brown",
-			target = 33,
-		}
-	})
-	awards.register_achievement("awards_brown_mushroom3", {
-		title = S("Underground Mushroom Farmer"),
-		description = S("Eat 333 brown mushrooms."),
-		icon = "flowers_mushroom_brown.png^awards_level3.png",
-		trigger = {
-			type = "eat",
-			item= "flowers:mushroom_brown",
-			target = 333,
-		}
-	})
-end
-
--- This ensures the following code is executed after all items have been registered
-minetest.after(0, function()
-	-- Check whether there is at least one node which can be built by the player
-	local building_is_possible = false
-	for _, def in pairs(minetest.registered_nodes) do
-		if (def.description and def.pointable ~= false and not def.groups.not_in_creative_inventory) then
-			building_is_possible = true
-			break
-		end
-	end
-
-	-- The following awards require at least one node which can be built
-	if not building_is_possible then
-		return
-	end
-
-	awards.register_achievement("awards_builder1", {
-		title = S("Builder"),
-		icon = "awards_house.png^awards_level1.png",
-		trigger = {
-			type = "place",
-			target = 1000,
-		},
-	})
-	awards.register_achievement("awards_builder2", {
-		title = S("Constructor"),
-		icon = "awards_house.png^awards_level2.png",
-		trigger = {
-			type = "place",
-			target = 5000,
-		},
-	})
-	awards.register_achievement("awards_builder3", {
-		title = S("Architect"),
-		icon = "awards_house.png^awards_level3.png",
-		trigger = {
-			type = "place",
-			target = 10000,
-		},
-	})
-	awards.register_achievement("awards_builder4", {
-		title = S("Master Architect"),
-		icon = "awards_house.png^awards_level4.png",
-		trigger = {
-			type = "place",
-			target = 25000,
-		},
-	})
-end)

triggers.lua

@@ -14,143 +14,75 @@
 -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 --
 
-local S, NS = awards.gettext, awards.ngettext
+awards.register_trigger("death", {
+	type = "counted",
+	progress = "@1/@2 deaths",
+	auto_description = { "Die once", "Die @1 times" },
+})
+minetest.register_on_dieplayer(awards.notify_death)
 
-awards.register_trigger("dig", function(def)
+awards.register_trigger("chat", {
-	local tmp = {
+	type = "counted",
-		award  = def.name,
+	progress = "@1/@2 chat messages",
-		node   = def.trigger.node,
+	auto_description = { "Send a chat message", "Chat @1 times" },
-		target = def.trigger.target,
+})
-	}
+minetest.register_on_chat_message(function(name, message)
-	table.insert(awards.on.dig, tmp)
+	local player = minetest.get_player_by_name(name)
-	def.getProgress = function(self, data)
+	if not player or string.find(message, "/")  then
-		local itemcount
+		return
-		if tmp.node then
-			itemcount = awards.get_item_count(data, "count", tmp.node) or 0
-		else
-			itemcount = awards.get_total_item_count(data, "count")
-		end
-		return {
-			perc = itemcount / tmp.target,
-			label = S("@1/@2 dug", itemcount, tmp.target),
-		}
-	end
-	def.getDefaultDescription = function(self)
-		local n = self.trigger.target
-		if self.trigger.node then
-			local nname = minetest.registered_nodes[self.trigger.node].description
-			if nname == nil then
-				nname = self.trigger.node
-			end
-			-- Translators: @1 is count, @2 is description.
-			return NS("Mine: @2", "Mine: @1×@2", n, n, nname)
-		else
-			return NS("Mine @1 block.", "Mine @1 blocks.", n, n)
-		end
 	end
+
+	awards.notify_chat(player)
 end)
 
-awards.register_trigger("place", function(def)
+awards.register_trigger("join", {
-	local tmp = {
+	type = "counted",
-		award  = def.name,
+	progress = "@1/@2 joins",
-		node   = def.trigger.node,
+	auto_description = { "Join once", "Join @1 times" },
-		target = def.trigger.target,
+})
-	}
+minetest.register_on_joinplayer(awards.notify_join)
-	table.insert(awards.on.place, tmp)
-	def.getProgress = function(self, data)
-		local itemcount
-		if tmp.node then
-			itemcount = awards.get_item_count(data, "place", tmp.node) or 0
-		else
-			itemcount = awards.get_total_item_count(data, "place")
-		end
-		return {
-			perc = itemcount / tmp.target,
-			label = S("@1/@2 placed", itemcount, tmp.target),
-		}
-	end
-	def.getDefaultDescription = function(self)
-		local n = self.trigger.target
-		if self.trigger.node then
-			local nname = minetest.registered_nodes[self.trigger.node].description
-			if nname == nil then
-				nname = self.trigger.node
-			end
-			-- Translators: @1 is count, @2 is description.
-			return NS("Place: @2", "Place: @1×@2", n, n, nname)
-		else
-			return NS("Place a block.", "Place @1 blocks.", n, n)
-		end
-	end
-end)
 
-awards.register_trigger("eat", function(def)
+--
-	local tmp = {
+-- awards.register_trigger("dig", {
-		award  = def.name,
+-- 	type = "counted_key",
-		item = def.trigger.item,
+-- 	progress = "@1/@2 dug",
-		target = def.trigger.target,
+-- 	auto_description = { "Mine: @2", "Mine: @1×@2" },
-	}
+-- 	auto_description_total = { "Mine @1 block.", "Mine @1 blocks." },
-	table.insert(awards.on.eat, tmp)
+-- 	get_key = function(self, def)
-	def.getProgress = function(self, data)
+-- 		return minetest.registered_aliases[def.trigger.node] or def.trigger.node
-		local itemcount
+-- 	end
-		if tmp.item then
+-- })
-			itemcount = awards.get_item_count(data, "eat", tmp.item) or 0
+--
-		else
+-- minetest.register_on_dignode(function(pos, oldnode, player)
-			itemcount = awards.get_total_item_count(data, "eat")
+-- 	if not player or not pos or not oldnode then
-		end
+-- 		return
-		return {
+-- 	end
-			perc = itemcount / tmp.target,
+--
-			label = S("@1/@2 eaten", itemcount, tmp.target),
+-- 	local node_name = oldnode.name
-		}
+-- 	node_name = minetest.registered_aliases[node_name] or node_name
-	end
+-- 	awards.notify_dig(player, node_name)
-	def.getDefaultDescription = function(self)
+-- end)
-		local n = self.trigger.target
+--
-		if self.trigger.item then
+-- awards.register_trigger("place", {
-			local iname = minetest.registered_items[self.trigger.item].description
+-- 	type = "counted_key",
-			if iname == nil then
+-- 	progress = "@1/@2 placed",
-				iname = self.trigger.iode
+-- 	auto_description = { "Place: @2", "Place: @1×@2" },
-			end
+-- 	auto_description_total = { "Place @1 block.", "Place @1 blocks." },
-			-- Translators: @1 is count, @2 is description.
+-- 	get_key = function(self, def)
-			return NS("Eat: @2", "Eat: @1×@2", n, n, iname)
+-- 		return minetest.registered_aliases[def.trigger.node] or def.trigger.node
-		else
+-- 	end
-			return NS("Eat an item.", "Eat @1 items.", n, n)
+-- })
-		end
+--
-	end
+-- awards.register_trigger("craft", {
-end)
+-- 	type = "counted_key",
+-- 	progress = "@1/@2 crafted",
+-- 	auto_description = { "Craft: @2", "Craft: @1×@2" },
+-- 	auto_description_total = { "Craft @1 item", "Craft @1 items." },
+-- 	get_key = function(self, def)
+-- 		return minetest.registered_aliases[def.trigger.item] or def.trigger.item
+-- 	end
+-- })
 
-awards.register_trigger("craft", function(def)
-	local tmp = {
-		award  = def.name,
-		item = def.trigger.item,
-		target = def.trigger.target,
-	}
-	table.insert(awards.on.craft, tmp)
-	def.getProgress = function(self, data)
-		local itemcount
-		if tmp.item then
-			itemcount = awards.get_item_count(data, "craft", tmp.item) or 0
-		else
-			itemcount = awards.get_total_item_count(data, "craft")
-		end
-		return {
-			perc = itemcount / tmp.target,
-			label = S("@1/@2 crafted", itemcount, tmp.target),
-		}
-	end
-	def.getDefaultDescription = function(self)
-		local n = self.trigger.target
-		if self.trigger.item then
-			local iname = minetest.registered_items[self.trigger.item].description
-			if iname == nil then
-				iname = self.trigger.item
-			end
-			-- Translators: @1 is count, @2 is description.
-			return NS("Craft: @2", "Craft: @1×@2", n, n, iname)
-		else
-			return NS("Craft an item.", "Craft @1 items.", n)
-		end
-	end
-end)
 
 -- Backwards compatibility
 awards.register_onDig   = awards.register_on_dig
@@ -161,177 +93,84 @@ awards.register_onJoin  = awards.register_on_join
 awards.register_onCraft = awards.register_on_craft
 
 -- Trigger Handles
-minetest.register_on_dignode(function(pos, oldnode, digger)
+--
-	if not digger or not pos or not oldnode then
+-- minetest.register_on_placenode(function(pos, node, digger)
-		return
+-- 	if not digger or not pos or not node or not digger:get_player_name() or digger:get_player_name()=="" then
-	end
+-- 		return
-
+-- 	end
-	local data = awards.players[digger:get_player_name()]
+-- 	local data = awards.players[digger:get_player_name()]
-	if not awards.increment_item_counter(data, "count", oldnode.name) then
+-- 	if not awards.increment_item_counter(data, "place", node.name) then
-		return
+-- 		return
-	end
+-- 	end
-	awards.run_trigger_callbacks(digger, data, "dig", function(entry)
+--
-		if entry.target then
+-- 	awards.run_trigger_callbacks(digger, data, "place", function(entry)
-			if entry.node then
+-- 		if entry.target then
-				local tnodedug = string.split(entry.node, ":")
+-- 			if entry.node then
-				local tmod = tnodedug[1]
+-- 				local tnodedug = string.split(entry.node, ":")
-				local titem = tnodedug[2]
+-- 				local tmod = tnodedug[1]
-				if not (not tmod or not titem or not data.count[tmod] or
+-- 				local titem = tnodedug[2]
-							not data.count[tmod][titem]) and
+-- 				if not (not tmod or not titem or not data.place[tmod] or
-						data.count[tmod][titem] > entry.target-1 then
+-- 							not data.place[tmod][titem]) and
-					return entry.award
+-- 						data.place[tmod][titem] > entry.target-1 then
-				end
+-- 					return entry.award
-			elseif awards.get_total_item_count(data, "count") > entry.target-1 then
+-- 				end
-				return entry.award
+-- 			elseif awards.get_total_item_count(data, "place") > entry.target-1 then
-			end
+-- 				return entry.award
-		end
+-- 			end
-	end)
+-- 		end
-end)
+-- 	end)
-
+-- end)
-minetest.register_on_placenode(function(pos, node, digger)
+--
-	if not digger or not pos or not node or not digger:get_player_name() or digger:get_player_name()=="" then
+-- minetest.register_on_item_eat(function(hp_change, replace_with_item, itemstack, user, pointed_thing)
-		return
+-- 	if not user or not itemstack or not user:get_player_name() or user:get_player_name()=="" then
-	end
+-- 		return
-	local data = awards.players[digger:get_player_name()]
+-- 	end
-	if not awards.increment_item_counter(data, "place", node.name) then
+-- 	local data = awards.players[user:get_player_name()]
-		return
+-- 	if not awards.increment_item_counter(data, "eat", itemstack:get_name()) then
-	end
+-- 		return
-
+-- 	end
-	awards.run_trigger_callbacks(digger, data, "place", function(entry)
+-- 	awards.run_trigger_callbacks(user, data, "eat", function(entry)
-		if entry.target then
+-- 		if entry.target then
-			if entry.node then
+-- 			if entry.item then
-				local tnodedug = string.split(entry.node, ":")
+-- 				local titemstring = string.split(entry.item, ":")
-				local tmod = tnodedug[1]
+-- 				local tmod = titemstring[1]
-				local titem = tnodedug[2]
+-- 				local titem = titemstring[2]
-				if not (not tmod or not titem or not data.place[tmod] or
+-- 				if not (not tmod or not titem or not data.eat[tmod] or
-							not data.place[tmod][titem]) and
+-- 							not data.eat[tmod][titem]) and
-						data.place[tmod][titem] > entry.target-1 then
+-- 						data.eat[tmod][titem] > entry.target-1 then
-					return entry.award
+-- 					return entry.award
-				end
+-- 				end
-			elseif awards.get_total_item_count(data, "place") > entry.target-1 then
+-- 			elseif awards.get_total_item_count(data, "eat") > entry.target-1 then
-				return entry.award
+-- 				return entry.award
-			end
+-- 			end
-		end
+-- 		end
-	end)
+-- 	end)
-end)
+-- end)
-
+--
-minetest.register_on_item_eat(function(hp_change, replace_with_item, itemstack, user, pointed_thing)
+-- minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
-	if not user or not itemstack or not user:get_player_name() or user:get_player_name()=="" then
+-- 	if not player or not itemstack then
-		return
+-- 		return
-	end
+-- 	end
-	local data = awards.players[user:get_player_name()]
+--
-	if not awards.increment_item_counter(data, "eat", itemstack:get_name()) then
+-- 	local data = awards.players[player:get_player_name()]
-		return
+-- 	if not awards.increment_item_counter(data, "craft", itemstack:get_name(), itemstack:get_count()) then
-	end
+-- 		return
-	awards.run_trigger_callbacks(user, data, "eat", function(entry)
+-- 	end
-		if entry.target then
+--
-			if entry.item then
+-- 	awards.run_trigger_callbacks(player, data, "craft", function(entry)
-				local titemstring = string.split(entry.item, ":")
+-- 		if entry.target then
-				local tmod = titemstring[1]
+-- 			if entry.item then
-				local titem = titemstring[2]
+-- 				local titemcrafted = string.split(entry.item, ":")
-				if not (not tmod or not titem or not data.eat[tmod] or
+-- 				local tmod = titemcrafted[1]
-							not data.eat[tmod][titem]) and
+-- 				local titem = titemcrafted[2]
-						data.eat[tmod][titem] > entry.target-1 then
+-- 				if not (not tmod or not titem or not data.craft[tmod] or
-					return entry.award
+-- 							not data.craft[tmod][titem]) and
-				end
+-- 						data.craft[tmod][titem] > entry.target-1 then
-			elseif awards.get_total_item_count(data, "eat") > entry.target-1 then
+-- 					return entry.award
-				return entry.award
+-- 				end
-			end
+-- 			elseif awards.get_total_item_count(data, "craft") > entry.target-1 then
-		end
+-- 				return entry.award
-	end)
+-- 			end
-end)
+-- 		end
-
+-- 	end)
-minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
+-- end)
-	if not player or not itemstack then
-		return
-	end
-
-	local data = awards.players[player:get_player_name()]
-	if not awards.increment_item_counter(data, "craft", itemstack:get_name(), itemstack:get_count()) then
-		return
-	end
-
-	awards.run_trigger_callbacks(player, data, "craft", function(entry)
-		if entry.target then
-			if entry.item then
-				local titemcrafted = string.split(entry.item, ":")
-				local tmod = titemcrafted[1]
-				local titem = titemcrafted[2]
-				if not (not tmod or not titem or not data.craft[tmod] or
-							not data.craft[tmod][titem]) and
-						data.craft[tmod][titem] > entry.target-1 then
-					return entry.award
-				end
-			elseif awards.get_total_item_count(data, "craft") > entry.target-1 then
-				return entry.award
-			end
-		end
-	end)
-end)
-
-awards.register_trigger_counted("death", function(def)
-	local tmp = {
-		award  = def.name,
-		target = def.trigger.target,
-	}
-	table.insert(awards.on.death, tmp)
-	def.getProgress = function(self, data)
-		local itemcount = data.deaths or 0
-		return {
-			perc = itemcount / tmp.target,
-			label = S("@1/@2 deaths", itemcount, tmp.target),
-		}
-	end
-	def.getDefaultDescription = function(self)
-		local n = self.trigger.target
-		return NS("Die.", "Die @1 times.", n, n)
-	end
-end)
-minetest.register_on_dieplayer(awards.notify_death)
-
-awards.register_trigger_counted("chat", function(def)
-	local tmp = {
-		award  = def.name,
-		target = def.trigger.target,
-	}
-	table.insert(awards.on.chat, tmp)
-	def.getProgress = function(self, data)
-		local itemcount = data.chats or 0
-		return {
-			perc = itemcount / tmp.target,
-			label = S("@1/@2 chat messages", itemcount, tmp.target),
-		}
-	end
-	def.getDefaultDescription = function(self)
-		local n = self.trigger.target
-		return NS("Write something in chat.", "Write @1 chat messages.", n, n)
-	end
-end)
-minetest.register_on_chat_message(function(name, message)
-	local player = minetest.get_player_by_name(name)
-	if not player or string.find(message, "/")  then
-		return
-	end
-
-	awards.notify_chat(player)
-end)
-
-awards.register_trigger_counted("join", function(def)
-	local tmp = {
-		award  = def.name,
-		target = def.trigger.target,
-	}
-	table.insert(awards.on.join, tmp)
-	def.getProgress = function(self, data)
-		local itemcount = data.joins or 0
-		return {
-			perc = itemcount / tmp.target,
-			label = S("@1/@2 game joins", itemcount, tmp.target),
-		}
-	end
-	def.getDefaultDescription = function(self)
-		local n = self.trigger.target
-		return NS("Join the game.", "Join the game @1 times.", n, n)
-	end
-end)
-minetest.register_on_joinplayer(awards.notify_join)