From 3e9e16b66186fbb3889babfe8af72193dad4df63 Mon Sep 17 00:00:00 2001
From: Jean-Patrick Guerrero <jeanpatrick.guerrero@gmail.com>
Date: Tue, 5 Feb 2019 14:45:57 +0100
Subject: [PATCH] Minor cleaning

---
 init.lua | 52 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/init.lua b/init.lua
index b59ce68..b84a872 100644
--- a/init.lua
+++ b/init.lua
@@ -26,7 +26,7 @@ local S = dofile(mt.get_modpath("craftguide") .. "/intllib.lua")
 local maxn, sort, concat = table.maxn, table.sort, table.concat
 local vector_add, vector_mul = vector.add, vector.multiply
 local min, max, floor, ceil = math.min, math.max, math.floor, math.ceil
-local fmt = string.format
+local fmt, pairs, next = string.format, pairs, next
 
 local DEFAULT_SIZE = 10
 local MIN_LIMIT, MAX_LIMIT = 10, 12
@@ -152,6 +152,7 @@ end
 
 local function cache_recipes(output)
 	local recipes = mt.get_all_craft_recipes(output) or {}
+
 	for i = 1, #craftguide.custom_crafts do
 		local custom_craft = craftguide.custom_crafts[i]
 		if custom_craft.output:match("%S*") == output then
@@ -309,7 +310,8 @@ local function get_recipe_fs(data, iY)
 
 	if custom_recipe or shapeless or recipe.type == "cooking" then
 		local icon = custom_recipe and custom_recipe.icon or
-				shapeless and "shapeless" or "furnace"
+			     shapeless and "shapeless" or "furnace"
+
 		if not custom_recipe then
 			icon = "craftguide_" .. icon .. ".png^[resize:16x16"
 		end
@@ -402,35 +404,43 @@ local function make_formspec(name)
 	data.pagemax = max(1, ceil(#data.items / ipp))
 
 	local fs = {}
+
 	if not sfinv_only then
-		fs[#fs + 1] = "size[" .. (data.iX - 0.35) .. "," .. (iY + 4) .. ";]"
-		fs[#fs + 1] = "no_prepend[]"
-		fs[#fs + 1] = "background[1,1;1,1;craftguide_bg.png;true]"
+		fs[#fs + 1] = fmt("size[%f,%f;]", data.iX - 0.35, iY + 4)
+		fs[#fs + 1] = [[
+			no_prepend[]
+			background[1,1;1,1;craftguide_bg.png;true]
+			image_button[2.4,0.12;0.8,0.8;craftguide_search_icon.png;search;]
+			image_button[3.05,0.12;0.8,0.8;craftguide_clear_icon.png;clear;]
+			field_close_on_enter[filter;false]
+		]]
+
 		fs[#fs + 1] = "tooltip[size_inc;" .. S("Increase window size") .. "]"
 		fs[#fs + 1] = "tooltip[size_dec;" .. S("Decrease window size") .. "]"
+
 		fs[#fs + 1] = "image_button[" .. (data.iX * 0.47) ..
 				",0.12;0.8,0.8;craftguide_zoomin_icon.png;size_inc;]"
 		fs[#fs + 1] = "image_button[" .. ((data.iX * 0.47) + 0.6) ..
 				",0.12;0.8,0.8;craftguide_zoomout_icon.png;size_dec;]"
 	end
 
-	fs[#fs + 1] = [[
-		image_button[2.4,0.12;0.8,0.8;craftguide_search_icon.png;search;]
-		image_button[3.05,0.12;0.8,0.8;craftguide_clear_icon.png;clear;]
-		field_close_on_enter[filter;false]
-	]]
-
 	fs[#fs + 1] = "tooltip[search;" .. S("Search") .. "]"
 	fs[#fs + 1] = "tooltip[clear;" .. S("Reset") .. "]"
 	fs[#fs + 1] = "tooltip[prev;" .. S("Previous page") .. "]"
 	fs[#fs + 1] = "tooltip[next;" .. S("Next page") .. "]"
+
 	fs[#fs + 1] = "image_button[" .. (data.iX - (sfinv_only and 2.6 or 3.1)) ..
 			",0.12;0.8,0.8;craftguide_prev_icon.png;prev;]"
-	fs[#fs + 1] = "label[" .. (data.iX - (sfinv_only and 1.7 or 2.2)) .. ",0.22;" ..
-			mt.colorize("yellow", data.pagenum) .. " / " .. data.pagemax .. "]"
-	fs[#fs + 1] = "image_button[" .. (data.iX - (sfinv_only and 0.7 or 1.2) -
-			(data.iX >= 11 and 0.08 or 0)) ..
+
+	fs[#fs + 1] = fmt(fmt_label,
+			data.iX - (sfinv_only and 1.7 or 2.2),
+			0.22,
+			mt.colorize("yellow", data.pagenum) .. " / " .. data.pagemax)
+
+	fs[#fs + 1] = "image_button[" .. (data.iX -
+			(sfinv_only and 0.7 or 1.2) - (data.iX >= 11 and 0.08 or 0)) ..
 			",0.12;0.8,0.8;craftguide_next_icon.png;next;]"
+
 	fs[#fs + 1] = "field[0.3,0.32;2.5,1;filter;;" .. mt.formspec_escape(data.filter) .. "]"
 
 	if #data.items == 0 then
@@ -476,6 +486,7 @@ end
 
 local function search(data)
 	local filter = data.filter
+
 	if searches[filter] then
 		data.items = searches[filter]
 		return
@@ -521,14 +532,15 @@ end
 
 local function get_item_usages(item)
 	local usages = {}
+
 	for _, recipes in pairs(recipes_cache) do
-		for i = 1, #recipes do
-			local recipe = recipes[i]
-			if item_in_recipe(item, recipe) then
-				usages[#usages + 1] = recipe
-			end
+	for i = 1, #recipes do
+		local recipe = recipes[i]
+		if item_in_recipe(item, recipe) then
+			usages[#usages + 1] = recipe
 		end
 	end
+	end
 
 	if fuel_cache[item] then
 		usages[#usages + 1] = {type = "fuel", width = 1, items = {item}}