Module:Block value - Revision history

minecraft>Sonicwave: strip trailing s only if not found otherwise

2020-03-02T16:56:32Z

strip trailing s only if not found otherwise

← Older revision		Revision as of 16:56, 2 March 2020
Line 9:		Line 9:
	local argType = args.type		local argType = args.type

	local ~~value~~ = mw.loadData( 'Module:' .. argType .. ' values' )[block]		local values = mw.loadData( 'Module:' .. argType .. ' values' )
			local value = values[block]
	local category = ''		local category = ''
	if not value then		if not value then
	value = '[[Template:' .. argType .. ' values#Missing value\|?]]'		value = values[block:gsub( 's$', '' )]
	local title = mw.title.getCurrentTitle()
	if not args.nocat and title.namespace == 0 and not title.isSubpage then		if not value then
	category = '[[Category:Missing ' .. argType:lower() .. ']]'		value = '[[Template:' .. argType .. ' values#Missing value\|?]]'
			local title = mw.title.getCurrentTitle()
			if not args.nocat and title.namespace == 0 and not title.isSubpage then
			category = '[[Category:Missing ' .. argType:lower() .. ']]'
			end
	end		end
	end		end

2020-03-01T23:57:19Z

removed most transformations and updated data modules to match; makes adding values more intuitive

@@ Line 1: / Line 1: @@
 local p = {}
-p.value = function( f )
 	local args = f
 	if f == mw.getCurrentFrame() then
@@ Line 6: / Line 7: @@
 	end
 	local block = mw.text.trim( args[1] or '' ):lower()
-	local type = args.type
+	local argType = args.type
-	local value = mw.loadData( 'Module:' .. type .. ' values' )[block]
+	local value = mw.loadData( 'Module:' .. argType .. ' values' )[block]
 	local category = ''
 	if not value then
-		value = '[[Template:' .. type .. ' values#Missing value|?]]'
+		value = '[[Template:' .. argType .. ' values#Missing value|?]]'
 		local title = mw.title.getCurrentTitle()
 		if not args.nocat and title.namespace == 0 and not title.isSubpage then
-			category = '[[Category:Missing ' .. type:lower() .. ']]'
+			category = '[[Category:Missing ' .. argType:lower() .. ']]'
 		end
 	end
 	return value .. category
 end
 return p

2020-03-01T22:55:49Z

add debug logging

← Older revision		Revision as of 22:55, 1 March 2020
Line 53:		Line 53:
	local testValue = mw.loadData( 'Module:' .. type .. ' values/editcopy' )[blockTest]		local testValue = mw.loadData( 'Module:' .. type .. ' values/editcopy' )[blockTest]
	if not testValue then		if not testValue then
			mw.log('No ' .. type .. ' found for argument ' .. blockTest)
	local title = mw.title.getCurrentTitle()		local title = mw.title.getCurrentTitle()
	if not args.nocat and title.namespace == 0 and not title.isSubpage then		if not args.nocat and title.namespace == 0 and not title.isSubpage then

2020-03-01T22:50:05Z

test

← Older revision		Revision as of 22:50, 1 March 2020
Line 8:		Line 8:
	local type = args.type		local type = args.type

			local blockTest = block -- non-transformed block argument

	-- Most of these transforms are unnecessary, but are kept for compatibility with original template		-- Most of these transforms are unnecessary, but are kept for compatibility with original template

Line 47:		Line 49:
	end		end
	end		end

			-- testing editcopy
			local testValue = mw.loadData( 'Module:' .. type .. ' values/editcopy' )[blockTest]
			if not testValue then
			local title = mw.title.getCurrentTitle()
			if not args.nocat and title.namespace == 0 and not title.isSubpage then
			category = category .. '[[Category:Missing ' .. type:lower() .. '/editcopy]]'
			end
			end
			-- end test

	return value .. category		return value .. category
	end		end
	return p		return p

2020-03-01T18:04:59Z

← Older revision		Revision as of 18:04, 1 March 2020
Line 18:		Line 18:
	glass = true,		glass = true,
	steps = true, stairs = true,		steps = true, stairs = true,
	~~["iron bars"]~~ = true,		ironbars = true,
	cactus = true,		cactus = true,
	leaves = true,		leaves = true,
Line 25:		Line 25:
	planks = true,		planks = true,
	seagrass = true,		seagrass = true,
	~~["ancient debris"]~~ = true		ancientdebris = true
	}		}
	if not keepS[block:match( '%w+$' )] then		if not keepS[block:match( '%w+$' )] then

2020-03-01T18:04:01Z

test

← Older revision		Revision as of 18:04, 1 March 2020
Line 18:		Line 18:
	glass = true,		glass = true,
	steps = true, stairs = true,		steps = true, stairs = true,
	bars = true,		["iron bars"] = true,
	cactus = true,		cactus = true,
	leaves = true,		leaves = true,
Line 25:		Line 25:
	planks = true,		planks = true,
	seagrass = true,		seagrass = true,
	debris = true		["ancient debris"] = true
	}		}
	if not keepS[block:match( '%w+$' )] then		if not keepS[block:match( '%w+$' )] then

2020-02-18T18:46:29Z

merge duplicated code

← Older revision		Revision as of 18:46, 18 February 2020
Line 11:		Line 11:

	-- remove any of '()- or whitespace		-- remove any of '()- or whitespace
	~~if type == "blast resistance" then~~		block = block:gsub( "['%(%)%-%s]+", '' )
	block = block:gsub( "['%(%)%-%s]+", '' )
	~~else~~		if type == "hardness" then
	-- Strip trailing "s" on everything but these		-- Strip trailing "s" on everything but these
	local keepS = {		local keepS = {
Line 36:		Line 36:
	:gsub( 'mossy', 'moss' )		:gsub( 'mossy', 'moss' )
	:gsub( 'steps', 'stairs' )		:gsub( 'steps', 'stairs' )
	~~:gsub( "['%(%)%-%s]+", '' )~~
	end		end

	local value = mw.loadData( 'Module:' .. type .. ' values' )[block]		local value = mw.loadData( 'Module:' .. type .. ' values' )[block]
	local category = ''		local category = ''

2020-02-18T18:34:14Z

fix indentation and comment location

← Older revision		Revision as of 18:34, 18 February 2020
Line 10:		Line 10:
	-- Most of these transforms are unnecessary, but are kept for compatibility with original template		-- Most of these transforms are unnecessary, but are kept for compatibility with original template

	-- ~~Strip trailing "s" on everything but these~~		-- remove any of '()- or whitespace
	if type=="blast resistance" then		if type == "blast resistance" then
	block=block:gsub( "['%(%)%-%s]+", '' )		block = block:gsub( "['%(%)%-%s]+", '' )
	else		else
	local keepS = {		-- Strip trailing "s" on everything but these
	glass = true,		local keepS = {
	steps = true, stairs = true,		glass = true,
	bars = true,		steps = true, stairs = true,
	cactus = true,		bars = true,
	leaves = true,		cactus = true,
	grass = true,		leaves = true,
	potatoes = true,		grass = true,
	planks = true,		potatoes = true,
	seagrass = true,		planks = true,
	debris = true		seagrass = true,
	}		debris = true
	if not keepS[block:match( '%w+$' )] then		}
	block = block:gsub( 's$', '' )		if not keepS[block:match( '%w+$' )] then
	end		block = block:gsub( 's$', '' )
			end
	-- Other transforms
	block = block		-- Other transforms
	:gsub( 'wooden', 'wood' )		block = block
	:gsub( 'mossy', 'moss' )		:gsub( 'wooden', 'wood' )
	:gsub( 'steps', 'stairs' )		:gsub( 'mossy', 'moss' )
	:gsub( "['%(%)%-%s]+", '' )		:gsub( 'steps', 'stairs' )
			:gsub( "['%(%)%-%s]+", '' )
	end		end
	local value = mw.loadData( 'Module:' .. type .. ' values' )[block]		local value = mw.loadData( 'Module:' .. type .. ' values' )[block]

2020-02-08T16:52:52Z

I don't think it is appropriate to remove S for Debris

← Older revision		Revision as of 16:52, 8 February 2020
Line 23:		Line 23:
	potatoes = true,		potatoes = true,
	planks = true,		planks = true,
	seagrass = true		seagrass = true,
			debris = true
	}		}
	if not keepS[block:match( '%w+$' )] then		if not keepS[block:match( '%w+$' )] then

2019-08-31T19:31:28Z

← Older revision		Revision as of 19:31, 31 August 2019
Line 12:		Line 12:
	-- Strip trailing "s" on everything but these		-- Strip trailing "s" on everything but these
	if type=="blast resistance" then		if type=="blast resistance" then
			block=block:gsub( "['%(%)%-%s]+", '' )
	else		else
	local keepS = {		local keepS = {